From f56c77387694fe3ca380c30df25082bbd052f066 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 27 Aug 2026 11:33:27 +0100 Subject: [PATCH 01/10] Port Mineralogy 6.0.1 to Minecraft 1.16.5 --- .github/workflows/ci.yml | 88 + .github/workflows/codeql-analysis.yml | 53 + .github/workflows/release-on-tag.yml | 92 + .github/workflows/validate-gradle-build.yml | 23 + .gitignore | 2 +- .project | 44 +- CHANGELOG.txt | 67 +- README.md | 52 +- build.gradle | 869 ++++++-- docs/CONTENT_CONFIG.md | 102 + docs/DEVELOPER_GUIDE.md | 116 ++ docs/PLAYER_GUIDE.md | 195 ++ docs/PROVIDER.md | 104 + docs/README.md | 23 + docs/VERSIONS.md | 176 ++ gradle.properties | 29 +- gradle/stage-orespawn-release.sh | 39 + gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 54413 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 282 +-- gradlew.bat | 173 +- scripts/generate-locales.ps1 | 56 + scripts/generate-recipes.ps1 | 692 +++++++ settings.gradle | 4 + .../com/mcmoddev/mineralogy/Mineralogy.java | 108 - .../mcmoddev/mineralogy/MineralogyConfig.java | 682 ------- .../com/mcmoddev/mineralogy/RockType.java | 11 - .../mineralogy/blocks/DoubleSlab.java | 37 - .../mineralogy/blocks/RockFurnace.java | 244 --- .../mineralogy/blocks/RockSaltLamp.java | 139 -- .../mineralogy/blocks/RockStairs.java | 22 - .../mcmoddev/mineralogy/blocks/RockWall.java | 26 - .../mineralogy/client/ClientSetup.java | 31 - .../mcmoddev/mineralogy/init/Features.java | 21 - .../mineralogy/init/MineralogyItemGroups.java | 88 - .../mineralogy/init/MineralogyRegistry.java | 24 - .../mineralogy/worldgen/BakedGeomeConfig.java | 269 --- .../mcmoddev/mineralogy/worldgen/Geology.java | 113 -- .../mineralogy/worldgen/GeomeConfig.java | 534 ----- .../worldgen/GeomeDistributionSampler.java | 62 - .../mineralogy/worldgen/GeomeGeology.java | 123 -- .../worldgen/MineralogyOreGeneration.java | 111 - .../mineralogy/worldgen/RockFamily.java | 24 - .../mineralogy/worldgen/StoneReplacer.java | 110 - .../worldgen/math/CubicInterpolator.java | 214 -- .../worldgen/math/NoiseLayer2D.java | 67 - .../worldgen/math/PerlinNoise2D.java | 35 - .../moddev/mc}/mineralogy/Constants.java | 114 +- .../moddev/mc/mineralogy/ContentPolicy.java | 27 + .../mc/mineralogy/CreativeTabPolicy.java | 24 + .../zone/moddev/mc/mineralogy/Mineralogy.java | 47 + .../mc/mineralogy/MineralogyConfig.java | 373 ++++ .../moddev/mc}/mineralogy/blocks/Chalk.java | 4 +- .../moddev/mc}/mineralogy/blocks/Chert.java | 12 +- .../mc/mineralogy/blocks/DoubleSlab.java | 60 + .../moddev/mc}/mineralogy/blocks/DryWall.java | 2 +- .../moddev/mc}/mineralogy/blocks/Gypsum.java | 4 +- .../moddev/mc}/mineralogy/blocks/Ore.java | 4 +- .../moddev/mc}/mineralogy/blocks/Rock.java | 15 +- .../mc/mineralogy/blocks/RockFurnace.java | 244 +++ .../mc}/mineralogy/blocks/RockRelief.java | 2 +- .../mc}/mineralogy/blocks/RockSalt.java | 4 +- .../mc/mineralogy/blocks/RockSaltLamp.java | 137 ++ .../mineralogy/blocks/RockSaltStreetLamp.java | 2 +- .../mc}/mineralogy/blocks/RockSlab.java | 140 +- .../mc/mineralogy/blocks/RockStairs.java | 32 + .../moddev/mc/mineralogy/blocks/RockWall.java | 35 + .../mc/mineralogy/client/ClientSetup.java | 34 + .../compat/CobblestoneTagPolicy.java | 126 ++ .../moddev/mc}/mineralogy/data/Material.java | 168 +- .../mc}/mineralogy/data/MaterialData.java | 113 +- .../documentation/DocumentationExporter.java | 75 + .../mineralogy/fluids/MineralogyFluids.java | 78 + .../moddev/mc}/mineralogy/init/Blocks.java | 148 +- .../moddev/mc}/mineralogy/init/Items.java | 54 +- .../mineralogy/init/MineralogyItemGroups.java | 76 + .../mineralogy/init/MineralogyRegistry.java | 14 + .../mc}/mineralogy/init/TileEntities.java | 8 +- .../inventory/ContainerRockFurnace.java | 4 +- .../inventory/SlotRockFurnaceOutput.java | 4 +- .../mineralogy/items/MineralFertilizer.java | 4 +- .../mineralogy/lib/data/MaterialStats.java | 28 +- .../mc}/mineralogy/lib/data/MaterialType.java | 20 +- .../moddev/mc}/mineralogy/lib/data/Names.java | 28 +- .../lib/exceptions/ItemNotFoundException.java | 28 +- .../exceptions/MaterialNotFoundException.java | 28 +- .../lib/exceptions/TabNotFoundException.java | 28 +- .../migration/LegacyOreConfigMigrator.java | 203 ++ .../LegacyTileEntityIdNormalizer.java | 107 + .../patching/LegacyWorldDataHook.java | 0 .../mc}/mineralogy/patching/PatchHandler.java | 6 +- .../tileentity/TileEntityRockFurnace.java | 8 +- .../mc}/mineralogy/util/BlockItemPair.java | 2 +- src/main/resources/META-INF/mods.toml | 17 +- .../mineralogy/blockstates/crude_oil.json | 20 + .../assets/mineralogy/lang/de_au.json | 1800 +++++++++-------- .../assets/mineralogy/lang/de_de.json | 1800 +++++++++-------- .../assets/mineralogy/lang/en_ca.json | 12 +- .../assets/mineralogy/lang/en_en.json | 12 +- .../assets/mineralogy/lang/en_gb.json | 12 +- .../assets/mineralogy/lang/en_pt.json | 12 +- .../assets/mineralogy/lang/en_us.json | 9 +- .../assets/mineralogy/lang/es_es.json | 1738 ++++++++-------- .../assets/mineralogy/lang/es_mx.json | 1738 ++++++++-------- .../assets/mineralogy/lang/fr_ca.json | 1782 ++++++++-------- .../assets/mineralogy/lang/fr_fr.json | 1782 ++++++++-------- .../assets/mineralogy/lang/ja_jp.json | 940 +++++++++ .../assets/mineralogy/lang/ko_kr.json | 940 +++++++++ .../assets/mineralogy/lang/pt_br.json | 940 +++++++++ .../assets/mineralogy/lang/pt_pt.json | 940 +++++++++ .../assets/mineralogy/lang/ru_ru.json | 940 +++++++++ .../assets/mineralogy/lang/zh_cn.json | 1627 +++++++-------- .../mineralogy/models/block/crude_oil.json | 6 + .../models/item/crude_oil_bucket.json | 6 + .../textures/blocks/crude_oil_flow.png | Bin 0 -> 2924 bytes .../textures/blocks/crude_oil_flow.png.mcmeta | 3 + .../textures/blocks/crude_oil_still.png | Bin 0 -> 2265 bytes .../blocks/crude_oil_still.png.mcmeta | 5 + .../textures/items/crude_oil_bucket.png | Bin 0 -> 416 bytes .../coremods/mineralogy_legacy_world_fix.js | 4 +- .../data/forge/tags/blocks/cobblestone.json | 29 +- .../data/forge/tags/fluids/crude_oil.json | 7 + .../forge/tags/items/buckets/crude_oil.json | 6 + .../data/forge/tags/items/cobblestone.json | 29 +- .../data/forge/tags/items/dusts/coal.json | 4 + .../data/forge/tags/items/paper.json | 6 + .../resources/data/forge/tags/items/sand.json | 7 + .../data/minecraft/recipes/andesite.json | 15 - .../data/minecraft/recipes/diorite.json | 19 - .../data/minecraft/recipes/dispenser.json | 22 - .../data/minecraft/recipes/dropper.json | 19 - .../data/minecraft/recipes/furnace.json | 16 - .../data/minecraft/recipes/lever.json | 18 - .../recipes/mossy_cobblestone_from_vine.json | 15 - .../data/minecraft/recipes/observer.json | 22 - .../data/minecraft/recipes/piston.json | 25 - .../data/minecraft/recipes/stone.json | 9 - .../recipes/amphibolite_brick.json | 6 + .../amphibolite_brick_block_polishing.json | 66 + .../recipes/amphibolite_brick_furnace.json | 26 +- .../recipes/amphibolite_brick_slab.json | 10 +- .../amphibolite_brick_slab_polishing.json | 66 + .../amphibolite_brick_slab_recombination.json | 41 + .../recipes/amphibolite_brick_stairs.json | 10 +- .../amphibolite_brick_stairs_polishing.json | 66 + .../recipes/amphibolite_brick_wall.json | 10 +- .../amphibolite_brick_wall_polishing.json | 66 + .../recipes/amphibolite_cobblestone.json | 32 + .../recipes/amphibolite_furnace.json | 24 +- ...ite_polished_brick_slab_recombination.json | 41 + ...phibolite_polished_slab_recombination.json | 41 + .../amphibolite_polished_slabs_to_brick.json | 41 + .../amphibolite_polished_stairs_to_brick.json | 41 + .../amphibolite_polished_walls_to_brick.json | 41 + .../amphibolite_raw_slab_polishing.json | 66 + .../amphibolite_raw_slab_recombination.json | 41 + .../amphibolite_raw_slabs_to_brick.json | 41 + .../amphibolite_raw_stairs_polishing.json | 66 + .../amphibolite_raw_stairs_to_brick.json | 41 + .../amphibolite_raw_wall_polishing.json | 66 + .../amphibolite_raw_walls_to_brick.json | 41 + .../recipes/amphibolite_relief_axe.json | 12 +- .../recipes/amphibolite_relief_blank.json | 10 +- .../recipes/amphibolite_relief_cross.json | 12 +- .../recipes/amphibolite_relief_hammer.json | 12 +- .../recipes/amphibolite_relief_hoe.json | 12 +- .../amphibolite_relief_horizontal.json | 12 +- .../recipes/amphibolite_relief_i.json | 12 +- .../recipes/amphibolite_relief_left.json | 12 +- .../recipes/amphibolite_relief_pickaxe.json | 12 +- .../recipes/amphibolite_relief_plus.json | 12 +- .../recipes/amphibolite_relief_right.json | 12 +- .../recipes/amphibolite_relief_sword.json | 12 +- .../recipes/amphibolite_relief_vertical.json | 12 +- .../recipes/amphibolite_slab.json | 6 + .../recipes/amphibolite_smooth.json | 20 + .../recipes/amphibolite_smooth_brick.json | 10 +- .../amphibolite_smooth_brick_furnace.json | 27 +- .../amphibolite_smooth_brick_slab.json | 11 +- .../amphibolite_smooth_brick_stairs.json | 11 +- .../amphibolite_smooth_brick_wall.json | 11 +- .../recipes/amphibolite_smooth_furnace.json | 26 +- .../recipes/amphibolite_smooth_slab.json | 10 +- .../recipes/amphibolite_smooth_stairs.json | 10 +- .../recipes/amphibolite_smooth_wall.json | 10 +- .../recipes/amphibolite_stairs.json | 6 + .../recipes/amphibolite_to_stone.json | 31 + .../recipes/amphibolite_wall.json | 6 + .../advancements/recipes/andesite_brick.json | 6 + .../andesite_brick_block_polishing.json | 66 + .../recipes/andesite_brick_furnace.json | 26 +- .../recipes/andesite_brick_slab.json | 10 +- .../andesite_brick_slab_polishing.json | 66 + .../andesite_brick_slab_recombination.json | 41 + .../recipes/andesite_brick_stairs.json | 10 +- .../andesite_brick_stairs_polishing.json | 66 + .../recipes/andesite_brick_wall.json | 10 +- .../andesite_brick_wall_polishing.json | 66 + .../recipes/andesite_cobblestone.json | 32 + .../recipes/andesite_furnace.json | 22 +- ...ite_polished_brick_slab_recombination.json | 41 + .../andesite_polished_slab_recombination.json | 41 + .../andesite_polished_slabs_to_brick.json | 41 + .../andesite_polished_stairs_to_brick.json | 41 + .../andesite_polished_walls_to_brick.json | 41 + .../recipes/andesite_raw_slab_polishing.json | 66 + .../andesite_raw_slab_recombination.json | 41 + .../recipes/andesite_raw_slabs_to_brick.json | 41 + .../andesite_raw_stairs_polishing.json | 66 + .../recipes/andesite_raw_stairs_to_brick.json | 41 + .../recipes/andesite_raw_wall_polishing.json | 66 + .../recipes/andesite_raw_walls_to_brick.json | 41 + .../recipes/andesite_relief_axe.json | 12 +- .../recipes/andesite_relief_blank.json | 10 +- .../recipes/andesite_relief_cross.json | 12 +- .../recipes/andesite_relief_hammer.json | 12 +- .../recipes/andesite_relief_hoe.json | 12 +- .../recipes/andesite_relief_horizontal.json | 12 +- .../recipes/andesite_relief_i.json | 12 +- .../recipes/andesite_relief_left.json | 12 +- .../recipes/andesite_relief_pickaxe.json | 12 +- .../recipes/andesite_relief_plus.json | 12 +- .../recipes/andesite_relief_right.json | 12 +- .../recipes/andesite_relief_sword.json | 12 +- .../recipes/andesite_relief_vertical.json | 12 +- .../advancements/recipes/andesite_slab.json | 6 + .../advancements/recipes/andesite_smooth.json | 20 + .../recipes/andesite_smooth_brick.json | 10 +- .../andesite_smooth_brick_furnace.json | 27 +- .../recipes/andesite_smooth_brick_slab.json | 11 +- .../recipes/andesite_smooth_brick_stairs.json | 11 +- .../recipes/andesite_smooth_brick_wall.json | 11 +- .../recipes/andesite_smooth_furnace.json | 26 +- .../recipes/andesite_smooth_slab.json | 10 +- .../recipes/andesite_smooth_stairs.json | 10 +- .../recipes/andesite_smooth_wall.json | 10 +- .../advancements/recipes/andesite_stairs.json | 6 + .../recipes/andesite_to_stone.json | 31 + .../advancements/recipes/andesite_wall.json | 6 + .../advancements/recipes/basalt_brick.json | 6 + .../recipes/basalt_brick_block_polishing.json | 66 + .../recipes/basalt_brick_furnace.json | 26 +- .../recipes/basalt_brick_slab.json | 10 +- .../recipes/basalt_brick_slab_polishing.json | 66 + .../basalt_brick_slab_recombination.json | 41 + .../recipes/basalt_brick_stairs.json | 10 +- .../basalt_brick_stairs_polishing.json | 66 + .../recipes/basalt_brick_wall.json | 10 +- .../recipes/basalt_brick_wall_polishing.json | 66 + .../recipes/basalt_cobblestone.json | 32 + .../advancements/recipes/basalt_furnace.json | 22 +- ...alt_polished_brick_slab_recombination.json | 41 + .../basalt_polished_slab_recombination.json | 41 + .../basalt_polished_slabs_to_brick.json | 41 + .../basalt_polished_stairs_to_brick.json | 41 + .../basalt_polished_walls_to_brick.json | 41 + .../recipes/basalt_raw_slab_polishing.json | 66 + .../basalt_raw_slab_recombination.json | 41 + .../recipes/basalt_raw_slabs_to_brick.json | 41 + .../recipes/basalt_raw_stairs_polishing.json | 66 + .../recipes/basalt_raw_stairs_to_brick.json | 41 + .../recipes/basalt_raw_wall_polishing.json | 66 + .../recipes/basalt_raw_walls_to_brick.json | 41 + .../recipes/basalt_relief_axe.json | 12 +- .../recipes/basalt_relief_blank.json | 10 +- .../recipes/basalt_relief_cross.json | 12 +- .../recipes/basalt_relief_hammer.json | 12 +- .../recipes/basalt_relief_hoe.json | 12 +- .../recipes/basalt_relief_horizontal.json | 12 +- .../advancements/recipes/basalt_relief_i.json | 12 +- .../recipes/basalt_relief_left.json | 12 +- .../recipes/basalt_relief_pickaxe.json | 12 +- .../recipes/basalt_relief_plus.json | 12 +- .../recipes/basalt_relief_right.json | 12 +- .../recipes/basalt_relief_sword.json | 12 +- .../recipes/basalt_relief_vertical.json | 12 +- .../advancements/recipes/basalt_slab.json | 6 + .../advancements/recipes/basalt_smooth.json | 20 + .../recipes/basalt_smooth_brick.json | 10 +- .../recipes/basalt_smooth_brick_furnace.json | 27 +- .../recipes/basalt_smooth_brick_slab.json | 11 +- .../recipes/basalt_smooth_brick_stairs.json | 11 +- .../recipes/basalt_smooth_brick_wall.json | 11 +- .../recipes/basalt_smooth_furnace.json | 26 +- .../recipes/basalt_smooth_slab.json | 10 +- .../recipes/basalt_smooth_stairs.json | 10 +- .../recipes/basalt_smooth_wall.json | 10 +- .../advancements/recipes/basalt_stairs.json | 6 + .../advancements/recipes/basalt_to_stone.json | 31 + .../advancements/recipes/basalt_wall.json | 6 + .../recipes/basaltic_glass_brick.json | 6 + .../basaltic_glass_brick_block_polishing.json | 66 + .../recipes/basaltic_glass_brick_furnace.json | 26 +- .../recipes/basaltic_glass_brick_slab.json | 10 +- .../basaltic_glass_brick_slab_polishing.json | 66 + ...saltic_glass_brick_slab_recombination.json | 41 + .../recipes/basaltic_glass_brick_stairs.json | 10 +- ...basaltic_glass_brick_stairs_polishing.json | 66 + .../recipes/basaltic_glass_brick_wall.json | 10 +- .../basaltic_glass_brick_wall_polishing.json | 66 + .../recipes/basaltic_glass_cobblestone.json | 32 + .../recipes/basaltic_glass_furnace.json | 24 +- ...ass_polished_brick_slab_recombination.json | 41 + ...tic_glass_polished_slab_recombination.json | 41 + ...asaltic_glass_polished_slabs_to_brick.json | 41 + ...saltic_glass_polished_stairs_to_brick.json | 41 + ...asaltic_glass_polished_walls_to_brick.json | 41 + .../basaltic_glass_raw_slab_polishing.json | 66 + ...basaltic_glass_raw_slab_recombination.json | 41 + .../basaltic_glass_raw_slabs_to_brick.json | 41 + .../basaltic_glass_raw_stairs_polishing.json | 66 + .../basaltic_glass_raw_stairs_to_brick.json | 41 + .../basaltic_glass_raw_wall_polishing.json | 66 + .../basaltic_glass_raw_walls_to_brick.json | 41 + .../recipes/basaltic_glass_relief_axe.json | 12 +- .../recipes/basaltic_glass_relief_blank.json | 10 +- .../recipes/basaltic_glass_relief_cross.json | 12 +- .../recipes/basaltic_glass_relief_hammer.json | 12 +- .../recipes/basaltic_glass_relief_hoe.json | 12 +- .../basaltic_glass_relief_horizontal.json | 12 +- .../recipes/basaltic_glass_relief_i.json | 12 +- .../recipes/basaltic_glass_relief_left.json | 12 +- .../basaltic_glass_relief_pickaxe.json | 12 +- .../recipes/basaltic_glass_relief_plus.json | 12 +- .../recipes/basaltic_glass_relief_right.json | 12 +- .../recipes/basaltic_glass_relief_sword.json | 12 +- .../basaltic_glass_relief_vertical.json | 12 +- .../recipes/basaltic_glass_slab.json | 6 + .../recipes/basaltic_glass_smooth.json | 20 + .../recipes/basaltic_glass_smooth_brick.json | 10 +- .../basaltic_glass_smooth_brick_furnace.json | 27 +- .../basaltic_glass_smooth_brick_slab.json | 11 +- .../basaltic_glass_smooth_brick_stairs.json | 11 +- .../basaltic_glass_smooth_brick_wall.json | 11 +- .../basaltic_glass_smooth_furnace.json | 26 +- .../recipes/basaltic_glass_smooth_slab.json | 10 +- .../recipes/basaltic_glass_smooth_stairs.json | 10 +- .../recipes/basaltic_glass_smooth_wall.json | 10 +- .../recipes/basaltic_glass_stairs.json | 6 + .../recipes/basaltic_glass_to_stone.json | 31 + .../recipes/basaltic_glass_wall.json | 6 + .../advancements/recipes/chalk.json | 37 + .../advancements/recipes/chalk_dust.json | 37 + .../advancements/recipes/cobblestone.json | 32 + .../recipes/conglomerate_brick.json | 6 + .../conglomerate_brick_block_polishing.json | 66 + .../recipes/conglomerate_brick_furnace.json | 26 +- .../recipes/conglomerate_brick_slab.json | 10 +- .../conglomerate_brick_slab_polishing.json | 66 + ...conglomerate_brick_slab_recombination.json | 41 + .../recipes/conglomerate_brick_stairs.json | 10 +- .../conglomerate_brick_stairs_polishing.json | 66 + .../recipes/conglomerate_brick_wall.json | 10 +- .../conglomerate_brick_wall_polishing.json | 66 + .../recipes/conglomerate_cobblestone.json | 32 + .../recipes/conglomerate_furnace.json | 24 +- ...ate_polished_brick_slab_recombination.json | 41 + ...glomerate_polished_slab_recombination.json | 41 + .../conglomerate_polished_slabs_to_brick.json | 41 + ...conglomerate_polished_stairs_to_brick.json | 41 + .../conglomerate_polished_walls_to_brick.json | 41 + .../conglomerate_raw_slab_polishing.json | 66 + .../conglomerate_raw_slab_recombination.json | 41 + .../conglomerate_raw_slabs_to_brick.json | 41 + .../conglomerate_raw_stairs_polishing.json | 66 + .../conglomerate_raw_stairs_to_brick.json | 41 + .../conglomerate_raw_wall_polishing.json | 66 + .../conglomerate_raw_walls_to_brick.json | 41 + .../recipes/conglomerate_relief_axe.json | 12 +- .../recipes/conglomerate_relief_blank.json | 10 +- .../recipes/conglomerate_relief_cross.json | 12 +- .../recipes/conglomerate_relief_hammer.json | 12 +- .../recipes/conglomerate_relief_hoe.json | 12 +- .../conglomerate_relief_horizontal.json | 12 +- .../recipes/conglomerate_relief_i.json | 12 +- .../recipes/conglomerate_relief_left.json | 12 +- .../recipes/conglomerate_relief_pickaxe.json | 12 +- .../recipes/conglomerate_relief_plus.json | 12 +- .../recipes/conglomerate_relief_right.json | 12 +- .../recipes/conglomerate_relief_sword.json | 12 +- .../recipes/conglomerate_relief_vertical.json | 12 +- .../recipes/conglomerate_slab.json | 6 + .../recipes/conglomerate_smooth.json | 20 + .../recipes/conglomerate_smooth_brick.json | 10 +- .../conglomerate_smooth_brick_furnace.json | 27 +- .../conglomerate_smooth_brick_slab.json | 11 +- .../conglomerate_smooth_brick_stairs.json | 11 +- .../conglomerate_smooth_brick_wall.json | 11 +- .../recipes/conglomerate_smooth_furnace.json | 26 +- .../recipes/conglomerate_smooth_slab.json | 10 +- .../recipes/conglomerate_smooth_stairs.json | 10 +- .../recipes/conglomerate_smooth_wall.json | 10 +- .../recipes/conglomerate_stairs.json | 6 + .../recipes/conglomerate_to_stone.json | 31 + .../recipes/conglomerate_wall.json | 6 + .../advancements/recipes/diabase_brick.json | 6 + .../diabase_brick_block_polishing.json | 66 + .../recipes/diabase_brick_furnace.json | 26 +- .../recipes/diabase_brick_slab.json | 10 +- .../recipes/diabase_brick_slab_polishing.json | 66 + .../diabase_brick_slab_recombination.json | 41 + .../recipes/diabase_brick_stairs.json | 10 +- .../diabase_brick_stairs_polishing.json | 66 + .../recipes/diabase_brick_wall.json | 10 +- .../recipes/diabase_brick_wall_polishing.json | 66 + .../recipes/diabase_cobblestone.json | 32 + .../advancements/recipes/diabase_furnace.json | 24 +- ...ase_polished_brick_slab_recombination.json | 41 + .../diabase_polished_slab_recombination.json | 41 + .../diabase_polished_slabs_to_brick.json | 41 + .../diabase_polished_stairs_to_brick.json | 41 + .../diabase_polished_walls_to_brick.json | 41 + .../recipes/diabase_raw_slab_polishing.json | 66 + .../diabase_raw_slab_recombination.json | 41 + .../recipes/diabase_raw_slabs_to_brick.json | 41 + .../recipes/diabase_raw_stairs_polishing.json | 66 + .../recipes/diabase_raw_stairs_to_brick.json | 41 + .../recipes/diabase_raw_wall_polishing.json | 66 + .../recipes/diabase_raw_walls_to_brick.json | 41 + .../recipes/diabase_relief_axe.json | 12 +- .../recipes/diabase_relief_blank.json | 10 +- .../recipes/diabase_relief_cross.json | 12 +- .../recipes/diabase_relief_hammer.json | 12 +- .../recipes/diabase_relief_hoe.json | 12 +- .../recipes/diabase_relief_horizontal.json | 12 +- .../recipes/diabase_relief_i.json | 12 +- .../recipes/diabase_relief_left.json | 12 +- .../recipes/diabase_relief_pickaxe.json | 12 +- .../recipes/diabase_relief_plus.json | 12 +- .../recipes/diabase_relief_right.json | 12 +- .../recipes/diabase_relief_sword.json | 12 +- .../recipes/diabase_relief_vertical.json | 12 +- .../advancements/recipes/diabase_slab.json | 6 + .../advancements/recipes/diabase_smooth.json | 20 + .../recipes/diabase_smooth_brick.json | 10 +- .../recipes/diabase_smooth_brick_furnace.json | 27 +- .../recipes/diabase_smooth_brick_slab.json | 11 +- .../recipes/diabase_smooth_brick_stairs.json | 11 +- .../recipes/diabase_smooth_brick_wall.json | 11 +- .../recipes/diabase_smooth_furnace.json | 26 +- .../recipes/diabase_smooth_slab.json | 10 +- .../recipes/diabase_smooth_stairs.json | 10 +- .../recipes/diabase_smooth_wall.json | 10 +- .../advancements/recipes/diabase_stairs.json | 6 + .../recipes/diabase_to_stone.json | 31 + .../advancements/recipes/diabase_wall.json | 6 + .../advancements/recipes/diorite_brick.json | 6 + .../diorite_brick_block_polishing.json | 66 + .../recipes/diorite_brick_furnace.json | 26 +- .../recipes/diorite_brick_slab.json | 10 +- .../recipes/diorite_brick_slab_polishing.json | 66 + .../diorite_brick_slab_recombination.json | 41 + .../recipes/diorite_brick_stairs.json | 10 +- .../diorite_brick_stairs_polishing.json | 66 + .../recipes/diorite_brick_wall.json | 10 +- .../recipes/diorite_brick_wall_polishing.json | 66 + .../recipes/diorite_cobblestone.json | 32 + .../advancements/recipes/diorite_furnace.json | 22 +- ...ite_polished_brick_slab_recombination.json | 41 + .../diorite_polished_slab_recombination.json | 41 + .../diorite_polished_slabs_to_brick.json | 41 + .../diorite_polished_stairs_to_brick.json | 41 + .../diorite_polished_walls_to_brick.json | 41 + .../recipes/diorite_raw_slab_polishing.json | 66 + .../diorite_raw_slab_recombination.json | 41 + .../recipes/diorite_raw_slabs_to_brick.json | 41 + .../recipes/diorite_raw_stairs_polishing.json | 66 + .../recipes/diorite_raw_stairs_to_brick.json | 41 + .../recipes/diorite_raw_wall_polishing.json | 66 + .../recipes/diorite_raw_walls_to_brick.json | 41 + .../recipes/diorite_relief_axe.json | 12 +- .../recipes/diorite_relief_blank.json | 10 +- .../recipes/diorite_relief_cross.json | 12 +- .../recipes/diorite_relief_hammer.json | 12 +- .../recipes/diorite_relief_hoe.json | 12 +- .../recipes/diorite_relief_horizontal.json | 12 +- .../recipes/diorite_relief_i.json | 12 +- .../recipes/diorite_relief_left.json | 12 +- .../recipes/diorite_relief_pickaxe.json | 12 +- .../recipes/diorite_relief_plus.json | 12 +- .../recipes/diorite_relief_right.json | 12 +- .../recipes/diorite_relief_sword.json | 12 +- .../recipes/diorite_relief_vertical.json | 12 +- .../advancements/recipes/diorite_slab.json | 6 + .../advancements/recipes/diorite_smooth.json | 20 + .../recipes/diorite_smooth_brick.json | 10 +- .../recipes/diorite_smooth_brick_furnace.json | 27 +- .../recipes/diorite_smooth_brick_slab.json | 11 +- .../recipes/diorite_smooth_brick_stairs.json | 11 +- .../recipes/diorite_smooth_brick_wall.json | 11 +- .../recipes/diorite_smooth_furnace.json | 26 +- .../recipes/diorite_smooth_slab.json | 10 +- .../recipes/diorite_smooth_stairs.json | 10 +- .../recipes/diorite_smooth_wall.json | 10 +- .../advancements/recipes/diorite_stairs.json | 6 + .../recipes/diorite_to_stone.json | 31 + .../advancements/recipes/diorite_wall.json | 6 + .../advancements/recipes/dolomite_brick.json | 6 + .../dolomite_brick_block_polishing.json | 66 + .../recipes/dolomite_brick_furnace.json | 26 +- .../recipes/dolomite_brick_slab.json | 10 +- .../dolomite_brick_slab_polishing.json | 66 + .../dolomite_brick_slab_recombination.json | 41 + .../recipes/dolomite_brick_stairs.json | 10 +- .../dolomite_brick_stairs_polishing.json | 66 + .../recipes/dolomite_brick_wall.json | 10 +- .../dolomite_brick_wall_polishing.json | 66 + .../recipes/dolomite_cobblestone.json | 32 + .../recipes/dolomite_furnace.json | 24 +- ...ite_polished_brick_slab_recombination.json | 41 + .../dolomite_polished_slab_recombination.json | 41 + .../dolomite_polished_slabs_to_brick.json | 41 + .../dolomite_polished_stairs_to_brick.json | 41 + .../dolomite_polished_walls_to_brick.json | 41 + .../recipes/dolomite_raw_slab_polishing.json | 66 + .../dolomite_raw_slab_recombination.json | 41 + .../recipes/dolomite_raw_slabs_to_brick.json | 41 + .../dolomite_raw_stairs_polishing.json | 66 + .../recipes/dolomite_raw_stairs_to_brick.json | 41 + .../recipes/dolomite_raw_wall_polishing.json | 66 + .../recipes/dolomite_raw_walls_to_brick.json | 41 + .../recipes/dolomite_relief_axe.json | 12 +- .../recipes/dolomite_relief_blank.json | 10 +- .../recipes/dolomite_relief_cross.json | 12 +- .../recipes/dolomite_relief_hammer.json | 12 +- .../recipes/dolomite_relief_hoe.json | 12 +- .../recipes/dolomite_relief_horizontal.json | 12 +- .../recipes/dolomite_relief_i.json | 12 +- .../recipes/dolomite_relief_left.json | 12 +- .../recipes/dolomite_relief_pickaxe.json | 12 +- .../recipes/dolomite_relief_plus.json | 12 +- .../recipes/dolomite_relief_right.json | 12 +- .../recipes/dolomite_relief_sword.json | 12 +- .../recipes/dolomite_relief_vertical.json | 12 +- .../advancements/recipes/dolomite_slab.json | 6 + .../advancements/recipes/dolomite_smooth.json | 20 + .../recipes/dolomite_smooth_brick.json | 10 +- .../dolomite_smooth_brick_furnace.json | 27 +- .../recipes/dolomite_smooth_brick_slab.json | 11 +- .../recipes/dolomite_smooth_brick_stairs.json | 11 +- .../recipes/dolomite_smooth_brick_wall.json | 11 +- .../recipes/dolomite_smooth_furnace.json | 26 +- .../recipes/dolomite_smooth_slab.json | 10 +- .../recipes/dolomite_smooth_stairs.json | 10 +- .../recipes/dolomite_smooth_wall.json | 10 +- .../advancements/recipes/dolomite_stairs.json | 6 + .../recipes/dolomite_to_stone.json | 31 + .../advancements/recipes/dolomite_wall.json | 6 + .../advancements/recipes/drywall.json | 41 + .../advancements/recipes/drywall_black.json | 41 + .../advancements/recipes/drywall_blue.json | 41 + .../advancements/recipes/drywall_brown.json | 41 + .../advancements/recipes/drywall_cyan.json | 41 + .../advancements/recipes/drywall_gray.json | 41 + .../advancements/recipes/drywall_green.json | 41 + .../recipes/drywall_light_blue.json | 41 + .../advancements/recipes/drywall_lime.json | 41 + .../advancements/recipes/drywall_magenta.json | 41 + .../advancements/recipes/drywall_orange.json | 41 + .../advancements/recipes/drywall_pink.json | 41 + .../advancements/recipes/drywall_purple.json | 41 + .../advancements/recipes/drywall_red.json | 41 + .../advancements/recipes/drywall_silver.json | 41 + .../advancements/recipes/drywall_white.json | 41 + .../advancements/recipes/drywall_yellow.json | 41 + .../advancements/recipes/gabbro_brick.json | 6 + .../recipes/gabbro_brick_block_polishing.json | 66 + .../recipes/gabbro_brick_furnace.json | 26 +- .../recipes/gabbro_brick_slab.json | 10 +- .../recipes/gabbro_brick_slab_polishing.json | 66 + .../gabbro_brick_slab_recombination.json | 41 + .../recipes/gabbro_brick_stairs.json | 10 +- .../gabbro_brick_stairs_polishing.json | 66 + .../recipes/gabbro_brick_wall.json | 10 +- .../recipes/gabbro_brick_wall_polishing.json | 66 + .../recipes/gabbro_cobblestone.json | 32 + .../advancements/recipes/gabbro_furnace.json | 24 +- ...bro_polished_brick_slab_recombination.json | 41 + .../gabbro_polished_slab_recombination.json | 41 + .../gabbro_polished_slabs_to_brick.json | 41 + .../gabbro_polished_stairs_to_brick.json | 41 + .../gabbro_polished_walls_to_brick.json | 41 + .../recipes/gabbro_raw_slab_polishing.json | 66 + .../gabbro_raw_slab_recombination.json | 41 + .../recipes/gabbro_raw_slabs_to_brick.json | 41 + .../recipes/gabbro_raw_stairs_polishing.json | 66 + .../recipes/gabbro_raw_stairs_to_brick.json | 41 + .../recipes/gabbro_raw_wall_polishing.json | 66 + .../recipes/gabbro_raw_walls_to_brick.json | 41 + .../recipes/gabbro_relief_axe.json | 12 +- .../recipes/gabbro_relief_blank.json | 10 +- .../recipes/gabbro_relief_cross.json | 12 +- .../recipes/gabbro_relief_hammer.json | 12 +- .../recipes/gabbro_relief_hoe.json | 12 +- .../recipes/gabbro_relief_horizontal.json | 12 +- .../advancements/recipes/gabbro_relief_i.json | 12 +- .../recipes/gabbro_relief_left.json | 12 +- .../recipes/gabbro_relief_pickaxe.json | 12 +- .../recipes/gabbro_relief_plus.json | 12 +- .../recipes/gabbro_relief_right.json | 12 +- .../recipes/gabbro_relief_sword.json | 12 +- .../recipes/gabbro_relief_vertical.json | 12 +- .../advancements/recipes/gabbro_slab.json | 6 + .../advancements/recipes/gabbro_smooth.json | 20 + .../recipes/gabbro_smooth_brick.json | 10 +- .../recipes/gabbro_smooth_brick_furnace.json | 27 +- .../recipes/gabbro_smooth_brick_slab.json | 11 +- .../recipes/gabbro_smooth_brick_stairs.json | 11 +- .../recipes/gabbro_smooth_brick_wall.json | 11 +- .../recipes/gabbro_smooth_furnace.json | 26 +- .../recipes/gabbro_smooth_slab.json | 10 +- .../recipes/gabbro_smooth_stairs.json | 10 +- .../recipes/gabbro_smooth_wall.json | 10 +- .../advancements/recipes/gabbro_stairs.json | 6 + .../advancements/recipes/gabbro_to_stone.json | 31 + .../advancements/recipes/gabbro_wall.json | 6 + .../advancements/recipes/gneiss_brick.json | 6 + .../recipes/gneiss_brick_block_polishing.json | 66 + .../recipes/gneiss_brick_furnace.json | 26 +- .../recipes/gneiss_brick_slab.json | 10 +- .../recipes/gneiss_brick_slab_polishing.json | 66 + .../gneiss_brick_slab_recombination.json | 41 + .../recipes/gneiss_brick_stairs.json | 10 +- .../gneiss_brick_stairs_polishing.json | 66 + .../recipes/gneiss_brick_wall.json | 10 +- .../recipes/gneiss_brick_wall_polishing.json | 66 + .../recipes/gneiss_cobblestone.json | 32 + .../advancements/recipes/gneiss_furnace.json | 24 +- ...iss_polished_brick_slab_recombination.json | 41 + .../gneiss_polished_slab_recombination.json | 41 + .../gneiss_polished_slabs_to_brick.json | 41 + .../gneiss_polished_stairs_to_brick.json | 41 + .../gneiss_polished_walls_to_brick.json | 41 + .../recipes/gneiss_raw_slab_polishing.json | 66 + .../gneiss_raw_slab_recombination.json | 41 + .../recipes/gneiss_raw_slabs_to_brick.json | 41 + .../recipes/gneiss_raw_stairs_polishing.json | 66 + .../recipes/gneiss_raw_stairs_to_brick.json | 41 + .../recipes/gneiss_raw_wall_polishing.json | 66 + .../recipes/gneiss_raw_walls_to_brick.json | 41 + .../recipes/gneiss_relief_axe.json | 12 +- .../recipes/gneiss_relief_blank.json | 10 +- .../recipes/gneiss_relief_cross.json | 12 +- .../recipes/gneiss_relief_hammer.json | 12 +- .../recipes/gneiss_relief_hoe.json | 12 +- .../recipes/gneiss_relief_horizontal.json | 12 +- .../advancements/recipes/gneiss_relief_i.json | 12 +- .../recipes/gneiss_relief_left.json | 12 +- .../recipes/gneiss_relief_pickaxe.json | 12 +- .../recipes/gneiss_relief_plus.json | 12 +- .../recipes/gneiss_relief_right.json | 12 +- .../recipes/gneiss_relief_sword.json | 12 +- .../recipes/gneiss_relief_vertical.json | 12 +- .../advancements/recipes/gneiss_slab.json | 6 + .../advancements/recipes/gneiss_smooth.json | 20 + .../recipes/gneiss_smooth_brick.json | 10 +- .../recipes/gneiss_smooth_brick_furnace.json | 27 +- .../recipes/gneiss_smooth_brick_slab.json | 11 +- .../recipes/gneiss_smooth_brick_stairs.json | 11 +- .../recipes/gneiss_smooth_brick_wall.json | 11 +- .../recipes/gneiss_smooth_furnace.json | 26 +- .../recipes/gneiss_smooth_slab.json | 10 +- .../recipes/gneiss_smooth_stairs.json | 10 +- .../recipes/gneiss_smooth_wall.json | 10 +- .../advancements/recipes/gneiss_stairs.json | 6 + .../advancements/recipes/gneiss_to_stone.json | 31 + .../advancements/recipes/gneiss_wall.json | 6 + .../advancements/recipes/granite_brick.json | 6 + .../granite_brick_block_polishing.json | 66 + .../recipes/granite_brick_furnace.json | 26 +- .../recipes/granite_brick_slab.json | 10 +- .../recipes/granite_brick_slab_polishing.json | 66 + .../granite_brick_slab_recombination.json | 41 + .../recipes/granite_brick_stairs.json | 10 +- .../granite_brick_stairs_polishing.json | 66 + .../recipes/granite_brick_wall.json | 10 +- .../recipes/granite_brick_wall_polishing.json | 66 + .../recipes/granite_cobblestone.json | 32 + .../advancements/recipes/granite_furnace.json | 22 +- ...ite_polished_brick_slab_recombination.json | 41 + .../granite_polished_slab_recombination.json | 41 + .../granite_polished_slabs_to_brick.json | 41 + .../granite_polished_stairs_to_brick.json | 41 + .../granite_polished_walls_to_brick.json | 41 + .../recipes/granite_raw_slab_polishing.json | 66 + .../granite_raw_slab_recombination.json | 41 + .../recipes/granite_raw_slabs_to_brick.json | 41 + .../recipes/granite_raw_stairs_polishing.json | 66 + .../recipes/granite_raw_stairs_to_brick.json | 41 + .../recipes/granite_raw_wall_polishing.json | 66 + .../recipes/granite_raw_walls_to_brick.json | 41 + .../recipes/granite_relief_axe.json | 12 +- .../recipes/granite_relief_blank.json | 10 +- .../recipes/granite_relief_cross.json | 12 +- .../recipes/granite_relief_hammer.json | 12 +- .../recipes/granite_relief_hoe.json | 12 +- .../recipes/granite_relief_horizontal.json | 12 +- .../recipes/granite_relief_i.json | 12 +- .../recipes/granite_relief_left.json | 12 +- .../recipes/granite_relief_pickaxe.json | 12 +- .../recipes/granite_relief_plus.json | 12 +- .../recipes/granite_relief_right.json | 12 +- .../recipes/granite_relief_sword.json | 12 +- .../recipes/granite_relief_vertical.json | 12 +- .../advancements/recipes/granite_slab.json | 6 + .../advancements/recipes/granite_smooth.json | 20 + .../recipes/granite_smooth_brick.json | 10 +- .../recipes/granite_smooth_brick_furnace.json | 27 +- .../recipes/granite_smooth_brick_slab.json | 11 +- .../recipes/granite_smooth_brick_stairs.json | 11 +- .../recipes/granite_smooth_brick_wall.json | 11 +- .../recipes/granite_smooth_furnace.json | 26 +- .../recipes/granite_smooth_slab.json | 10 +- .../recipes/granite_smooth_stairs.json | 10 +- .../recipes/granite_smooth_wall.json | 10 +- .../advancements/recipes/granite_stairs.json | 6 + .../recipes/granite_to_stone.json | 31 + .../advancements/recipes/granite_wall.json | 6 + .../advancements/recipes/gravel_to_stone.json | 37 + .../recipes/gunpowder_from_carbon_dust.json | 44 + .../recipes/gunpowder_from_charcoal.json | 37 + .../recipes/gunpowder_from_coal_dust.json | 44 + .../recipes/gunpowder_from_sugar.json | 37 + .../advancements/recipes/gypsum.json | 37 + .../advancements/recipes/gypsum_dust.json | 37 + .../advancements/recipes/hornfels_brick.json | 6 + .../hornfels_brick_block_polishing.json | 66 + .../recipes/hornfels_brick_furnace.json | 26 +- .../recipes/hornfels_brick_slab.json | 10 +- .../hornfels_brick_slab_polishing.json | 66 + .../hornfels_brick_slab_recombination.json | 41 + .../recipes/hornfels_brick_stairs.json | 10 +- .../hornfels_brick_stairs_polishing.json | 66 + .../recipes/hornfels_brick_wall.json | 10 +- .../hornfels_brick_wall_polishing.json | 66 + .../recipes/hornfels_cobblestone.json | 32 + .../recipes/hornfels_furnace.json | 24 +- ...els_polished_brick_slab_recombination.json | 41 + .../hornfels_polished_slab_recombination.json | 41 + .../hornfels_polished_slabs_to_brick.json | 41 + .../hornfels_polished_stairs_to_brick.json | 41 + .../hornfels_polished_walls_to_brick.json | 41 + .../recipes/hornfels_raw_slab_polishing.json | 66 + .../hornfels_raw_slab_recombination.json | 41 + .../recipes/hornfels_raw_slabs_to_brick.json | 41 + .../hornfels_raw_stairs_polishing.json | 66 + .../recipes/hornfels_raw_stairs_to_brick.json | 41 + .../recipes/hornfels_raw_wall_polishing.json | 66 + .../recipes/hornfels_raw_walls_to_brick.json | 41 + .../recipes/hornfels_relief_axe.json | 12 +- .../recipes/hornfels_relief_blank.json | 10 +- .../recipes/hornfels_relief_cross.json | 12 +- .../recipes/hornfels_relief_hammer.json | 12 +- .../recipes/hornfels_relief_hoe.json | 12 +- .../recipes/hornfels_relief_horizontal.json | 12 +- .../recipes/hornfels_relief_i.json | 12 +- .../recipes/hornfels_relief_left.json | 12 +- .../recipes/hornfels_relief_pickaxe.json | 12 +- .../recipes/hornfels_relief_plus.json | 12 +- .../recipes/hornfels_relief_right.json | 12 +- .../recipes/hornfels_relief_sword.json | 12 +- .../recipes/hornfels_relief_vertical.json | 12 +- .../advancements/recipes/hornfels_slab.json | 6 + .../advancements/recipes/hornfels_smooth.json | 20 + .../recipes/hornfels_smooth_brick.json | 10 +- .../hornfels_smooth_brick_furnace.json | 27 +- .../recipes/hornfels_smooth_brick_slab.json | 11 +- .../recipes/hornfels_smooth_brick_stairs.json | 11 +- .../recipes/hornfels_smooth_brick_wall.json | 11 +- .../recipes/hornfels_smooth_furnace.json | 26 +- .../recipes/hornfels_smooth_slab.json | 10 +- .../recipes/hornfels_smooth_stairs.json | 10 +- .../recipes/hornfels_smooth_wall.json | 10 +- .../advancements/recipes/hornfels_stairs.json | 6 + .../recipes/hornfels_to_stone.json | 31 + .../advancements/recipes/hornfels_wall.json | 6 + .../advancements/recipes/limestone_brick.json | 6 + .../limestone_brick_block_polishing.json | 66 + .../recipes/limestone_brick_furnace.json | 26 +- .../recipes/limestone_brick_slab.json | 10 +- .../limestone_brick_slab_polishing.json | 66 + .../limestone_brick_slab_recombination.json | 41 + .../recipes/limestone_brick_stairs.json | 10 +- .../limestone_brick_stairs_polishing.json | 66 + .../recipes/limestone_brick_wall.json | 10 +- .../limestone_brick_wall_polishing.json | 66 + .../recipes/limestone_cobblestone.json | 32 + .../recipes/limestone_furnace.json | 24 +- ...one_polished_brick_slab_recombination.json | 41 + ...limestone_polished_slab_recombination.json | 41 + .../limestone_polished_slabs_to_brick.json | 41 + .../limestone_polished_stairs_to_brick.json | 41 + .../limestone_polished_walls_to_brick.json | 41 + .../recipes/limestone_raw_slab_polishing.json | 66 + .../limestone_raw_slab_recombination.json | 41 + .../recipes/limestone_raw_slabs_to_brick.json | 41 + .../limestone_raw_stairs_polishing.json | 66 + .../limestone_raw_stairs_to_brick.json | 41 + .../recipes/limestone_raw_wall_polishing.json | 66 + .../recipes/limestone_raw_walls_to_brick.json | 41 + .../recipes/limestone_relief_axe.json | 12 +- .../recipes/limestone_relief_blank.json | 10 +- .../recipes/limestone_relief_cross.json | 12 +- .../recipes/limestone_relief_hammer.json | 12 +- .../recipes/limestone_relief_hoe.json | 12 +- .../recipes/limestone_relief_horizontal.json | 12 +- .../recipes/limestone_relief_i.json | 12 +- .../recipes/limestone_relief_left.json | 12 +- .../recipes/limestone_relief_pickaxe.json | 12 +- .../recipes/limestone_relief_plus.json | 12 +- .../recipes/limestone_relief_right.json | 12 +- .../recipes/limestone_relief_sword.json | 12 +- .../recipes/limestone_relief_vertical.json | 12 +- .../advancements/recipes/limestone_slab.json | 6 + .../recipes/limestone_smooth.json | 20 + .../recipes/limestone_smooth_brick.json | 10 +- .../limestone_smooth_brick_furnace.json | 27 +- .../recipes/limestone_smooth_brick_slab.json | 11 +- .../limestone_smooth_brick_stairs.json | 11 +- .../recipes/limestone_smooth_brick_wall.json | 11 +- .../recipes/limestone_smooth_furnace.json | 26 +- .../recipes/limestone_smooth_slab.json | 10 +- .../recipes/limestone_smooth_stairs.json | 10 +- .../recipes/limestone_smooth_wall.json | 10 +- .../recipes/limestone_stairs.json | 6 + .../recipes/limestone_to_stone.json | 31 + .../advancements/recipes/limestone_wall.json | 6 + .../advancements/recipes/marble_brick.json | 6 + .../recipes/marble_brick_block_polishing.json | 66 + .../recipes/marble_brick_furnace.json | 26 +- .../recipes/marble_brick_slab.json | 10 +- .../recipes/marble_brick_slab_polishing.json | 66 + .../marble_brick_slab_recombination.json | 41 + .../recipes/marble_brick_stairs.json | 10 +- .../marble_brick_stairs_polishing.json | 66 + .../recipes/marble_brick_wall.json | 10 +- .../recipes/marble_brick_wall_polishing.json | 66 + .../recipes/marble_cobblestone.json | 32 + .../advancements/recipes/marble_furnace.json | 24 +- ...ble_polished_brick_slab_recombination.json | 41 + .../marble_polished_slab_recombination.json | 41 + .../marble_polished_slabs_to_brick.json | 41 + .../marble_polished_stairs_to_brick.json | 41 + .../marble_polished_walls_to_brick.json | 41 + .../recipes/marble_raw_slab_polishing.json | 66 + .../marble_raw_slab_recombination.json | 41 + .../recipes/marble_raw_slabs_to_brick.json | 41 + .../recipes/marble_raw_stairs_polishing.json | 66 + .../recipes/marble_raw_stairs_to_brick.json | 41 + .../recipes/marble_raw_wall_polishing.json | 66 + .../recipes/marble_raw_walls_to_brick.json | 41 + .../recipes/marble_relief_axe.json | 12 +- .../recipes/marble_relief_blank.json | 10 +- .../recipes/marble_relief_cross.json | 12 +- .../recipes/marble_relief_hammer.json | 12 +- .../recipes/marble_relief_hoe.json | 12 +- .../recipes/marble_relief_horizontal.json | 12 +- .../advancements/recipes/marble_relief_i.json | 12 +- .../recipes/marble_relief_left.json | 12 +- .../recipes/marble_relief_pickaxe.json | 12 +- .../recipes/marble_relief_plus.json | 12 +- .../recipes/marble_relief_right.json | 12 +- .../recipes/marble_relief_sword.json | 12 +- .../recipes/marble_relief_vertical.json | 12 +- .../advancements/recipes/marble_slab.json | 6 + .../advancements/recipes/marble_smooth.json | 20 + .../recipes/marble_smooth_brick.json | 10 +- .../recipes/marble_smooth_brick_furnace.json | 27 +- .../recipes/marble_smooth_brick_slab.json | 11 +- .../recipes/marble_smooth_brick_stairs.json | 11 +- .../recipes/marble_smooth_brick_wall.json | 11 +- .../recipes/marble_smooth_furnace.json | 26 +- .../recipes/marble_smooth_slab.json | 10 +- .../recipes/marble_smooth_stairs.json | 10 +- .../recipes/marble_smooth_wall.json | 10 +- .../advancements/recipes/marble_stairs.json | 6 + .../advancements/recipes/marble_to_stone.json | 31 + .../advancements/recipes/marble_wall.json | 6 + .../recipes/mineralfertilizer.json | 41 + .../advancements/recipes/nitrate_block.json | 41 + .../advancements/recipes/nitrate_dust.json | 41 + .../recipes/novaculite_brick.json | 6 + .../novaculite_brick_block_polishing.json | 66 + .../recipes/novaculite_brick_furnace.json | 26 +- .../recipes/novaculite_brick_slab.json | 10 +- .../novaculite_brick_slab_polishing.json | 66 + .../novaculite_brick_slab_recombination.json | 41 + .../recipes/novaculite_brick_stairs.json | 10 +- .../novaculite_brick_stairs_polishing.json | 66 + .../recipes/novaculite_brick_wall.json | 10 +- .../novaculite_brick_wall_polishing.json | 66 + .../recipes/novaculite_cobblestone.json | 32 + .../recipes/novaculite_furnace.json | 24 +- ...ite_polished_brick_slab_recombination.json | 41 + ...ovaculite_polished_slab_recombination.json | 41 + .../novaculite_polished_slabs_to_brick.json | 41 + .../novaculite_polished_stairs_to_brick.json | 41 + .../novaculite_polished_walls_to_brick.json | 41 + .../novaculite_raw_slab_polishing.json | 66 + .../novaculite_raw_slab_recombination.json | 41 + .../novaculite_raw_slabs_to_brick.json | 41 + .../novaculite_raw_stairs_polishing.json | 66 + .../novaculite_raw_stairs_to_brick.json | 41 + .../novaculite_raw_wall_polishing.json | 66 + .../novaculite_raw_walls_to_brick.json | 41 + .../recipes/novaculite_relief_axe.json | 12 +- .../recipes/novaculite_relief_blank.json | 10 +- .../recipes/novaculite_relief_cross.json | 12 +- .../recipes/novaculite_relief_hammer.json | 12 +- .../recipes/novaculite_relief_hoe.json | 12 +- .../recipes/novaculite_relief_horizontal.json | 12 +- .../recipes/novaculite_relief_i.json | 12 +- .../recipes/novaculite_relief_left.json | 12 +- .../recipes/novaculite_relief_pickaxe.json | 12 +- .../recipes/novaculite_relief_plus.json | 12 +- .../recipes/novaculite_relief_right.json | 12 +- .../recipes/novaculite_relief_sword.json | 12 +- .../recipes/novaculite_relief_vertical.json | 12 +- .../advancements/recipes/novaculite_slab.json | 6 + .../recipes/novaculite_smooth.json | 20 + .../recipes/novaculite_smooth_brick.json | 10 +- .../novaculite_smooth_brick_furnace.json | 27 +- .../recipes/novaculite_smooth_brick_slab.json | 11 +- .../novaculite_smooth_brick_stairs.json | 11 +- .../recipes/novaculite_smooth_brick_wall.json | 11 +- .../recipes/novaculite_smooth_furnace.json | 26 +- .../recipes/novaculite_smooth_slab.json | 10 +- .../recipes/novaculite_smooth_stairs.json | 10 +- .../recipes/novaculite_smooth_wall.json | 10 +- .../recipes/novaculite_stairs.json | 6 + .../recipes/novaculite_to_stone.json | 31 + .../advancements/recipes/novaculite_wall.json | 6 + .../advancements/recipes/pegmatite_brick.json | 6 + .../pegmatite_brick_block_polishing.json | 66 + .../recipes/pegmatite_brick_furnace.json | 26 +- .../recipes/pegmatite_brick_slab.json | 10 +- .../pegmatite_brick_slab_polishing.json | 66 + .../pegmatite_brick_slab_recombination.json | 41 + .../recipes/pegmatite_brick_stairs.json | 10 +- .../pegmatite_brick_stairs_polishing.json | 66 + .../recipes/pegmatite_brick_wall.json | 10 +- .../pegmatite_brick_wall_polishing.json | 66 + .../recipes/pegmatite_cobblestone.json | 32 + .../recipes/pegmatite_furnace.json | 24 +- ...ite_polished_brick_slab_recombination.json | 41 + ...pegmatite_polished_slab_recombination.json | 41 + .../pegmatite_polished_slabs_to_brick.json | 41 + .../pegmatite_polished_stairs_to_brick.json | 41 + .../pegmatite_polished_walls_to_brick.json | 41 + .../recipes/pegmatite_raw_slab_polishing.json | 66 + .../pegmatite_raw_slab_recombination.json | 41 + .../recipes/pegmatite_raw_slabs_to_brick.json | 41 + .../pegmatite_raw_stairs_polishing.json | 66 + .../pegmatite_raw_stairs_to_brick.json | 41 + .../recipes/pegmatite_raw_wall_polishing.json | 66 + .../recipes/pegmatite_raw_walls_to_brick.json | 41 + .../recipes/pegmatite_relief_axe.json | 12 +- .../recipes/pegmatite_relief_blank.json | 10 +- .../recipes/pegmatite_relief_cross.json | 12 +- .../recipes/pegmatite_relief_hammer.json | 12 +- .../recipes/pegmatite_relief_hoe.json | 12 +- .../recipes/pegmatite_relief_horizontal.json | 12 +- .../recipes/pegmatite_relief_i.json | 12 +- .../recipes/pegmatite_relief_left.json | 12 +- .../recipes/pegmatite_relief_pickaxe.json | 12 +- .../recipes/pegmatite_relief_plus.json | 12 +- .../recipes/pegmatite_relief_right.json | 12 +- .../recipes/pegmatite_relief_sword.json | 12 +- .../recipes/pegmatite_relief_vertical.json | 12 +- .../advancements/recipes/pegmatite_slab.json | 6 + .../recipes/pegmatite_smooth.json | 20 + .../recipes/pegmatite_smooth_brick.json | 10 +- .../pegmatite_smooth_brick_furnace.json | 27 +- .../recipes/pegmatite_smooth_brick_slab.json | 11 +- .../pegmatite_smooth_brick_stairs.json | 11 +- .../recipes/pegmatite_smooth_brick_wall.json | 11 +- .../recipes/pegmatite_smooth_furnace.json | 26 +- .../recipes/pegmatite_smooth_slab.json | 10 +- .../recipes/pegmatite_smooth_stairs.json | 10 +- .../recipes/pegmatite_smooth_wall.json | 10 +- .../recipes/pegmatite_stairs.json | 6 + .../recipes/pegmatite_to_stone.json | 31 + .../advancements/recipes/pegmatite_wall.json | 6 + .../recipes/peridotite_brick.json | 6 + .../peridotite_brick_block_polishing.json | 66 + .../recipes/peridotite_brick_furnace.json | 26 +- .../recipes/peridotite_brick_slab.json | 10 +- .../peridotite_brick_slab_polishing.json | 66 + .../peridotite_brick_slab_recombination.json | 41 + .../recipes/peridotite_brick_stairs.json | 10 +- .../peridotite_brick_stairs_polishing.json | 66 + .../recipes/peridotite_brick_wall.json | 10 +- .../peridotite_brick_wall_polishing.json | 66 + .../recipes/peridotite_cobblestone.json | 32 + .../recipes/peridotite_furnace.json | 24 +- ...ite_polished_brick_slab_recombination.json | 41 + ...eridotite_polished_slab_recombination.json | 41 + .../peridotite_polished_slabs_to_brick.json | 41 + .../peridotite_polished_stairs_to_brick.json | 41 + .../peridotite_polished_walls_to_brick.json | 41 + .../peridotite_raw_slab_polishing.json | 66 + .../peridotite_raw_slab_recombination.json | 41 + .../peridotite_raw_slabs_to_brick.json | 41 + .../peridotite_raw_stairs_polishing.json | 66 + .../peridotite_raw_stairs_to_brick.json | 41 + .../peridotite_raw_wall_polishing.json | 66 + .../peridotite_raw_walls_to_brick.json | 41 + .../recipes/peridotite_relief_axe.json | 12 +- .../recipes/peridotite_relief_blank.json | 10 +- .../recipes/peridotite_relief_cross.json | 12 +- .../recipes/peridotite_relief_hammer.json | 12 +- .../recipes/peridotite_relief_hoe.json | 12 +- .../recipes/peridotite_relief_horizontal.json | 12 +- .../recipes/peridotite_relief_i.json | 12 +- .../recipes/peridotite_relief_left.json | 12 +- .../recipes/peridotite_relief_pickaxe.json | 12 +- .../recipes/peridotite_relief_plus.json | 12 +- .../recipes/peridotite_relief_right.json | 12 +- .../recipes/peridotite_relief_sword.json | 12 +- .../recipes/peridotite_relief_vertical.json | 12 +- .../advancements/recipes/peridotite_slab.json | 6 + .../recipes/peridotite_smooth.json | 20 + .../recipes/peridotite_smooth_brick.json | 10 +- .../peridotite_smooth_brick_furnace.json | 27 +- .../recipes/peridotite_smooth_brick_slab.json | 11 +- .../peridotite_smooth_brick_stairs.json | 11 +- .../recipes/peridotite_smooth_brick_wall.json | 11 +- .../recipes/peridotite_smooth_furnace.json | 26 +- .../recipes/peridotite_smooth_slab.json | 10 +- .../recipes/peridotite_smooth_stairs.json | 10 +- .../recipes/peridotite_smooth_wall.json | 10 +- .../recipes/peridotite_stairs.json | 6 + .../recipes/peridotite_to_stone.json | 31 + .../advancements/recipes/peridotite_wall.json | 6 + .../recipes/phosphorous_block.json | 41 + .../recipes/phosphorous_dust.json | 41 + .../advancements/recipes/phyllite_brick.json | 6 + .../phyllite_brick_block_polishing.json | 66 + .../recipes/phyllite_brick_furnace.json | 26 +- .../recipes/phyllite_brick_slab.json | 10 +- .../phyllite_brick_slab_polishing.json | 66 + .../phyllite_brick_slab_recombination.json | 41 + .../recipes/phyllite_brick_stairs.json | 10 +- .../phyllite_brick_stairs_polishing.json | 66 + .../recipes/phyllite_brick_wall.json | 10 +- .../phyllite_brick_wall_polishing.json | 66 + .../recipes/phyllite_cobblestone.json | 32 + .../recipes/phyllite_furnace.json | 24 +- ...ite_polished_brick_slab_recombination.json | 41 + .../phyllite_polished_slab_recombination.json | 41 + .../phyllite_polished_slabs_to_brick.json | 41 + .../phyllite_polished_stairs_to_brick.json | 41 + .../phyllite_polished_walls_to_brick.json | 41 + .../recipes/phyllite_raw_slab_polishing.json | 66 + .../phyllite_raw_slab_recombination.json | 41 + .../recipes/phyllite_raw_slabs_to_brick.json | 41 + .../phyllite_raw_stairs_polishing.json | 66 + .../recipes/phyllite_raw_stairs_to_brick.json | 41 + .../recipes/phyllite_raw_wall_polishing.json | 66 + .../recipes/phyllite_raw_walls_to_brick.json | 41 + .../recipes/phyllite_relief_axe.json | 12 +- .../recipes/phyllite_relief_blank.json | 10 +- .../recipes/phyllite_relief_cross.json | 12 +- .../recipes/phyllite_relief_hammer.json | 12 +- .../recipes/phyllite_relief_hoe.json | 12 +- .../recipes/phyllite_relief_horizontal.json | 12 +- .../recipes/phyllite_relief_i.json | 12 +- .../recipes/phyllite_relief_left.json | 12 +- .../recipes/phyllite_relief_pickaxe.json | 12 +- .../recipes/phyllite_relief_plus.json | 12 +- .../recipes/phyllite_relief_right.json | 12 +- .../recipes/phyllite_relief_sword.json | 12 +- .../recipes/phyllite_relief_vertical.json | 12 +- .../advancements/recipes/phyllite_slab.json | 6 + .../advancements/recipes/phyllite_smooth.json | 20 + .../recipes/phyllite_smooth_brick.json | 10 +- .../phyllite_smooth_brick_furnace.json | 27 +- .../recipes/phyllite_smooth_brick_slab.json | 11 +- .../recipes/phyllite_smooth_brick_stairs.json | 11 +- .../recipes/phyllite_smooth_brick_wall.json | 11 +- .../recipes/phyllite_smooth_furnace.json | 26 +- .../recipes/phyllite_smooth_slab.json | 10 +- .../recipes/phyllite_smooth_stairs.json | 10 +- .../recipes/phyllite_smooth_wall.json | 10 +- .../advancements/recipes/phyllite_stairs.json | 6 + .../recipes/phyllite_to_stone.json | 31 + .../advancements/recipes/phyllite_wall.json | 6 + .../advancements/recipes/quartzite_brick.json | 6 + .../quartzite_brick_block_polishing.json | 66 + .../recipes/quartzite_brick_furnace.json | 26 +- .../recipes/quartzite_brick_slab.json | 10 +- .../quartzite_brick_slab_polishing.json | 66 + .../quartzite_brick_slab_recombination.json | 41 + .../recipes/quartzite_brick_stairs.json | 10 +- .../quartzite_brick_stairs_polishing.json | 66 + .../recipes/quartzite_brick_wall.json | 10 +- .../quartzite_brick_wall_polishing.json | 66 + .../recipes/quartzite_cobblestone.json | 32 + .../recipes/quartzite_furnace.json | 24 +- ...ite_polished_brick_slab_recombination.json | 41 + ...quartzite_polished_slab_recombination.json | 41 + .../quartzite_polished_slabs_to_brick.json | 41 + .../quartzite_polished_stairs_to_brick.json | 41 + .../quartzite_polished_walls_to_brick.json | 41 + .../recipes/quartzite_raw_slab_polishing.json | 66 + .../quartzite_raw_slab_recombination.json | 41 + .../recipes/quartzite_raw_slabs_to_brick.json | 41 + .../quartzite_raw_stairs_polishing.json | 66 + .../quartzite_raw_stairs_to_brick.json | 41 + .../recipes/quartzite_raw_wall_polishing.json | 66 + .../recipes/quartzite_raw_walls_to_brick.json | 41 + .../recipes/quartzite_relief_axe.json | 12 +- .../recipes/quartzite_relief_blank.json | 10 +- .../recipes/quartzite_relief_cross.json | 12 +- .../recipes/quartzite_relief_hammer.json | 12 +- .../recipes/quartzite_relief_hoe.json | 12 +- .../recipes/quartzite_relief_horizontal.json | 12 +- .../recipes/quartzite_relief_i.json | 12 +- .../recipes/quartzite_relief_left.json | 12 +- .../recipes/quartzite_relief_pickaxe.json | 12 +- .../recipes/quartzite_relief_plus.json | 12 +- .../recipes/quartzite_relief_right.json | 12 +- .../recipes/quartzite_relief_sword.json | 12 +- .../recipes/quartzite_relief_vertical.json | 12 +- .../advancements/recipes/quartzite_slab.json | 6 + .../recipes/quartzite_smooth.json | 20 + .../recipes/quartzite_smooth_brick.json | 10 +- .../quartzite_smooth_brick_furnace.json | 27 +- .../recipes/quartzite_smooth_brick_slab.json | 11 +- .../quartzite_smooth_brick_stairs.json | 11 +- .../recipes/quartzite_smooth_brick_wall.json | 11 +- .../recipes/quartzite_smooth_furnace.json | 26 +- .../recipes/quartzite_smooth_slab.json | 10 +- .../recipes/quartzite_smooth_stairs.json | 10 +- .../recipes/quartzite_smooth_wall.json | 10 +- .../recipes/quartzite_stairs.json | 6 + .../recipes/quartzite_to_stone.json | 31 + .../advancements/recipes/quartzite_wall.json | 6 + .../advancements/recipes/rhyolite_brick.json | 6 + .../rhyolite_brick_block_polishing.json | 66 + .../recipes/rhyolite_brick_furnace.json | 26 +- .../recipes/rhyolite_brick_slab.json | 10 +- .../rhyolite_brick_slab_polishing.json | 66 + .../rhyolite_brick_slab_recombination.json | 41 + .../recipes/rhyolite_brick_stairs.json | 10 +- .../rhyolite_brick_stairs_polishing.json | 66 + .../recipes/rhyolite_brick_wall.json | 10 +- .../rhyolite_brick_wall_polishing.json | 66 + .../recipes/rhyolite_cobblestone.json | 32 + .../recipes/rhyolite_furnace.json | 24 +- ...ite_polished_brick_slab_recombination.json | 41 + .../rhyolite_polished_slab_recombination.json | 41 + .../rhyolite_polished_slabs_to_brick.json | 41 + .../rhyolite_polished_stairs_to_brick.json | 41 + .../rhyolite_polished_walls_to_brick.json | 41 + .../recipes/rhyolite_raw_slab_polishing.json | 66 + .../rhyolite_raw_slab_recombination.json | 41 + .../recipes/rhyolite_raw_slabs_to_brick.json | 41 + .../rhyolite_raw_stairs_polishing.json | 66 + .../recipes/rhyolite_raw_stairs_to_brick.json | 41 + .../recipes/rhyolite_raw_wall_polishing.json | 66 + .../recipes/rhyolite_raw_walls_to_brick.json | 41 + .../recipes/rhyolite_relief_axe.json | 12 +- .../recipes/rhyolite_relief_blank.json | 10 +- .../recipes/rhyolite_relief_cross.json | 12 +- .../recipes/rhyolite_relief_hammer.json | 12 +- .../recipes/rhyolite_relief_hoe.json | 12 +- .../recipes/rhyolite_relief_horizontal.json | 12 +- .../recipes/rhyolite_relief_i.json | 12 +- .../recipes/rhyolite_relief_left.json | 12 +- .../recipes/rhyolite_relief_pickaxe.json | 12 +- .../recipes/rhyolite_relief_plus.json | 12 +- .../recipes/rhyolite_relief_right.json | 12 +- .../recipes/rhyolite_relief_sword.json | 12 +- .../recipes/rhyolite_relief_vertical.json | 12 +- .../advancements/recipes/rhyolite_slab.json | 6 + .../advancements/recipes/rhyolite_smooth.json | 20 + .../recipes/rhyolite_smooth_brick.json | 10 +- .../rhyolite_smooth_brick_furnace.json | 27 +- .../recipes/rhyolite_smooth_brick_slab.json | 11 +- .../recipes/rhyolite_smooth_brick_stairs.json | 11 +- .../recipes/rhyolite_smooth_brick_wall.json | 11 +- .../recipes/rhyolite_smooth_furnace.json | 26 +- .../recipes/rhyolite_smooth_slab.json | 10 +- .../recipes/rhyolite_smooth_stairs.json | 10 +- .../recipes/rhyolite_smooth_wall.json | 10 +- .../advancements/recipes/rhyolite_stairs.json | 6 + .../recipes/rhyolite_to_stone.json | 31 + .../advancements/recipes/rhyolite_wall.json | 6 + .../advancements/recipes/rock_salt.json | 37 + .../advancements/recipes/rock_salt_brick.json | 6 + .../rock_salt_brick_block_polishing.json | 66 + .../recipes/rock_salt_brick_furnace.json | 26 +- .../recipes/rock_salt_brick_slab.json | 10 +- .../rock_salt_brick_slab_polishing.json | 66 + .../rock_salt_brick_slab_recombination.json | 41 + .../recipes/rock_salt_brick_stairs.json | 10 +- .../rock_salt_brick_stairs_polishing.json | 66 + .../recipes/rock_salt_brick_wall.json | 10 +- .../rock_salt_brick_wall_polishing.json | 66 + .../recipes/rock_salt_cobblestone.json | 32 + .../advancements/recipes/rock_salt_dust.json | 37 + .../recipes/rock_salt_furnace.json | 24 +- ...alt_polished_brick_slab_recombination.json | 41 + ...rock_salt_polished_slab_recombination.json | 41 + .../rock_salt_polished_slabs_to_brick.json | 41 + .../rock_salt_polished_stairs_to_brick.json | 41 + .../rock_salt_polished_walls_to_brick.json | 41 + .../recipes/rock_salt_raw_slab_polishing.json | 66 + .../rock_salt_raw_slab_recombination.json | 41 + .../recipes/rock_salt_raw_slabs_to_brick.json | 41 + .../rock_salt_raw_stairs_polishing.json | 66 + .../rock_salt_raw_stairs_to_brick.json | 41 + .../recipes/rock_salt_raw_wall_polishing.json | 66 + .../recipes/rock_salt_raw_walls_to_brick.json | 41 + .../recipes/rock_salt_relief_axe.json | 12 +- .../recipes/rock_salt_relief_blank.json | 10 +- .../recipes/rock_salt_relief_cross.json | 12 +- .../recipes/rock_salt_relief_hammer.json | 12 +- .../recipes/rock_salt_relief_hoe.json | 12 +- .../recipes/rock_salt_relief_horizontal.json | 12 +- .../recipes/rock_salt_relief_i.json | 12 +- .../recipes/rock_salt_relief_left.json | 12 +- .../recipes/rock_salt_relief_pickaxe.json | 12 +- .../recipes/rock_salt_relief_plus.json | 12 +- .../recipes/rock_salt_relief_right.json | 12 +- .../recipes/rock_salt_relief_sword.json | 12 +- .../recipes/rock_salt_relief_vertical.json | 12 +- .../advancements/recipes/rock_salt_slab.json | 6 + .../recipes/rock_salt_smooth.json | 20 + .../recipes/rock_salt_smooth_brick.json | 10 +- .../rock_salt_smooth_brick_furnace.json | 27 +- .../recipes/rock_salt_smooth_brick_slab.json | 11 +- .../rock_salt_smooth_brick_stairs.json | 11 +- .../recipes/rock_salt_smooth_brick_wall.json | 11 +- .../recipes/rock_salt_smooth_furnace.json | 26 +- .../recipes/rock_salt_smooth_slab.json | 10 +- .../recipes/rock_salt_smooth_stairs.json | 10 +- .../recipes/rock_salt_smooth_wall.json | 10 +- .../recipes/rock_salt_stairs.json | 6 + .../recipes/rock_salt_to_stone.json | 31 + .../advancements/recipes/rock_salt_wall.json | 6 + .../advancements/recipes/rocksaltlamp.json | 10 + .../recipes/rocksaltstreetlamp.json | 10 + .../advancements/recipes/schist_brick.json | 6 + .../recipes/schist_brick_block_polishing.json | 66 + .../recipes/schist_brick_furnace.json | 26 +- .../recipes/schist_brick_slab.json | 10 +- .../recipes/schist_brick_slab_polishing.json | 66 + .../schist_brick_slab_recombination.json | 41 + .../recipes/schist_brick_stairs.json | 10 +- .../schist_brick_stairs_polishing.json | 66 + .../recipes/schist_brick_wall.json | 10 +- .../recipes/schist_brick_wall_polishing.json | 66 + .../recipes/schist_cobblestone.json | 32 + .../advancements/recipes/schist_furnace.json | 24 +- ...ist_polished_brick_slab_recombination.json | 41 + .../schist_polished_slab_recombination.json | 41 + .../schist_polished_slabs_to_brick.json | 41 + .../schist_polished_stairs_to_brick.json | 41 + .../schist_polished_walls_to_brick.json | 41 + .../recipes/schist_raw_slab_polishing.json | 66 + .../schist_raw_slab_recombination.json | 41 + .../recipes/schist_raw_slabs_to_brick.json | 41 + .../recipes/schist_raw_stairs_polishing.json | 66 + .../recipes/schist_raw_stairs_to_brick.json | 41 + .../recipes/schist_raw_wall_polishing.json | 66 + .../recipes/schist_raw_walls_to_brick.json | 41 + .../recipes/schist_relief_axe.json | 12 +- .../recipes/schist_relief_blank.json | 10 +- .../recipes/schist_relief_cross.json | 12 +- .../recipes/schist_relief_hammer.json | 12 +- .../recipes/schist_relief_hoe.json | 12 +- .../recipes/schist_relief_horizontal.json | 12 +- .../advancements/recipes/schist_relief_i.json | 12 +- .../recipes/schist_relief_left.json | 12 +- .../recipes/schist_relief_pickaxe.json | 12 +- .../recipes/schist_relief_plus.json | 12 +- .../recipes/schist_relief_right.json | 12 +- .../recipes/schist_relief_sword.json | 12 +- .../recipes/schist_relief_vertical.json | 12 +- .../advancements/recipes/schist_slab.json | 6 + .../advancements/recipes/schist_smooth.json | 20 + .../recipes/schist_smooth_brick.json | 10 +- .../recipes/schist_smooth_brick_furnace.json | 27 +- .../recipes/schist_smooth_brick_slab.json | 11 +- .../recipes/schist_smooth_brick_stairs.json | 11 +- .../recipes/schist_smooth_brick_wall.json | 11 +- .../recipes/schist_smooth_furnace.json | 26 +- .../recipes/schist_smooth_slab.json | 10 +- .../recipes/schist_smooth_stairs.json | 10 +- .../recipes/schist_smooth_wall.json | 10 +- .../advancements/recipes/schist_stairs.json | 6 + .../advancements/recipes/schist_to_stone.json | 31 + .../advancements/recipes/schist_wall.json | 6 + .../advancements/recipes/scoria_brick.json | 6 + .../recipes/scoria_brick_block_polishing.json | 66 + .../recipes/scoria_brick_furnace.json | 26 +- .../recipes/scoria_brick_slab.json | 10 +- .../recipes/scoria_brick_slab_polishing.json | 66 + .../scoria_brick_slab_recombination.json | 41 + .../recipes/scoria_brick_stairs.json | 10 +- .../scoria_brick_stairs_polishing.json | 66 + .../recipes/scoria_brick_wall.json | 10 +- .../recipes/scoria_brick_wall_polishing.json | 66 + .../recipes/scoria_cobblestone.json | 32 + .../advancements/recipes/scoria_furnace.json | 24 +- ...ria_polished_brick_slab_recombination.json | 41 + .../scoria_polished_slab_recombination.json | 41 + .../scoria_polished_slabs_to_brick.json | 41 + .../scoria_polished_stairs_to_brick.json | 41 + .../scoria_polished_walls_to_brick.json | 41 + .../recipes/scoria_raw_slab_polishing.json | 66 + .../scoria_raw_slab_recombination.json | 41 + .../recipes/scoria_raw_slabs_to_brick.json | 41 + .../recipes/scoria_raw_stairs_polishing.json | 66 + .../recipes/scoria_raw_stairs_to_brick.json | 41 + .../recipes/scoria_raw_wall_polishing.json | 66 + .../recipes/scoria_raw_walls_to_brick.json | 41 + .../recipes/scoria_relief_axe.json | 12 +- .../recipes/scoria_relief_blank.json | 10 +- .../recipes/scoria_relief_cross.json | 12 +- .../recipes/scoria_relief_hammer.json | 12 +- .../recipes/scoria_relief_hoe.json | 12 +- .../recipes/scoria_relief_horizontal.json | 12 +- .../advancements/recipes/scoria_relief_i.json | 12 +- .../recipes/scoria_relief_left.json | 12 +- .../recipes/scoria_relief_pickaxe.json | 12 +- .../recipes/scoria_relief_plus.json | 12 +- .../recipes/scoria_relief_right.json | 12 +- .../recipes/scoria_relief_sword.json | 12 +- .../recipes/scoria_relief_vertical.json | 12 +- .../advancements/recipes/scoria_slab.json | 6 + .../advancements/recipes/scoria_smooth.json | 20 + .../recipes/scoria_smooth_brick.json | 10 +- .../recipes/scoria_smooth_brick_furnace.json | 27 +- .../recipes/scoria_smooth_brick_slab.json | 11 +- .../recipes/scoria_smooth_brick_stairs.json | 11 +- .../recipes/scoria_smooth_brick_wall.json | 11 +- .../recipes/scoria_smooth_furnace.json | 26 +- .../recipes/scoria_smooth_slab.json | 10 +- .../recipes/scoria_smooth_stairs.json | 10 +- .../recipes/scoria_smooth_wall.json | 10 +- .../advancements/recipes/scoria_stairs.json | 6 + .../advancements/recipes/scoria_to_stone.json | 31 + .../advancements/recipes/scoria_wall.json | 6 + .../advancements/recipes/shale_brick.json | 6 + .../recipes/shale_brick_block_polishing.json | 66 + .../recipes/shale_brick_furnace.json | 26 +- .../recipes/shale_brick_slab.json | 10 +- .../recipes/shale_brick_slab_polishing.json | 66 + .../shale_brick_slab_recombination.json | 41 + .../recipes/shale_brick_stairs.json | 10 +- .../recipes/shale_brick_stairs_polishing.json | 66 + .../recipes/shale_brick_wall.json | 10 +- .../recipes/shale_brick_wall_polishing.json | 66 + .../recipes/shale_cobblestone.json | 32 + .../advancements/recipes/shale_furnace.json | 24 +- ...ale_polished_brick_slab_recombination.json | 41 + .../shale_polished_slab_recombination.json | 41 + .../shale_polished_slabs_to_brick.json | 41 + .../shale_polished_stairs_to_brick.json | 41 + .../shale_polished_walls_to_brick.json | 41 + .../recipes/shale_raw_slab_polishing.json | 66 + .../recipes/shale_raw_slab_recombination.json | 41 + .../recipes/shale_raw_slabs_to_brick.json | 41 + .../recipes/shale_raw_stairs_polishing.json | 66 + .../recipes/shale_raw_stairs_to_brick.json | 41 + .../recipes/shale_raw_wall_polishing.json | 66 + .../recipes/shale_raw_walls_to_brick.json | 41 + .../recipes/shale_relief_axe.json | 12 +- .../recipes/shale_relief_blank.json | 10 +- .../recipes/shale_relief_cross.json | 12 +- .../recipes/shale_relief_hammer.json | 12 +- .../recipes/shale_relief_hoe.json | 12 +- .../recipes/shale_relief_horizontal.json | 12 +- .../advancements/recipes/shale_relief_i.json | 12 +- .../recipes/shale_relief_left.json | 12 +- .../recipes/shale_relief_pickaxe.json | 12 +- .../recipes/shale_relief_plus.json | 12 +- .../recipes/shale_relief_right.json | 12 +- .../recipes/shale_relief_sword.json | 12 +- .../recipes/shale_relief_vertical.json | 12 +- .../advancements/recipes/shale_slab.json | 6 + .../advancements/recipes/shale_smooth.json | 20 + .../recipes/shale_smooth_brick.json | 10 +- .../recipes/shale_smooth_brick_furnace.json | 27 +- .../recipes/shale_smooth_brick_slab.json | 11 +- .../recipes/shale_smooth_brick_stairs.json | 11 +- .../recipes/shale_smooth_brick_wall.json | 11 +- .../recipes/shale_smooth_furnace.json | 26 +- .../recipes/shale_smooth_slab.json | 10 +- .../recipes/shale_smooth_stairs.json | 10 +- .../recipes/shale_smooth_wall.json | 10 +- .../advancements/recipes/shale_stairs.json | 6 + .../advancements/recipes/shale_to_stone.json | 31 + .../advancements/recipes/shale_wall.json | 6 + .../advancements/recipes/siltstone_brick.json | 6 + .../siltstone_brick_block_polishing.json | 66 + .../recipes/siltstone_brick_furnace.json | 26 +- .../recipes/siltstone_brick_slab.json | 10 +- .../siltstone_brick_slab_polishing.json | 66 + .../siltstone_brick_slab_recombination.json | 41 + .../recipes/siltstone_brick_stairs.json | 10 +- .../siltstone_brick_stairs_polishing.json | 66 + .../recipes/siltstone_brick_wall.json | 10 +- .../siltstone_brick_wall_polishing.json | 66 + .../recipes/siltstone_cobblestone.json | 32 + .../recipes/siltstone_furnace.json | 24 +- ...one_polished_brick_slab_recombination.json | 41 + ...siltstone_polished_slab_recombination.json | 41 + .../siltstone_polished_slabs_to_brick.json | 41 + .../siltstone_polished_stairs_to_brick.json | 41 + .../siltstone_polished_walls_to_brick.json | 41 + .../recipes/siltstone_raw_slab_polishing.json | 66 + .../siltstone_raw_slab_recombination.json | 41 + .../recipes/siltstone_raw_slabs_to_brick.json | 41 + .../siltstone_raw_stairs_polishing.json | 66 + .../siltstone_raw_stairs_to_brick.json | 41 + .../recipes/siltstone_raw_wall_polishing.json | 66 + .../recipes/siltstone_raw_walls_to_brick.json | 41 + .../recipes/siltstone_relief_axe.json | 12 +- .../recipes/siltstone_relief_blank.json | 10 +- .../recipes/siltstone_relief_cross.json | 12 +- .../recipes/siltstone_relief_hammer.json | 12 +- .../recipes/siltstone_relief_hoe.json | 12 +- .../recipes/siltstone_relief_horizontal.json | 12 +- .../recipes/siltstone_relief_i.json | 12 +- .../recipes/siltstone_relief_left.json | 12 +- .../recipes/siltstone_relief_pickaxe.json | 12 +- .../recipes/siltstone_relief_plus.json | 12 +- .../recipes/siltstone_relief_right.json | 12 +- .../recipes/siltstone_relief_sword.json | 12 +- .../recipes/siltstone_relief_vertical.json | 12 +- .../advancements/recipes/siltstone_slab.json | 6 + .../recipes/siltstone_smooth.json | 20 + .../recipes/siltstone_smooth_brick.json | 10 +- .../siltstone_smooth_brick_furnace.json | 27 +- .../recipes/siltstone_smooth_brick_slab.json | 11 +- .../siltstone_smooth_brick_stairs.json | 11 +- .../recipes/siltstone_smooth_brick_wall.json | 11 +- .../recipes/siltstone_smooth_furnace.json | 26 +- .../recipes/siltstone_smooth_slab.json | 10 +- .../recipes/siltstone_smooth_stairs.json | 10 +- .../recipes/siltstone_smooth_wall.json | 10 +- .../recipes/siltstone_stairs.json | 6 + .../recipes/siltstone_to_stone.json | 31 + .../advancements/recipes/siltstone_wall.json | 6 + .../advancements/recipes/slate_brick.json | 6 + .../recipes/slate_brick_block_polishing.json | 66 + .../recipes/slate_brick_furnace.json | 26 +- .../recipes/slate_brick_slab.json | 10 +- .../recipes/slate_brick_slab_polishing.json | 66 + .../slate_brick_slab_recombination.json | 41 + .../recipes/slate_brick_stairs.json | 10 +- .../recipes/slate_brick_stairs_polishing.json | 66 + .../recipes/slate_brick_wall.json | 10 +- .../recipes/slate_brick_wall_polishing.json | 66 + .../recipes/slate_cobblestone.json | 32 + .../advancements/recipes/slate_furnace.json | 24 +- ...ate_polished_brick_slab_recombination.json | 41 + .../slate_polished_slab_recombination.json | 41 + .../slate_polished_slabs_to_brick.json | 41 + .../slate_polished_stairs_to_brick.json | 41 + .../slate_polished_walls_to_brick.json | 41 + .../recipes/slate_raw_slab_polishing.json | 66 + .../recipes/slate_raw_slab_recombination.json | 41 + .../recipes/slate_raw_slabs_to_brick.json | 41 + .../recipes/slate_raw_stairs_polishing.json | 66 + .../recipes/slate_raw_stairs_to_brick.json | 41 + .../recipes/slate_raw_wall_polishing.json | 66 + .../recipes/slate_raw_walls_to_brick.json | 41 + .../recipes/slate_relief_axe.json | 12 +- .../recipes/slate_relief_blank.json | 10 +- .../recipes/slate_relief_cross.json | 12 +- .../recipes/slate_relief_hammer.json | 12 +- .../recipes/slate_relief_hoe.json | 12 +- .../recipes/slate_relief_horizontal.json | 12 +- .../advancements/recipes/slate_relief_i.json | 12 +- .../recipes/slate_relief_left.json | 12 +- .../recipes/slate_relief_pickaxe.json | 12 +- .../recipes/slate_relief_plus.json | 12 +- .../recipes/slate_relief_right.json | 12 +- .../recipes/slate_relief_sword.json | 12 +- .../recipes/slate_relief_vertical.json | 12 +- .../advancements/recipes/slate_slab.json | 6 + .../advancements/recipes/slate_smooth.json | 20 + .../recipes/slate_smooth_brick.json | 10 +- .../recipes/slate_smooth_brick_furnace.json | 27 +- .../recipes/slate_smooth_brick_slab.json | 11 +- .../recipes/slate_smooth_brick_stairs.json | 11 +- .../recipes/slate_smooth_brick_wall.json | 11 +- .../recipes/slate_smooth_furnace.json | 26 +- .../recipes/slate_smooth_slab.json | 10 +- .../recipes/slate_smooth_stairs.json | 10 +- .../recipes/slate_smooth_wall.json | 10 +- .../advancements/recipes/slate_stairs.json | 6 + .../advancements/recipes/slate_to_stone.json | 31 + .../advancements/recipes/slate_wall.json | 6 + .../advancements/recipes/sulfur_block.json | 41 + .../advancements/recipes/sulfur_dust.json | 41 + .../advancements/recipes/tuff_brick.json | 6 + .../recipes/tuff_brick_block_polishing.json | 66 + .../recipes/tuff_brick_furnace.json | 26 +- .../advancements/recipes/tuff_brick_slab.json | 10 +- .../recipes/tuff_brick_slab_polishing.json | 66 + .../tuff_brick_slab_recombination.json | 41 + .../recipes/tuff_brick_stairs.json | 10 +- .../recipes/tuff_brick_stairs_polishing.json | 66 + .../advancements/recipes/tuff_brick_wall.json | 10 +- .../recipes/tuff_brick_wall_polishing.json | 66 + .../recipes/tuff_cobblestone.json | 32 + .../advancements/recipes/tuff_furnace.json | 22 +- ...uff_polished_brick_slab_recombination.json | 41 + .../tuff_polished_slab_recombination.json | 41 + .../recipes/tuff_polished_slabs_to_brick.json | 41 + .../tuff_polished_stairs_to_brick.json | 41 + .../recipes/tuff_polished_walls_to_brick.json | 41 + .../recipes/tuff_raw_slab_polishing.json | 66 + .../recipes/tuff_raw_slab_recombination.json | 41 + .../recipes/tuff_raw_slabs_to_brick.json | 41 + .../recipes/tuff_raw_stairs_polishing.json | 66 + .../recipes/tuff_raw_stairs_to_brick.json | 41 + .../recipes/tuff_raw_wall_polishing.json | 66 + .../recipes/tuff_raw_walls_to_brick.json | 41 + .../advancements/recipes/tuff_relief_axe.json | 12 +- .../recipes/tuff_relief_blank.json | 10 +- .../recipes/tuff_relief_cross.json | 12 +- .../recipes/tuff_relief_hammer.json | 12 +- .../advancements/recipes/tuff_relief_hoe.json | 12 +- .../recipes/tuff_relief_horizontal.json | 12 +- .../advancements/recipes/tuff_relief_i.json | 12 +- .../recipes/tuff_relief_left.json | 12 +- .../recipes/tuff_relief_pickaxe.json | 12 +- .../recipes/tuff_relief_plus.json | 12 +- .../recipes/tuff_relief_right.json | 12 +- .../recipes/tuff_relief_sword.json | 12 +- .../recipes/tuff_relief_vertical.json | 12 +- .../advancements/recipes/tuff_slab.json | 6 + .../advancements/recipes/tuff_smooth.json | 20 + .../recipes/tuff_smooth_brick.json | 10 +- .../recipes/tuff_smooth_brick_furnace.json | 27 +- .../recipes/tuff_smooth_brick_slab.json | 11 +- .../recipes/tuff_smooth_brick_stairs.json | 11 +- .../recipes/tuff_smooth_brick_wall.json | 11 +- .../recipes/tuff_smooth_furnace.json | 26 +- .../recipes/tuff_smooth_slab.json | 10 +- .../recipes/tuff_smooth_stairs.json | 10 +- .../recipes/tuff_smooth_wall.json | 10 +- .../advancements/recipes/tuff_stairs.json | 6 + .../advancements/recipes/tuff_to_stone.json | 31 + .../advancements/recipes/tuff_wall.json | 6 + .../data/mineralogy/orespawn/provider.json | 636 ++++++ .../mineralogy/recipes/amphibolite_brick.json | 43 +- .../amphibolite_brick_block_polishing.json | 25 + .../recipes/amphibolite_brick_furnace.json | 58 +- .../recipes/amphibolite_brick_slab.json | 45 +- .../amphibolite_brick_slab_polishing.json | 25 + .../amphibolite_brick_slab_recombination.json | 25 + .../recipes/amphibolite_brick_stairs.json | 49 +- .../amphibolite_brick_stairs_polishing.json | 25 + .../recipes/amphibolite_brick_wall.json | 47 +- .../amphibolite_brick_wall_polishing.json | 25 + .../recipes/amphibolite_cobblestone.json | 5 +- .../recipes/amphibolite_furnace.json | 54 +- .../amphibolite_furnace_from_rock.json | 29 - ...ite_polished_brick_slab_recombination.json | 25 + ...phibolite_polished_slab_recombination.json | 25 + .../amphibolite_polished_slabs_to_brick.json | 26 + .../amphibolite_polished_stairs_to_brick.json | 26 + .../amphibolite_polished_walls_to_brick.json | 26 + .../amphibolite_raw_slab_polishing.json | 25 + .../amphibolite_raw_slab_recombination.json | 25 + .../amphibolite_raw_slabs_to_brick.json | 26 + .../amphibolite_raw_stairs_polishing.json | 25 + .../amphibolite_raw_stairs_to_brick.json | 26 + .../amphibolite_raw_wall_polishing.json | 25 + .../amphibolite_raw_walls_to_brick.json | 26 + .../recipes/amphibolite_relief_axe.json | 89 +- .../recipes/amphibolite_relief_blank.json | 49 +- .../recipes/amphibolite_relief_cross.json | 49 +- .../recipes/amphibolite_relief_hammer.json | 61 +- .../recipes/amphibolite_relief_hoe.json | 89 +- .../amphibolite_relief_horizontal.json | 45 +- .../recipes/amphibolite_relief_i.json | 49 +- .../recipes/amphibolite_relief_left.json | 49 +- .../recipes/amphibolite_relief_pickaxe.json | 89 +- .../recipes/amphibolite_relief_plus.json | 49 +- .../recipes/amphibolite_relief_right.json | 47 +- .../recipes/amphibolite_relief_sword.json | 89 +- .../recipes/amphibolite_relief_vertical.json | 49 +- .../mineralogy/recipes/amphibolite_slab.json | 41 +- ...te_slab_from_amphibolite_stonecutting.json | 21 - .../recipes/amphibolite_smooth.json | 40 +- .../recipes/amphibolite_smooth_brick.json | 47 +- .../amphibolite_smooth_brick_furnace.json | 62 +- .../amphibolite_smooth_brick_slab.json | 49 +- .../amphibolite_smooth_brick_stairs.json | 53 +- .../amphibolite_smooth_brick_wall.json | 51 +- .../recipes/amphibolite_smooth_furnace.json | 58 +- .../recipes/amphibolite_smooth_slab.json | 45 +- .../recipes/amphibolite_smooth_stairs.json | 49 +- .../recipes/amphibolite_smooth_wall.json | 47 +- .../recipes/amphibolite_stairs.json | 45 +- ..._stairs_from_amphibolite_stonecutting.json | 21 - .../mineralogy/recipes/amphibolite_wall.json | 43 +- ...te_wall_from_amphibolite_stonecutting.json | 21 - .../mineralogy/recipes/andesite_brick.json | 43 +- .../andesite_brick_block_polishing.json | 25 + .../recipes/andesite_brick_furnace.json | 58 +- .../recipes/andesite_brick_slab.json | 45 +- .../andesite_brick_slab_polishing.json | 25 + .../andesite_brick_slab_recombination.json | 25 + .../recipes/andesite_brick_stairs.json | 49 +- .../andesite_brick_stairs_polishing.json | 25 + .../recipes/andesite_brick_wall.json | 47 +- .../andesite_brick_wall_polishing.json | 25 + .../recipes/andesite_cobblestone.json | 5 +- .../mineralogy/recipes/andesite_furnace.json | 54 +- .../recipes/andesite_furnace_from_rock.json | 29 - ...ite_polished_brick_slab_recombination.json | 25 + .../andesite_polished_slab_recombination.json | 25 + .../andesite_polished_slabs_to_brick.json | 26 + .../andesite_polished_stairs_to_brick.json | 26 + .../andesite_polished_walls_to_brick.json | 26 + .../recipes/andesite_raw_slab_polishing.json | 25 + .../andesite_raw_slab_recombination.json | 25 + .../recipes/andesite_raw_slabs_to_brick.json | 26 + .../andesite_raw_stairs_polishing.json | 25 + .../recipes/andesite_raw_stairs_to_brick.json | 26 + .../recipes/andesite_raw_wall_polishing.json | 25 + .../recipes/andesite_raw_walls_to_brick.json | 26 + .../recipes/andesite_relief_axe.json | 89 +- .../recipes/andesite_relief_blank.json | 49 +- .../recipes/andesite_relief_cross.json | 49 +- .../recipes/andesite_relief_hammer.json | 61 +- .../recipes/andesite_relief_hoe.json | 89 +- .../recipes/andesite_relief_horizontal.json | 45 +- .../mineralogy/recipes/andesite_relief_i.json | 49 +- .../recipes/andesite_relief_left.json | 49 +- .../recipes/andesite_relief_pickaxe.json | 89 +- .../recipes/andesite_relief_plus.json | 49 +- .../recipes/andesite_relief_right.json | 47 +- .../recipes/andesite_relief_sword.json | 89 +- .../recipes/andesite_relief_vertical.json | 49 +- .../mineralogy/recipes/andesite_slab.json | 41 +- ...esite_slab_from_andesite_stonecutting.json | 21 - .../mineralogy/recipes/andesite_smooth.json | 40 +- .../recipes/andesite_smooth_brick.json | 47 +- .../andesite_smooth_brick_furnace.json | 62 +- .../recipes/andesite_smooth_brick_slab.json | 49 +- .../recipes/andesite_smooth_brick_stairs.json | 53 +- .../recipes/andesite_smooth_brick_wall.json | 51 +- .../recipes/andesite_smooth_furnace.json | 58 +- .../recipes/andesite_smooth_slab.json | 45 +- .../recipes/andesite_smooth_stairs.json | 49 +- .../recipes/andesite_smooth_wall.json | 47 +- .../mineralogy/recipes/andesite_stairs.json | 45 +- ...ite_stairs_from_andesite_stonecutting.json | 21 - .../mineralogy/recipes/andesite_wall.json | 43 +- ...esite_wall_from_andesite_stonecutting.json | 21 - .../data/mineralogy/recipes/basalt_brick.json | 43 +- .../recipes/basalt_brick_block_polishing.json | 25 + .../recipes/basalt_brick_furnace.json | 58 +- .../mineralogy/recipes/basalt_brick_slab.json | 45 +- .../recipes/basalt_brick_slab_polishing.json | 25 + .../basalt_brick_slab_recombination.json | 25 + .../recipes/basalt_brick_stairs.json | 49 +- .../basalt_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/basalt_brick_wall.json | 47 +- .../recipes/basalt_brick_wall_polishing.json | 25 + .../recipes/basalt_cobblestone.json | 5 +- .../mineralogy/recipes/basalt_furnace.json | 54 +- .../recipes/basalt_furnace_from_rock.json | 29 - ...alt_polished_brick_slab_recombination.json | 25 + .../basalt_polished_slab_recombination.json | 25 + .../basalt_polished_slabs_to_brick.json | 26 + .../basalt_polished_stairs_to_brick.json | 26 + .../basalt_polished_walls_to_brick.json | 26 + .../recipes/basalt_raw_slab_polishing.json | 25 + .../basalt_raw_slab_recombination.json | 25 + .../recipes/basalt_raw_slabs_to_brick.json | 26 + .../recipes/basalt_raw_stairs_polishing.json | 25 + .../recipes/basalt_raw_stairs_to_brick.json | 26 + .../recipes/basalt_raw_wall_polishing.json | 25 + .../recipes/basalt_raw_walls_to_brick.json | 26 + .../mineralogy/recipes/basalt_relief_axe.json | 89 +- .../recipes/basalt_relief_blank.json | 49 +- .../recipes/basalt_relief_cross.json | 49 +- .../recipes/basalt_relief_hammer.json | 61 +- .../mineralogy/recipes/basalt_relief_hoe.json | 89 +- .../recipes/basalt_relief_horizontal.json | 45 +- .../mineralogy/recipes/basalt_relief_i.json | 49 +- .../recipes/basalt_relief_left.json | 49 +- .../recipes/basalt_relief_pickaxe.json | 89 +- .../recipes/basalt_relief_plus.json | 49 +- .../recipes/basalt_relief_right.json | 47 +- .../recipes/basalt_relief_sword.json | 89 +- .../recipes/basalt_relief_vertical.json | 49 +- .../data/mineralogy/recipes/basalt_slab.json | 41 +- .../basalt_slab_from_basalt_stonecutting.json | 21 - .../mineralogy/recipes/basalt_smooth.json | 40 +- .../recipes/basalt_smooth_brick.json | 47 +- .../recipes/basalt_smooth_brick_furnace.json | 62 +- .../recipes/basalt_smooth_brick_slab.json | 49 +- .../recipes/basalt_smooth_brick_stairs.json | 53 +- .../recipes/basalt_smooth_brick_wall.json | 51 +- .../recipes/basalt_smooth_furnace.json | 58 +- .../recipes/basalt_smooth_slab.json | 45 +- .../recipes/basalt_smooth_stairs.json | 49 +- .../recipes/basalt_smooth_wall.json | 47 +- .../mineralogy/recipes/basalt_stairs.json | 45 +- ...asalt_stairs_from_basalt_stonecutting.json | 21 - .../data/mineralogy/recipes/basalt_wall.json | 43 +- .../basalt_wall_from_basalt_stonecutting.json | 21 - .../recipes/basaltic_glass_brick.json | 43 +- .../basaltic_glass_brick_block_polishing.json | 25 + .../recipes/basaltic_glass_brick_furnace.json | 58 +- .../recipes/basaltic_glass_brick_slab.json | 45 +- .../basaltic_glass_brick_slab_polishing.json | 25 + ...saltic_glass_brick_slab_recombination.json | 25 + .../recipes/basaltic_glass_brick_stairs.json | 49 +- ...basaltic_glass_brick_stairs_polishing.json | 25 + .../recipes/basaltic_glass_brick_wall.json | 47 +- .../basaltic_glass_brick_wall_polishing.json | 25 + .../recipes/basaltic_glass_cobblestone.json | 5 +- .../recipes/basaltic_glass_furnace.json | 54 +- .../basaltic_glass_furnace_from_rock.json | 29 - ...ass_polished_brick_slab_recombination.json | 25 + ...tic_glass_polished_slab_recombination.json | 25 + ...asaltic_glass_polished_slabs_to_brick.json | 26 + ...saltic_glass_polished_stairs_to_brick.json | 26 + ...asaltic_glass_polished_walls_to_brick.json | 26 + .../basaltic_glass_raw_slab_polishing.json | 25 + ...basaltic_glass_raw_slab_recombination.json | 25 + .../basaltic_glass_raw_slabs_to_brick.json | 26 + .../basaltic_glass_raw_stairs_polishing.json | 25 + .../basaltic_glass_raw_stairs_to_brick.json | 26 + .../basaltic_glass_raw_wall_polishing.json | 25 + .../basaltic_glass_raw_walls_to_brick.json | 26 + .../recipes/basaltic_glass_relief_axe.json | 89 +- .../recipes/basaltic_glass_relief_blank.json | 49 +- .../recipes/basaltic_glass_relief_cross.json | 49 +- .../recipes/basaltic_glass_relief_hammer.json | 61 +- .../recipes/basaltic_glass_relief_hoe.json | 89 +- .../basaltic_glass_relief_horizontal.json | 45 +- .../recipes/basaltic_glass_relief_i.json | 49 +- .../recipes/basaltic_glass_relief_left.json | 49 +- .../basaltic_glass_relief_pickaxe.json | 89 +- .../recipes/basaltic_glass_relief_plus.json | 49 +- .../recipes/basaltic_glass_relief_right.json | 47 +- .../recipes/basaltic_glass_relief_sword.json | 89 +- .../basaltic_glass_relief_vertical.json | 49 +- .../recipes/basaltic_glass_slab.json | 41 +- ...slab_from_basaltic_glass_stonecutting.json | 21 - .../recipes/basaltic_glass_smooth.json | 40 +- .../recipes/basaltic_glass_smooth_brick.json | 47 +- .../basaltic_glass_smooth_brick_furnace.json | 62 +- .../basaltic_glass_smooth_brick_slab.json | 49 +- .../basaltic_glass_smooth_brick_stairs.json | 53 +- .../basaltic_glass_smooth_brick_wall.json | 51 +- .../basaltic_glass_smooth_furnace.json | 58 +- .../recipes/basaltic_glass_smooth_slab.json | 45 +- .../recipes/basaltic_glass_smooth_stairs.json | 49 +- .../recipes/basaltic_glass_smooth_wall.json | 47 +- .../recipes/basaltic_glass_stairs.json | 45 +- ...airs_from_basaltic_glass_stonecutting.json | 21 - .../recipes/basaltic_glass_wall.json | 43 +- ...wall_from_basaltic_glass_stonecutting.json | 21 - .../data/mineralogy/recipes/chalk.json | 9 +- .../data/mineralogy/recipes/chalk_dust.json | 6 + .../data/mineralogy/recipes/cobblestone.json | 1 + .../recipes/conglomerate_brick.json | 43 +- .../conglomerate_brick_block_polishing.json | 25 + .../recipes/conglomerate_brick_furnace.json | 58 +- .../recipes/conglomerate_brick_slab.json | 45 +- .../conglomerate_brick_slab_polishing.json | 25 + ...conglomerate_brick_slab_recombination.json | 25 + .../recipes/conglomerate_brick_stairs.json | 49 +- .../conglomerate_brick_stairs_polishing.json | 25 + .../recipes/conglomerate_brick_wall.json | 47 +- .../conglomerate_brick_wall_polishing.json | 25 + .../recipes/conglomerate_cobblestone.json | 5 +- .../recipes/conglomerate_furnace.json | 54 +- .../conglomerate_furnace_from_rock.json | 29 - ...ate_polished_brick_slab_recombination.json | 25 + ...glomerate_polished_slab_recombination.json | 25 + .../conglomerate_polished_slabs_to_brick.json | 26 + ...conglomerate_polished_stairs_to_brick.json | 26 + .../conglomerate_polished_walls_to_brick.json | 26 + .../conglomerate_raw_slab_polishing.json | 25 + .../conglomerate_raw_slab_recombination.json | 25 + .../conglomerate_raw_slabs_to_brick.json | 26 + .../conglomerate_raw_stairs_polishing.json | 25 + .../conglomerate_raw_stairs_to_brick.json | 26 + .../conglomerate_raw_wall_polishing.json | 25 + .../conglomerate_raw_walls_to_brick.json | 26 + .../recipes/conglomerate_relief_axe.json | 89 +- .../recipes/conglomerate_relief_blank.json | 49 +- .../recipes/conglomerate_relief_cross.json | 49 +- .../recipes/conglomerate_relief_hammer.json | 61 +- .../recipes/conglomerate_relief_hoe.json | 89 +- .../conglomerate_relief_horizontal.json | 45 +- .../recipes/conglomerate_relief_i.json | 49 +- .../recipes/conglomerate_relief_left.json | 49 +- .../recipes/conglomerate_relief_pickaxe.json | 89 +- .../recipes/conglomerate_relief_plus.json | 49 +- .../recipes/conglomerate_relief_right.json | 47 +- .../recipes/conglomerate_relief_sword.json | 89 +- .../recipes/conglomerate_relief_vertical.json | 49 +- .../mineralogy/recipes/conglomerate_slab.json | 41 +- ...e_slab_from_conglomerate_stonecutting.json | 21 - .../recipes/conglomerate_smooth.json | 40 +- .../recipes/conglomerate_smooth_brick.json | 47 +- .../conglomerate_smooth_brick_furnace.json | 62 +- .../conglomerate_smooth_brick_slab.json | 49 +- .../conglomerate_smooth_brick_stairs.json | 53 +- .../conglomerate_smooth_brick_wall.json | 51 +- .../recipes/conglomerate_smooth_furnace.json | 58 +- .../recipes/conglomerate_smooth_slab.json | 45 +- .../recipes/conglomerate_smooth_stairs.json | 49 +- .../recipes/conglomerate_smooth_wall.json | 47 +- .../recipes/conglomerate_stairs.json | 45 +- ...stairs_from_conglomerate_stonecutting.json | 21 - .../mineralogy/recipes/conglomerate_wall.json | 43 +- ...e_wall_from_conglomerate_stonecutting.json | 21 - .../mineralogy/recipes/diabase_brick.json | 43 +- .../diabase_brick_block_polishing.json | 25 + .../recipes/diabase_brick_furnace.json | 58 +- .../recipes/diabase_brick_slab.json | 45 +- .../recipes/diabase_brick_slab_polishing.json | 25 + .../diabase_brick_slab_recombination.json | 25 + .../recipes/diabase_brick_stairs.json | 49 +- .../diabase_brick_stairs_polishing.json | 25 + .../recipes/diabase_brick_wall.json | 47 +- .../recipes/diabase_brick_wall_polishing.json | 25 + .../recipes/diabase_cobblestone.json | 5 +- .../mineralogy/recipes/diabase_furnace.json | 54 +- .../recipes/diabase_furnace_from_rock.json | 29 - ...ase_polished_brick_slab_recombination.json | 25 + .../diabase_polished_slab_recombination.json | 25 + .../diabase_polished_slabs_to_brick.json | 26 + .../diabase_polished_stairs_to_brick.json | 26 + .../diabase_polished_walls_to_brick.json | 26 + .../recipes/diabase_raw_slab_polishing.json | 25 + .../diabase_raw_slab_recombination.json | 25 + .../recipes/diabase_raw_slabs_to_brick.json | 26 + .../recipes/diabase_raw_stairs_polishing.json | 25 + .../recipes/diabase_raw_stairs_to_brick.json | 26 + .../recipes/diabase_raw_wall_polishing.json | 25 + .../recipes/diabase_raw_walls_to_brick.json | 26 + .../recipes/diabase_relief_axe.json | 89 +- .../recipes/diabase_relief_blank.json | 49 +- .../recipes/diabase_relief_cross.json | 49 +- .../recipes/diabase_relief_hammer.json | 61 +- .../recipes/diabase_relief_hoe.json | 89 +- .../recipes/diabase_relief_horizontal.json | 45 +- .../mineralogy/recipes/diabase_relief_i.json | 49 +- .../recipes/diabase_relief_left.json | 49 +- .../recipes/diabase_relief_pickaxe.json | 89 +- .../recipes/diabase_relief_plus.json | 49 +- .../recipes/diabase_relief_right.json | 47 +- .../recipes/diabase_relief_sword.json | 89 +- .../recipes/diabase_relief_vertical.json | 49 +- .../data/mineralogy/recipes/diabase_slab.json | 41 +- ...iabase_slab_from_diabase_stonecutting.json | 21 - .../mineralogy/recipes/diabase_smooth.json | 40 +- .../recipes/diabase_smooth_brick.json | 47 +- .../recipes/diabase_smooth_brick_furnace.json | 62 +- .../recipes/diabase_smooth_brick_slab.json | 49 +- .../recipes/diabase_smooth_brick_stairs.json | 53 +- .../recipes/diabase_smooth_brick_wall.json | 51 +- .../recipes/diabase_smooth_furnace.json | 58 +- .../recipes/diabase_smooth_slab.json | 45 +- .../recipes/diabase_smooth_stairs.json | 49 +- .../recipes/diabase_smooth_wall.json | 47 +- .../mineralogy/recipes/diabase_stairs.json | 45 +- ...base_stairs_from_diabase_stonecutting.json | 21 - .../data/mineralogy/recipes/diabase_wall.json | 43 +- ...iabase_wall_from_diabase_stonecutting.json | 21 - .../mineralogy/recipes/diorite_brick.json | 43 +- .../diorite_brick_block_polishing.json | 25 + .../recipes/diorite_brick_furnace.json | 58 +- .../recipes/diorite_brick_slab.json | 45 +- .../recipes/diorite_brick_slab_polishing.json | 25 + .../diorite_brick_slab_recombination.json | 25 + .../recipes/diorite_brick_stairs.json | 49 +- .../diorite_brick_stairs_polishing.json | 25 + .../recipes/diorite_brick_wall.json | 47 +- .../recipes/diorite_brick_wall_polishing.json | 25 + .../recipes/diorite_cobblestone.json | 5 +- .../mineralogy/recipes/diorite_furnace.json | 54 +- .../recipes/diorite_furnace_from_rock.json | 29 - ...ite_polished_brick_slab_recombination.json | 25 + .../diorite_polished_slab_recombination.json | 25 + .../diorite_polished_slabs_to_brick.json | 26 + .../diorite_polished_stairs_to_brick.json | 26 + .../diorite_polished_walls_to_brick.json | 26 + .../recipes/diorite_raw_slab_polishing.json | 25 + .../diorite_raw_slab_recombination.json | 25 + .../recipes/diorite_raw_slabs_to_brick.json | 26 + .../recipes/diorite_raw_stairs_polishing.json | 25 + .../recipes/diorite_raw_stairs_to_brick.json | 26 + .../recipes/diorite_raw_wall_polishing.json | 25 + .../recipes/diorite_raw_walls_to_brick.json | 26 + .../recipes/diorite_relief_axe.json | 89 +- .../recipes/diorite_relief_blank.json | 49 +- .../recipes/diorite_relief_cross.json | 49 +- .../recipes/diorite_relief_hammer.json | 61 +- .../recipes/diorite_relief_hoe.json | 89 +- .../recipes/diorite_relief_horizontal.json | 45 +- .../mineralogy/recipes/diorite_relief_i.json | 49 +- .../recipes/diorite_relief_left.json | 49 +- .../recipes/diorite_relief_pickaxe.json | 89 +- .../recipes/diorite_relief_plus.json | 49 +- .../recipes/diorite_relief_right.json | 47 +- .../recipes/diorite_relief_sword.json | 89 +- .../recipes/diorite_relief_vertical.json | 49 +- .../data/mineralogy/recipes/diorite_slab.json | 41 +- ...iorite_slab_from_diorite_stonecutting.json | 21 - .../mineralogy/recipes/diorite_smooth.json | 40 +- .../recipes/diorite_smooth_brick.json | 47 +- .../recipes/diorite_smooth_brick_furnace.json | 62 +- .../recipes/diorite_smooth_brick_slab.json | 49 +- .../recipes/diorite_smooth_brick_stairs.json | 53 +- .../recipes/diorite_smooth_brick_wall.json | 51 +- .../recipes/diorite_smooth_furnace.json | 58 +- .../recipes/diorite_smooth_slab.json | 45 +- .../recipes/diorite_smooth_stairs.json | 49 +- .../recipes/diorite_smooth_wall.json | 47 +- .../mineralogy/recipes/diorite_stairs.json | 45 +- ...rite_stairs_from_diorite_stonecutting.json | 21 - .../data/mineralogy/recipes/diorite_wall.json | 43 +- ...iorite_wall_from_diorite_stonecutting.json | 21 - .../mineralogy/recipes/dolomite_brick.json | 43 +- .../dolomite_brick_block_polishing.json | 25 + .../recipes/dolomite_brick_furnace.json | 58 +- .../recipes/dolomite_brick_slab.json | 45 +- .../dolomite_brick_slab_polishing.json | 25 + .../dolomite_brick_slab_recombination.json | 25 + .../recipes/dolomite_brick_stairs.json | 49 +- .../dolomite_brick_stairs_polishing.json | 25 + .../recipes/dolomite_brick_wall.json | 47 +- .../dolomite_brick_wall_polishing.json | 25 + .../recipes/dolomite_cobblestone.json | 5 +- .../mineralogy/recipes/dolomite_furnace.json | 54 +- .../recipes/dolomite_furnace_from_rock.json | 29 - ...ite_polished_brick_slab_recombination.json | 25 + .../dolomite_polished_slab_recombination.json | 25 + .../dolomite_polished_slabs_to_brick.json | 26 + .../dolomite_polished_stairs_to_brick.json | 26 + .../dolomite_polished_walls_to_brick.json | 26 + .../recipes/dolomite_raw_slab_polishing.json | 25 + .../dolomite_raw_slab_recombination.json | 25 + .../recipes/dolomite_raw_slabs_to_brick.json | 26 + .../dolomite_raw_stairs_polishing.json | 25 + .../recipes/dolomite_raw_stairs_to_brick.json | 26 + .../recipes/dolomite_raw_wall_polishing.json | 25 + .../recipes/dolomite_raw_walls_to_brick.json | 26 + .../recipes/dolomite_relief_axe.json | 89 +- .../recipes/dolomite_relief_blank.json | 49 +- .../recipes/dolomite_relief_cross.json | 49 +- .../recipes/dolomite_relief_hammer.json | 61 +- .../recipes/dolomite_relief_hoe.json | 89 +- .../recipes/dolomite_relief_horizontal.json | 45 +- .../mineralogy/recipes/dolomite_relief_i.json | 49 +- .../recipes/dolomite_relief_left.json | 49 +- .../recipes/dolomite_relief_pickaxe.json | 89 +- .../recipes/dolomite_relief_plus.json | 49 +- .../recipes/dolomite_relief_right.json | 47 +- .../recipes/dolomite_relief_sword.json | 89 +- .../recipes/dolomite_relief_vertical.json | 49 +- .../mineralogy/recipes/dolomite_slab.json | 41 +- ...omite_slab_from_dolomite_stonecutting.json | 21 - .../mineralogy/recipes/dolomite_smooth.json | 40 +- .../recipes/dolomite_smooth_brick.json | 47 +- .../dolomite_smooth_brick_furnace.json | 62 +- .../recipes/dolomite_smooth_brick_slab.json | 49 +- .../recipes/dolomite_smooth_brick_stairs.json | 53 +- .../recipes/dolomite_smooth_brick_wall.json | 51 +- .../recipes/dolomite_smooth_furnace.json | 58 +- .../recipes/dolomite_smooth_slab.json | 45 +- .../recipes/dolomite_smooth_stairs.json | 49 +- .../recipes/dolomite_smooth_wall.json | 47 +- .../mineralogy/recipes/dolomite_stairs.json | 45 +- ...ite_stairs_from_dolomite_stonecutting.json | 21 - .../mineralogy/recipes/dolomite_wall.json | 43 +- ...omite_wall_from_dolomite_stonecutting.json | 21 - .../data/mineralogy/recipes/drywall.json | 12 +- .../mineralogy/recipes/drywall_black.json | 17 +- .../data/mineralogy/recipes/drywall_blue.json | 17 +- .../mineralogy/recipes/drywall_brown.json | 17 +- .../data/mineralogy/recipes/drywall_cyan.json | 17 +- .../data/mineralogy/recipes/drywall_gray.json | 17 +- .../mineralogy/recipes/drywall_green.json | 17 +- .../recipes/drywall_light_blue.json | 17 +- .../data/mineralogy/recipes/drywall_lime.json | 17 +- .../mineralogy/recipes/drywall_magenta.json | 17 +- .../mineralogy/recipes/drywall_orange.json | 17 +- .../data/mineralogy/recipes/drywall_pink.json | 17 +- .../mineralogy/recipes/drywall_purple.json | 17 +- .../data/mineralogy/recipes/drywall_red.json | 17 +- .../mineralogy/recipes/drywall_silver.json | 17 +- .../mineralogy/recipes/drywall_white.json | 17 +- .../mineralogy/recipes/drywall_yellow.json | 17 +- .../data/mineralogy/recipes/gabbro_brick.json | 43 +- .../recipes/gabbro_brick_block_polishing.json | 25 + .../recipes/gabbro_brick_furnace.json | 58 +- .../mineralogy/recipes/gabbro_brick_slab.json | 45 +- .../recipes/gabbro_brick_slab_polishing.json | 25 + .../gabbro_brick_slab_recombination.json | 25 + .../recipes/gabbro_brick_stairs.json | 49 +- .../gabbro_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/gabbro_brick_wall.json | 47 +- .../recipes/gabbro_brick_wall_polishing.json | 25 + .../recipes/gabbro_cobblestone.json | 5 +- .../mineralogy/recipes/gabbro_furnace.json | 54 +- .../recipes/gabbro_furnace_from_rock.json | 29 - ...bro_polished_brick_slab_recombination.json | 25 + .../gabbro_polished_slab_recombination.json | 25 + .../gabbro_polished_slabs_to_brick.json | 26 + .../gabbro_polished_stairs_to_brick.json | 26 + .../gabbro_polished_walls_to_brick.json | 26 + .../recipes/gabbro_raw_slab_polishing.json | 25 + .../gabbro_raw_slab_recombination.json | 25 + .../recipes/gabbro_raw_slabs_to_brick.json | 26 + .../recipes/gabbro_raw_stairs_polishing.json | 25 + .../recipes/gabbro_raw_stairs_to_brick.json | 26 + .../recipes/gabbro_raw_wall_polishing.json | 25 + .../recipes/gabbro_raw_walls_to_brick.json | 26 + .../mineralogy/recipes/gabbro_relief_axe.json | 89 +- .../recipes/gabbro_relief_blank.json | 49 +- .../recipes/gabbro_relief_cross.json | 49 +- .../recipes/gabbro_relief_hammer.json | 61 +- .../mineralogy/recipes/gabbro_relief_hoe.json | 89 +- .../recipes/gabbro_relief_horizontal.json | 45 +- .../mineralogy/recipes/gabbro_relief_i.json | 49 +- .../recipes/gabbro_relief_left.json | 49 +- .../recipes/gabbro_relief_pickaxe.json | 89 +- .../recipes/gabbro_relief_plus.json | 49 +- .../recipes/gabbro_relief_right.json | 47 +- .../recipes/gabbro_relief_sword.json | 89 +- .../recipes/gabbro_relief_vertical.json | 49 +- .../data/mineralogy/recipes/gabbro_slab.json | 41 +- .../gabbro_slab_from_gabbro_stonecutting.json | 21 - .../mineralogy/recipes/gabbro_smooth.json | 40 +- .../recipes/gabbro_smooth_brick.json | 47 +- .../recipes/gabbro_smooth_brick_furnace.json | 62 +- .../recipes/gabbro_smooth_brick_slab.json | 49 +- .../recipes/gabbro_smooth_brick_stairs.json | 53 +- .../recipes/gabbro_smooth_brick_wall.json | 51 +- .../recipes/gabbro_smooth_furnace.json | 58 +- .../recipes/gabbro_smooth_slab.json | 45 +- .../recipes/gabbro_smooth_stairs.json | 49 +- .../recipes/gabbro_smooth_wall.json | 47 +- .../mineralogy/recipes/gabbro_stairs.json | 45 +- ...abbro_stairs_from_gabbro_stonecutting.json | 21 - .../data/mineralogy/recipes/gabbro_wall.json | 43 +- .../gabbro_wall_from_gabbro_stonecutting.json | 21 - .../data/mineralogy/recipes/gneiss_brick.json | 43 +- .../recipes/gneiss_brick_block_polishing.json | 25 + .../recipes/gneiss_brick_furnace.json | 58 +- .../mineralogy/recipes/gneiss_brick_slab.json | 45 +- .../recipes/gneiss_brick_slab_polishing.json | 25 + .../gneiss_brick_slab_recombination.json | 25 + .../recipes/gneiss_brick_stairs.json | 49 +- .../gneiss_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/gneiss_brick_wall.json | 47 +- .../recipes/gneiss_brick_wall_polishing.json | 25 + .../recipes/gneiss_cobblestone.json | 5 +- .../mineralogy/recipes/gneiss_furnace.json | 54 +- .../recipes/gneiss_furnace_from_rock.json | 29 - ...iss_polished_brick_slab_recombination.json | 25 + .../gneiss_polished_slab_recombination.json | 25 + .../gneiss_polished_slabs_to_brick.json | 26 + .../gneiss_polished_stairs_to_brick.json | 26 + .../gneiss_polished_walls_to_brick.json | 26 + .../recipes/gneiss_raw_slab_polishing.json | 25 + .../gneiss_raw_slab_recombination.json | 25 + .../recipes/gneiss_raw_slabs_to_brick.json | 26 + .../recipes/gneiss_raw_stairs_polishing.json | 25 + .../recipes/gneiss_raw_stairs_to_brick.json | 26 + .../recipes/gneiss_raw_wall_polishing.json | 25 + .../recipes/gneiss_raw_walls_to_brick.json | 26 + .../mineralogy/recipes/gneiss_relief_axe.json | 89 +- .../recipes/gneiss_relief_blank.json | 49 +- .../recipes/gneiss_relief_cross.json | 49 +- .../recipes/gneiss_relief_hammer.json | 61 +- .../mineralogy/recipes/gneiss_relief_hoe.json | 89 +- .../recipes/gneiss_relief_horizontal.json | 45 +- .../mineralogy/recipes/gneiss_relief_i.json | 49 +- .../recipes/gneiss_relief_left.json | 49 +- .../recipes/gneiss_relief_pickaxe.json | 89 +- .../recipes/gneiss_relief_plus.json | 49 +- .../recipes/gneiss_relief_right.json | 47 +- .../recipes/gneiss_relief_sword.json | 89 +- .../recipes/gneiss_relief_vertical.json | 49 +- .../data/mineralogy/recipes/gneiss_slab.json | 41 +- .../gneiss_slab_from_gneiss_stonecutting.json | 21 - .../mineralogy/recipes/gneiss_smooth.json | 40 +- .../recipes/gneiss_smooth_brick.json | 47 +- .../recipes/gneiss_smooth_brick_furnace.json | 62 +- .../recipes/gneiss_smooth_brick_slab.json | 49 +- .../recipes/gneiss_smooth_brick_stairs.json | 53 +- .../recipes/gneiss_smooth_brick_wall.json | 51 +- .../recipes/gneiss_smooth_furnace.json | 58 +- .../recipes/gneiss_smooth_slab.json | 45 +- .../recipes/gneiss_smooth_stairs.json | 49 +- .../recipes/gneiss_smooth_wall.json | 47 +- .../mineralogy/recipes/gneiss_stairs.json | 45 +- ...neiss_stairs_from_gneiss_stonecutting.json | 21 - .../data/mineralogy/recipes/gneiss_wall.json | 43 +- .../gneiss_wall_from_gneiss_stonecutting.json | 21 - .../mineralogy/recipes/granite_brick.json | 43 +- .../granite_brick_block_polishing.json | 25 + .../recipes/granite_brick_furnace.json | 58 +- .../recipes/granite_brick_slab.json | 45 +- .../recipes/granite_brick_slab_polishing.json | 25 + .../granite_brick_slab_recombination.json | 25 + .../recipes/granite_brick_stairs.json | 49 +- .../granite_brick_stairs_polishing.json | 25 + .../recipes/granite_brick_wall.json | 47 +- .../recipes/granite_brick_wall_polishing.json | 25 + .../recipes/granite_cobblestone.json | 5 +- .../mineralogy/recipes/granite_furnace.json | 54 +- .../recipes/granite_furnace_from_rock.json | 29 - ...ite_polished_brick_slab_recombination.json | 25 + .../granite_polished_slab_recombination.json | 25 + .../granite_polished_slabs_to_brick.json | 26 + .../granite_polished_stairs_to_brick.json | 26 + .../granite_polished_walls_to_brick.json | 26 + .../recipes/granite_raw_slab_polishing.json | 25 + .../granite_raw_slab_recombination.json | 25 + .../recipes/granite_raw_slabs_to_brick.json | 26 + .../recipes/granite_raw_stairs_polishing.json | 25 + .../recipes/granite_raw_stairs_to_brick.json | 26 + .../recipes/granite_raw_wall_polishing.json | 25 + .../recipes/granite_raw_walls_to_brick.json | 26 + .../recipes/granite_relief_axe.json | 89 +- .../recipes/granite_relief_blank.json | 49 +- .../recipes/granite_relief_cross.json | 49 +- .../recipes/granite_relief_hammer.json | 61 +- .../recipes/granite_relief_hoe.json | 89 +- .../recipes/granite_relief_horizontal.json | 45 +- .../mineralogy/recipes/granite_relief_i.json | 49 +- .../recipes/granite_relief_left.json | 49 +- .../recipes/granite_relief_pickaxe.json | 89 +- .../recipes/granite_relief_plus.json | 49 +- .../recipes/granite_relief_right.json | 47 +- .../recipes/granite_relief_sword.json | 89 +- .../recipes/granite_relief_vertical.json | 49 +- .../data/mineralogy/recipes/granite_slab.json | 41 +- ...ranite_slab_from_granite_stonecutting.json | 21 - .../mineralogy/recipes/granite_smooth.json | 40 +- .../recipes/granite_smooth_brick.json | 47 +- .../recipes/granite_smooth_brick_furnace.json | 62 +- .../recipes/granite_smooth_brick_slab.json | 49 +- .../recipes/granite_smooth_brick_stairs.json | 53 +- .../recipes/granite_smooth_brick_wall.json | 51 +- .../recipes/granite_smooth_furnace.json | 58 +- .../recipes/granite_smooth_slab.json | 45 +- .../recipes/granite_smooth_stairs.json | 49 +- .../recipes/granite_smooth_wall.json | 47 +- .../mineralogy/recipes/granite_stairs.json | 45 +- ...nite_stairs_from_granite_stonecutting.json | 21 - .../data/mineralogy/recipes/granite_wall.json | 43 +- ...ranite_wall_from_granite_stonecutting.json | 21 - .../recipes/gunpowder_from_carbon_dust.json | 31 + ...rbon.json => gunpowder_from_charcoal.json} | 8 +- .../recipes/gunpowder_from_coal.json | 18 - .../recipes/gunpowder_from_coal_dust.json | 31 + .../recipes/gunpowder_from_sugar.json | 6 + .../data/mineralogy/recipes/gypsum.json | 14 +- .../data/mineralogy/recipes/gypsum_dust.json | 8 +- .../mineralogy/recipes/hornfels_brick.json | 43 +- .../hornfels_brick_block_polishing.json | 25 + .../recipes/hornfels_brick_furnace.json | 58 +- .../recipes/hornfels_brick_slab.json | 45 +- .../hornfels_brick_slab_polishing.json | 25 + .../hornfels_brick_slab_recombination.json | 25 + .../recipes/hornfels_brick_stairs.json | 49 +- .../hornfels_brick_stairs_polishing.json | 25 + .../recipes/hornfels_brick_wall.json | 47 +- .../hornfels_brick_wall_polishing.json | 25 + .../recipes/hornfels_cobblestone.json | 5 +- .../mineralogy/recipes/hornfels_furnace.json | 54 +- .../recipes/hornfels_furnace_from_rock.json | 29 - ...els_polished_brick_slab_recombination.json | 25 + .../hornfels_polished_slab_recombination.json | 25 + .../hornfels_polished_slabs_to_brick.json | 26 + .../hornfels_polished_stairs_to_brick.json | 26 + .../hornfels_polished_walls_to_brick.json | 26 + .../recipes/hornfels_raw_slab_polishing.json | 25 + .../hornfels_raw_slab_recombination.json | 25 + .../recipes/hornfels_raw_slabs_to_brick.json | 26 + .../hornfels_raw_stairs_polishing.json | 25 + .../recipes/hornfels_raw_stairs_to_brick.json | 26 + .../recipes/hornfels_raw_wall_polishing.json | 25 + .../recipes/hornfels_raw_walls_to_brick.json | 26 + .../recipes/hornfels_relief_axe.json | 89 +- .../recipes/hornfels_relief_blank.json | 49 +- .../recipes/hornfels_relief_cross.json | 49 +- .../recipes/hornfels_relief_hammer.json | 61 +- .../recipes/hornfels_relief_hoe.json | 89 +- .../recipes/hornfels_relief_horizontal.json | 45 +- .../mineralogy/recipes/hornfels_relief_i.json | 49 +- .../recipes/hornfels_relief_left.json | 49 +- .../recipes/hornfels_relief_pickaxe.json | 89 +- .../recipes/hornfels_relief_plus.json | 49 +- .../recipes/hornfels_relief_right.json | 47 +- .../recipes/hornfels_relief_sword.json | 89 +- .../recipes/hornfels_relief_vertical.json | 49 +- .../mineralogy/recipes/hornfels_slab.json | 41 +- ...nfels_slab_from_hornfels_stonecutting.json | 21 - .../mineralogy/recipes/hornfels_smooth.json | 40 +- .../recipes/hornfels_smooth_brick.json | 47 +- .../hornfels_smooth_brick_furnace.json | 62 +- .../recipes/hornfels_smooth_brick_slab.json | 49 +- .../recipes/hornfels_smooth_brick_stairs.json | 53 +- .../recipes/hornfels_smooth_brick_wall.json | 51 +- .../recipes/hornfels_smooth_furnace.json | 58 +- .../recipes/hornfels_smooth_slab.json | 45 +- .../recipes/hornfels_smooth_stairs.json | 49 +- .../recipes/hornfels_smooth_wall.json | 47 +- .../mineralogy/recipes/hornfels_stairs.json | 45 +- ...els_stairs_from_hornfels_stonecutting.json | 21 - .../mineralogy/recipes/hornfels_wall.json | 43 +- ...nfels_wall_from_hornfels_stonecutting.json | 21 - .../mineralogy/recipes/limestone_brick.json | 43 +- .../limestone_brick_block_polishing.json | 25 + .../recipes/limestone_brick_furnace.json | 58 +- .../recipes/limestone_brick_slab.json | 45 +- .../limestone_brick_slab_polishing.json | 25 + .../limestone_brick_slab_recombination.json | 25 + .../recipes/limestone_brick_stairs.json | 49 +- .../limestone_brick_stairs_polishing.json | 25 + .../recipes/limestone_brick_wall.json | 47 +- .../limestone_brick_wall_polishing.json | 25 + .../recipes/limestone_cobblestone.json | 5 +- .../mineralogy/recipes/limestone_furnace.json | 54 +- .../recipes/limestone_furnace_from_rock.json | 29 - ...one_polished_brick_slab_recombination.json | 25 + ...limestone_polished_slab_recombination.json | 25 + .../limestone_polished_slabs_to_brick.json | 26 + .../limestone_polished_stairs_to_brick.json | 26 + .../limestone_polished_walls_to_brick.json | 26 + .../recipes/limestone_raw_slab_polishing.json | 25 + .../limestone_raw_slab_recombination.json | 25 + .../recipes/limestone_raw_slabs_to_brick.json | 26 + .../limestone_raw_stairs_polishing.json | 25 + .../limestone_raw_stairs_to_brick.json | 26 + .../recipes/limestone_raw_wall_polishing.json | 25 + .../recipes/limestone_raw_walls_to_brick.json | 26 + .../recipes/limestone_relief_axe.json | 89 +- .../recipes/limestone_relief_blank.json | 49 +- .../recipes/limestone_relief_cross.json | 49 +- .../recipes/limestone_relief_hammer.json | 61 +- .../recipes/limestone_relief_hoe.json | 89 +- .../recipes/limestone_relief_horizontal.json | 45 +- .../recipes/limestone_relief_i.json | 49 +- .../recipes/limestone_relief_left.json | 49 +- .../recipes/limestone_relief_pickaxe.json | 89 +- .../recipes/limestone_relief_plus.json | 49 +- .../recipes/limestone_relief_right.json | 47 +- .../recipes/limestone_relief_sword.json | 89 +- .../recipes/limestone_relief_vertical.json | 49 +- .../mineralogy/recipes/limestone_slab.json | 41 +- ...tone_slab_from_limestone_stonecutting.json | 21 - .../mineralogy/recipes/limestone_smooth.json | 40 +- .../recipes/limestone_smooth_brick.json | 47 +- .../limestone_smooth_brick_furnace.json | 62 +- .../recipes/limestone_smooth_brick_slab.json | 49 +- .../limestone_smooth_brick_stairs.json | 53 +- .../recipes/limestone_smooth_brick_wall.json | 51 +- .../recipes/limestone_smooth_furnace.json | 58 +- .../recipes/limestone_smooth_slab.json | 45 +- .../recipes/limestone_smooth_stairs.json | 49 +- .../recipes/limestone_smooth_wall.json | 47 +- .../mineralogy/recipes/limestone_stairs.json | 45 +- ...ne_stairs_from_limestone_stonecutting.json | 21 - .../mineralogy/recipes/limestone_wall.json | 43 +- ...tone_wall_from_limestone_stonecutting.json | 21 - .../data/mineralogy/recipes/marble_brick.json | 43 +- .../recipes/marble_brick_block_polishing.json | 25 + .../recipes/marble_brick_furnace.json | 58 +- .../mineralogy/recipes/marble_brick_slab.json | 45 +- .../recipes/marble_brick_slab_polishing.json | 25 + .../marble_brick_slab_recombination.json | 25 + .../recipes/marble_brick_stairs.json | 49 +- .../marble_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/marble_brick_wall.json | 47 +- .../recipes/marble_brick_wall_polishing.json | 25 + .../recipes/marble_cobblestone.json | 5 +- .../mineralogy/recipes/marble_furnace.json | 54 +- .../recipes/marble_furnace_from_rock.json | 29 - ...ble_polished_brick_slab_recombination.json | 25 + .../marble_polished_slab_recombination.json | 25 + .../marble_polished_slabs_to_brick.json | 26 + .../marble_polished_stairs_to_brick.json | 26 + .../marble_polished_walls_to_brick.json | 26 + .../recipes/marble_raw_slab_polishing.json | 25 + .../marble_raw_slab_recombination.json | 25 + .../recipes/marble_raw_slabs_to_brick.json | 26 + .../recipes/marble_raw_stairs_polishing.json | 25 + .../recipes/marble_raw_stairs_to_brick.json | 26 + .../recipes/marble_raw_wall_polishing.json | 25 + .../recipes/marble_raw_walls_to_brick.json | 26 + .../mineralogy/recipes/marble_relief_axe.json | 89 +- .../recipes/marble_relief_blank.json | 49 +- .../recipes/marble_relief_cross.json | 49 +- .../recipes/marble_relief_hammer.json | 61 +- .../mineralogy/recipes/marble_relief_hoe.json | 89 +- .../recipes/marble_relief_horizontal.json | 45 +- .../mineralogy/recipes/marble_relief_i.json | 49 +- .../recipes/marble_relief_left.json | 49 +- .../recipes/marble_relief_pickaxe.json | 89 +- .../recipes/marble_relief_plus.json | 49 +- .../recipes/marble_relief_right.json | 47 +- .../recipes/marble_relief_sword.json | 89 +- .../recipes/marble_relief_vertical.json | 49 +- .../data/mineralogy/recipes/marble_slab.json | 41 +- .../marble_slab_from_marble_stonecutting.json | 21 - .../mineralogy/recipes/marble_smooth.json | 40 +- .../recipes/marble_smooth_brick.json | 47 +- .../recipes/marble_smooth_brick_furnace.json | 62 +- .../recipes/marble_smooth_brick_slab.json | 49 +- .../recipes/marble_smooth_brick_stairs.json | 53 +- .../recipes/marble_smooth_brick_wall.json | 51 +- .../recipes/marble_smooth_furnace.json | 58 +- .../recipes/marble_smooth_slab.json | 45 +- .../recipes/marble_smooth_stairs.json | 49 +- .../recipes/marble_smooth_wall.json | 47 +- .../mineralogy/recipes/marble_stairs.json | 45 +- ...arble_stairs_from_marble_stonecutting.json | 21 - .../data/mineralogy/recipes/marble_wall.json | 43 +- .../marble_wall_from_marble_stonecutting.json | 21 - .../recipes/mineral_fertilizer.json | 14 - .../mineralogy/recipes/mineralfertilizer.json | 25 + .../mineralogy/recipes/nitrate_block.json | 15 +- .../data/mineralogy/recipes/nitrate_dust.json | 10 + .../mineralogy/recipes/novaculite_brick.json | 43 +- .../novaculite_brick_block_polishing.json | 25 + .../recipes/novaculite_brick_furnace.json | 58 +- .../recipes/novaculite_brick_slab.json | 45 +- .../novaculite_brick_slab_polishing.json | 25 + .../novaculite_brick_slab_recombination.json | 25 + .../recipes/novaculite_brick_stairs.json | 49 +- .../novaculite_brick_stairs_polishing.json | 25 + .../recipes/novaculite_brick_wall.json | 47 +- .../novaculite_brick_wall_polishing.json | 25 + .../recipes/novaculite_cobblestone.json | 5 +- .../recipes/novaculite_furnace.json | 54 +- .../recipes/novaculite_furnace_from_rock.json | 29 - ...ite_polished_brick_slab_recombination.json | 25 + ...ovaculite_polished_slab_recombination.json | 25 + .../novaculite_polished_slabs_to_brick.json | 26 + .../novaculite_polished_stairs_to_brick.json | 26 + .../novaculite_polished_walls_to_brick.json | 26 + .../novaculite_raw_slab_polishing.json | 25 + .../novaculite_raw_slab_recombination.json | 25 + .../novaculite_raw_slabs_to_brick.json | 26 + .../novaculite_raw_stairs_polishing.json | 25 + .../novaculite_raw_stairs_to_brick.json | 26 + .../novaculite_raw_wall_polishing.json | 25 + .../novaculite_raw_walls_to_brick.json | 26 + .../recipes/novaculite_relief_axe.json | 89 +- .../recipes/novaculite_relief_blank.json | 49 +- .../recipes/novaculite_relief_cross.json | 49 +- .../recipes/novaculite_relief_hammer.json | 61 +- .../recipes/novaculite_relief_hoe.json | 89 +- .../recipes/novaculite_relief_horizontal.json | 45 +- .../recipes/novaculite_relief_i.json | 49 +- .../recipes/novaculite_relief_left.json | 49 +- .../recipes/novaculite_relief_pickaxe.json | 89 +- .../recipes/novaculite_relief_plus.json | 49 +- .../recipes/novaculite_relief_right.json | 47 +- .../recipes/novaculite_relief_sword.json | 89 +- .../recipes/novaculite_relief_vertical.json | 49 +- .../mineralogy/recipes/novaculite_slab.json | 41 +- ...ite_slab_from_novaculite_stonecutting.json | 21 - .../mineralogy/recipes/novaculite_smooth.json | 40 +- .../recipes/novaculite_smooth_brick.json | 47 +- .../novaculite_smooth_brick_furnace.json | 62 +- .../recipes/novaculite_smooth_brick_slab.json | 49 +- .../novaculite_smooth_brick_stairs.json | 53 +- .../recipes/novaculite_smooth_brick_wall.json | 51 +- .../recipes/novaculite_smooth_furnace.json | 58 +- .../recipes/novaculite_smooth_slab.json | 45 +- .../recipes/novaculite_smooth_stairs.json | 49 +- .../recipes/novaculite_smooth_wall.json | 47 +- .../mineralogy/recipes/novaculite_stairs.json | 45 +- ...e_stairs_from_novaculite_stonecutting.json | 21 - .../mineralogy/recipes/novaculite_wall.json | 43 +- ...ite_wall_from_novaculite_stonecutting.json | 21 - .../mineralogy/recipes/pegmatite_brick.json | 43 +- .../pegmatite_brick_block_polishing.json | 25 + .../recipes/pegmatite_brick_furnace.json | 58 +- .../recipes/pegmatite_brick_slab.json | 45 +- .../pegmatite_brick_slab_polishing.json | 25 + .../pegmatite_brick_slab_recombination.json | 25 + .../recipes/pegmatite_brick_stairs.json | 49 +- .../pegmatite_brick_stairs_polishing.json | 25 + .../recipes/pegmatite_brick_wall.json | 47 +- .../pegmatite_brick_wall_polishing.json | 25 + .../recipes/pegmatite_cobblestone.json | 5 +- .../mineralogy/recipes/pegmatite_furnace.json | 54 +- .../recipes/pegmatite_furnace_from_rock.json | 29 - ...ite_polished_brick_slab_recombination.json | 25 + ...pegmatite_polished_slab_recombination.json | 25 + .../pegmatite_polished_slabs_to_brick.json | 26 + .../pegmatite_polished_stairs_to_brick.json | 26 + .../pegmatite_polished_walls_to_brick.json | 26 + .../recipes/pegmatite_raw_slab_polishing.json | 25 + .../pegmatite_raw_slab_recombination.json | 25 + .../recipes/pegmatite_raw_slabs_to_brick.json | 26 + .../pegmatite_raw_stairs_polishing.json | 25 + .../pegmatite_raw_stairs_to_brick.json | 26 + .../recipes/pegmatite_raw_wall_polishing.json | 25 + .../recipes/pegmatite_raw_walls_to_brick.json | 26 + .../recipes/pegmatite_relief_axe.json | 89 +- .../recipes/pegmatite_relief_blank.json | 49 +- .../recipes/pegmatite_relief_cross.json | 49 +- .../recipes/pegmatite_relief_hammer.json | 61 +- .../recipes/pegmatite_relief_hoe.json | 89 +- .../recipes/pegmatite_relief_horizontal.json | 45 +- .../recipes/pegmatite_relief_i.json | 49 +- .../recipes/pegmatite_relief_left.json | 49 +- .../recipes/pegmatite_relief_pickaxe.json | 89 +- .../recipes/pegmatite_relief_plus.json | 49 +- .../recipes/pegmatite_relief_right.json | 47 +- .../recipes/pegmatite_relief_sword.json | 89 +- .../recipes/pegmatite_relief_vertical.json | 49 +- .../mineralogy/recipes/pegmatite_slab.json | 41 +- ...tite_slab_from_pegmatite_stonecutting.json | 21 - .../mineralogy/recipes/pegmatite_smooth.json | 40 +- .../recipes/pegmatite_smooth_brick.json | 47 +- .../pegmatite_smooth_brick_furnace.json | 62 +- .../recipes/pegmatite_smooth_brick_slab.json | 49 +- .../pegmatite_smooth_brick_stairs.json | 53 +- .../recipes/pegmatite_smooth_brick_wall.json | 51 +- .../recipes/pegmatite_smooth_furnace.json | 58 +- .../recipes/pegmatite_smooth_slab.json | 45 +- .../recipes/pegmatite_smooth_stairs.json | 49 +- .../recipes/pegmatite_smooth_wall.json | 47 +- .../mineralogy/recipes/pegmatite_stairs.json | 45 +- ...te_stairs_from_pegmatite_stonecutting.json | 21 - .../mineralogy/recipes/pegmatite_wall.json | 43 +- ...tite_wall_from_pegmatite_stonecutting.json | 21 - .../mineralogy/recipes/peridotite_brick.json | 43 +- .../peridotite_brick_block_polishing.json | 25 + .../recipes/peridotite_brick_furnace.json | 58 +- .../recipes/peridotite_brick_slab.json | 45 +- .../peridotite_brick_slab_polishing.json | 25 + .../peridotite_brick_slab_recombination.json | 25 + .../recipes/peridotite_brick_stairs.json | 49 +- .../peridotite_brick_stairs_polishing.json | 25 + .../recipes/peridotite_brick_wall.json | 47 +- .../peridotite_brick_wall_polishing.json | 25 + .../recipes/peridotite_cobblestone.json | 5 +- .../recipes/peridotite_furnace.json | 54 +- .../recipes/peridotite_furnace_from_rock.json | 29 - ...ite_polished_brick_slab_recombination.json | 25 + ...eridotite_polished_slab_recombination.json | 25 + .../peridotite_polished_slabs_to_brick.json | 26 + .../peridotite_polished_stairs_to_brick.json | 26 + .../peridotite_polished_walls_to_brick.json | 26 + .../peridotite_raw_slab_polishing.json | 25 + .../peridotite_raw_slab_recombination.json | 25 + .../peridotite_raw_slabs_to_brick.json | 26 + .../peridotite_raw_stairs_polishing.json | 25 + .../peridotite_raw_stairs_to_brick.json | 26 + .../peridotite_raw_wall_polishing.json | 25 + .../peridotite_raw_walls_to_brick.json | 26 + .../recipes/peridotite_relief_axe.json | 89 +- .../recipes/peridotite_relief_blank.json | 49 +- .../recipes/peridotite_relief_cross.json | 49 +- .../recipes/peridotite_relief_hammer.json | 61 +- .../recipes/peridotite_relief_hoe.json | 89 +- .../recipes/peridotite_relief_horizontal.json | 45 +- .../recipes/peridotite_relief_i.json | 49 +- .../recipes/peridotite_relief_left.json | 49 +- .../recipes/peridotite_relief_pickaxe.json | 89 +- .../recipes/peridotite_relief_plus.json | 49 +- .../recipes/peridotite_relief_right.json | 47 +- .../recipes/peridotite_relief_sword.json | 89 +- .../recipes/peridotite_relief_vertical.json | 49 +- .../mineralogy/recipes/peridotite_slab.json | 41 +- ...ite_slab_from_peridotite_stonecutting.json | 21 - .../mineralogy/recipes/peridotite_smooth.json | 40 +- .../recipes/peridotite_smooth_brick.json | 47 +- .../peridotite_smooth_brick_furnace.json | 62 +- .../recipes/peridotite_smooth_brick_slab.json | 49 +- .../peridotite_smooth_brick_stairs.json | 53 +- .../recipes/peridotite_smooth_brick_wall.json | 51 +- .../recipes/peridotite_smooth_furnace.json | 58 +- .../recipes/peridotite_smooth_slab.json | 45 +- .../recipes/peridotite_smooth_stairs.json | 49 +- .../recipes/peridotite_smooth_wall.json | 47 +- .../mineralogy/recipes/peridotite_stairs.json | 45 +- ...e_stairs_from_peridotite_stonecutting.json | 21 - .../mineralogy/recipes/peridotite_wall.json | 43 +- ...ite_wall_from_peridotite_stonecutting.json | 21 - .../mineralogy/recipes/phosphorous_block.json | 15 +- .../mineralogy/recipes/phosphorous_dust.json | 10 + .../mineralogy/recipes/phyllite_brick.json | 43 +- .../phyllite_brick_block_polishing.json | 25 + .../recipes/phyllite_brick_furnace.json | 58 +- .../recipes/phyllite_brick_slab.json | 45 +- .../phyllite_brick_slab_polishing.json | 25 + .../phyllite_brick_slab_recombination.json | 25 + .../recipes/phyllite_brick_stairs.json | 49 +- .../phyllite_brick_stairs_polishing.json | 25 + .../recipes/phyllite_brick_wall.json | 47 +- .../phyllite_brick_wall_polishing.json | 25 + .../recipes/phyllite_cobblestone.json | 5 +- .../mineralogy/recipes/phyllite_furnace.json | 54 +- .../recipes/phyllite_furnace_from_rock.json | 29 - ...ite_polished_brick_slab_recombination.json | 25 + .../phyllite_polished_slab_recombination.json | 25 + .../phyllite_polished_slabs_to_brick.json | 26 + .../phyllite_polished_stairs_to_brick.json | 26 + .../phyllite_polished_walls_to_brick.json | 26 + .../recipes/phyllite_raw_slab_polishing.json | 25 + .../phyllite_raw_slab_recombination.json | 25 + .../recipes/phyllite_raw_slabs_to_brick.json | 26 + .../phyllite_raw_stairs_polishing.json | 25 + .../recipes/phyllite_raw_stairs_to_brick.json | 26 + .../recipes/phyllite_raw_wall_polishing.json | 25 + .../recipes/phyllite_raw_walls_to_brick.json | 26 + .../recipes/phyllite_relief_axe.json | 89 +- .../recipes/phyllite_relief_blank.json | 49 +- .../recipes/phyllite_relief_cross.json | 49 +- .../recipes/phyllite_relief_hammer.json | 61 +- .../recipes/phyllite_relief_hoe.json | 89 +- .../recipes/phyllite_relief_horizontal.json | 45 +- .../mineralogy/recipes/phyllite_relief_i.json | 49 +- .../recipes/phyllite_relief_left.json | 49 +- .../recipes/phyllite_relief_pickaxe.json | 89 +- .../recipes/phyllite_relief_plus.json | 49 +- .../recipes/phyllite_relief_right.json | 47 +- .../recipes/phyllite_relief_sword.json | 89 +- .../recipes/phyllite_relief_vertical.json | 49 +- .../mineralogy/recipes/phyllite_slab.json | 41 +- ...llite_slab_from_phyllite_stonecutting.json | 21 - .../mineralogy/recipes/phyllite_smooth.json | 40 +- .../recipes/phyllite_smooth_brick.json | 47 +- .../phyllite_smooth_brick_furnace.json | 62 +- .../recipes/phyllite_smooth_brick_slab.json | 49 +- .../recipes/phyllite_smooth_brick_stairs.json | 53 +- .../recipes/phyllite_smooth_brick_wall.json | 51 +- .../recipes/phyllite_smooth_furnace.json | 58 +- .../recipes/phyllite_smooth_slab.json | 45 +- .../recipes/phyllite_smooth_stairs.json | 49 +- .../recipes/phyllite_smooth_wall.json | 47 +- .../mineralogy/recipes/phyllite_stairs.json | 45 +- ...ite_stairs_from_phyllite_stonecutting.json | 21 - .../mineralogy/recipes/phyllite_wall.json | 43 +- ...llite_wall_from_phyllite_stonecutting.json | 21 - .../mineralogy/recipes/quartzite_brick.json | 43 +- .../quartzite_brick_block_polishing.json | 25 + .../recipes/quartzite_brick_furnace.json | 58 +- .../recipes/quartzite_brick_slab.json | 45 +- .../quartzite_brick_slab_polishing.json | 25 + .../quartzite_brick_slab_recombination.json | 25 + .../recipes/quartzite_brick_stairs.json | 49 +- .../quartzite_brick_stairs_polishing.json | 25 + .../recipes/quartzite_brick_wall.json | 47 +- .../quartzite_brick_wall_polishing.json | 25 + .../recipes/quartzite_cobblestone.json | 5 +- .../mineralogy/recipes/quartzite_furnace.json | 54 +- .../recipes/quartzite_furnace_from_rock.json | 29 - ...ite_polished_brick_slab_recombination.json | 25 + ...quartzite_polished_slab_recombination.json | 25 + .../quartzite_polished_slabs_to_brick.json | 26 + .../quartzite_polished_stairs_to_brick.json | 26 + .../quartzite_polished_walls_to_brick.json | 26 + .../recipes/quartzite_raw_slab_polishing.json | 25 + .../quartzite_raw_slab_recombination.json | 25 + .../recipes/quartzite_raw_slabs_to_brick.json | 26 + .../quartzite_raw_stairs_polishing.json | 25 + .../quartzite_raw_stairs_to_brick.json | 26 + .../recipes/quartzite_raw_wall_polishing.json | 25 + .../recipes/quartzite_raw_walls_to_brick.json | 26 + .../recipes/quartzite_relief_axe.json | 89 +- .../recipes/quartzite_relief_blank.json | 49 +- .../recipes/quartzite_relief_cross.json | 49 +- .../recipes/quartzite_relief_hammer.json | 61 +- .../recipes/quartzite_relief_hoe.json | 89 +- .../recipes/quartzite_relief_horizontal.json | 45 +- .../recipes/quartzite_relief_i.json | 49 +- .../recipes/quartzite_relief_left.json | 49 +- .../recipes/quartzite_relief_pickaxe.json | 89 +- .../recipes/quartzite_relief_plus.json | 49 +- .../recipes/quartzite_relief_right.json | 47 +- .../recipes/quartzite_relief_sword.json | 89 +- .../recipes/quartzite_relief_vertical.json | 49 +- .../mineralogy/recipes/quartzite_slab.json | 41 +- ...zite_slab_from_quartzite_stonecutting.json | 21 - .../mineralogy/recipes/quartzite_smooth.json | 40 +- .../recipes/quartzite_smooth_brick.json | 47 +- .../quartzite_smooth_brick_furnace.json | 62 +- .../recipes/quartzite_smooth_brick_slab.json | 49 +- .../quartzite_smooth_brick_stairs.json | 53 +- .../recipes/quartzite_smooth_brick_wall.json | 51 +- .../recipes/quartzite_smooth_furnace.json | 58 +- .../recipes/quartzite_smooth_slab.json | 45 +- .../recipes/quartzite_smooth_stairs.json | 49 +- .../recipes/quartzite_smooth_wall.json | 47 +- .../mineralogy/recipes/quartzite_stairs.json | 45 +- ...te_stairs_from_quartzite_stonecutting.json | 21 - .../mineralogy/recipes/quartzite_wall.json | 43 +- ...zite_wall_from_quartzite_stonecutting.json | 21 - .../mineralogy/recipes/rhyolite_brick.json | 43 +- .../rhyolite_brick_block_polishing.json | 25 + .../recipes/rhyolite_brick_furnace.json | 58 +- .../recipes/rhyolite_brick_slab.json | 45 +- .../rhyolite_brick_slab_polishing.json | 25 + .../rhyolite_brick_slab_recombination.json | 25 + .../recipes/rhyolite_brick_stairs.json | 49 +- .../rhyolite_brick_stairs_polishing.json | 25 + .../recipes/rhyolite_brick_wall.json | 47 +- .../rhyolite_brick_wall_polishing.json | 25 + .../recipes/rhyolite_cobblestone.json | 5 +- .../mineralogy/recipes/rhyolite_furnace.json | 54 +- .../recipes/rhyolite_furnace_from_rock.json | 29 - ...ite_polished_brick_slab_recombination.json | 25 + .../rhyolite_polished_slab_recombination.json | 25 + .../rhyolite_polished_slabs_to_brick.json | 26 + .../rhyolite_polished_stairs_to_brick.json | 26 + .../rhyolite_polished_walls_to_brick.json | 26 + .../recipes/rhyolite_raw_slab_polishing.json | 25 + .../rhyolite_raw_slab_recombination.json | 25 + .../recipes/rhyolite_raw_slabs_to_brick.json | 26 + .../rhyolite_raw_stairs_polishing.json | 25 + .../recipes/rhyolite_raw_stairs_to_brick.json | 26 + .../recipes/rhyolite_raw_wall_polishing.json | 25 + .../recipes/rhyolite_raw_walls_to_brick.json | 26 + .../recipes/rhyolite_relief_axe.json | 89 +- .../recipes/rhyolite_relief_blank.json | 49 +- .../recipes/rhyolite_relief_cross.json | 49 +- .../recipes/rhyolite_relief_hammer.json | 61 +- .../recipes/rhyolite_relief_hoe.json | 89 +- .../recipes/rhyolite_relief_horizontal.json | 45 +- .../mineralogy/recipes/rhyolite_relief_i.json | 49 +- .../recipes/rhyolite_relief_left.json | 49 +- .../recipes/rhyolite_relief_pickaxe.json | 89 +- .../recipes/rhyolite_relief_plus.json | 49 +- .../recipes/rhyolite_relief_right.json | 47 +- .../recipes/rhyolite_relief_sword.json | 89 +- .../recipes/rhyolite_relief_vertical.json | 49 +- .../mineralogy/recipes/rhyolite_slab.json | 41 +- ...olite_slab_from_rhyolite_stonecutting.json | 21 - .../mineralogy/recipes/rhyolite_smooth.json | 40 +- .../recipes/rhyolite_smooth_brick.json | 47 +- .../rhyolite_smooth_brick_furnace.json | 62 +- .../recipes/rhyolite_smooth_brick_slab.json | 49 +- .../recipes/rhyolite_smooth_brick_stairs.json | 53 +- .../recipes/rhyolite_smooth_brick_wall.json | 51 +- .../recipes/rhyolite_smooth_furnace.json | 58 +- .../recipes/rhyolite_smooth_slab.json | 45 +- .../recipes/rhyolite_smooth_stairs.json | 49 +- .../recipes/rhyolite_smooth_wall.json | 47 +- .../mineralogy/recipes/rhyolite_stairs.json | 45 +- ...ite_stairs_from_rhyolite_stonecutting.json | 21 - .../mineralogy/recipes/rhyolite_wall.json | 43 +- ...olite_wall_from_rhyolite_stonecutting.json | 21 - .../data/mineralogy/recipes/rock_salt.json | 9 +- .../mineralogy/recipes/rock_salt_brick.json | 43 +- .../rock_salt_brick_block_polishing.json | 25 + .../recipes/rock_salt_brick_furnace.json | 58 +- .../recipes/rock_salt_brick_slab.json | 45 +- .../rock_salt_brick_slab_polishing.json | 25 + .../rock_salt_brick_slab_recombination.json | 25 + .../recipes/rock_salt_brick_stairs.json | 49 +- .../rock_salt_brick_stairs_polishing.json | 25 + .../recipes/rock_salt_brick_wall.json | 47 +- .../rock_salt_brick_wall_polishing.json | 25 + .../recipes/rock_salt_cobblestone.json | 5 +- .../mineralogy/recipes/rock_salt_dust.json | 6 + .../mineralogy/recipes/rock_salt_furnace.json | 54 +- .../recipes/rock_salt_furnace_from_rock.json | 29 - ...alt_polished_brick_slab_recombination.json | 25 + ...rock_salt_polished_slab_recombination.json | 25 + .../rock_salt_polished_slabs_to_brick.json | 26 + .../rock_salt_polished_stairs_to_brick.json | 26 + .../rock_salt_polished_walls_to_brick.json | 26 + .../recipes/rock_salt_raw_slab_polishing.json | 25 + .../rock_salt_raw_slab_recombination.json | 25 + .../recipes/rock_salt_raw_slabs_to_brick.json | 26 + .../rock_salt_raw_stairs_polishing.json | 25 + .../rock_salt_raw_stairs_to_brick.json | 26 + .../recipes/rock_salt_raw_wall_polishing.json | 25 + .../recipes/rock_salt_raw_walls_to_brick.json | 26 + .../recipes/rock_salt_relief_axe.json | 89 +- .../recipes/rock_salt_relief_blank.json | 49 +- .../recipes/rock_salt_relief_cross.json | 49 +- .../recipes/rock_salt_relief_hammer.json | 61 +- .../recipes/rock_salt_relief_hoe.json | 89 +- .../recipes/rock_salt_relief_horizontal.json | 45 +- .../recipes/rock_salt_relief_i.json | 49 +- .../recipes/rock_salt_relief_left.json | 49 +- .../recipes/rock_salt_relief_pickaxe.json | 89 +- .../recipes/rock_salt_relief_plus.json | 49 +- .../recipes/rock_salt_relief_right.json | 47 +- .../recipes/rock_salt_relief_sword.json | 89 +- .../recipes/rock_salt_relief_vertical.json | 49 +- .../mineralogy/recipes/rock_salt_slab.json | 41 +- ...salt_slab_from_rock_salt_stonecutting.json | 21 - .../mineralogy/recipes/rock_salt_smooth.json | 40 +- .../recipes/rock_salt_smooth_brick.json | 47 +- .../rock_salt_smooth_brick_furnace.json | 62 +- .../recipes/rock_salt_smooth_brick_slab.json | 49 +- .../rock_salt_smooth_brick_stairs.json | 53 +- .../recipes/rock_salt_smooth_brick_wall.json | 51 +- .../recipes/rock_salt_smooth_furnace.json | 58 +- .../recipes/rock_salt_smooth_slab.json | 45 +- .../recipes/rock_salt_smooth_stairs.json | 49 +- .../recipes/rock_salt_smooth_wall.json | 47 +- .../mineralogy/recipes/rock_salt_stairs.json | 45 +- ...lt_stairs_from_rock_salt_stonecutting.json | 21 - .../mineralogy/recipes/rock_salt_wall.json | 43 +- ...salt_wall_from_rock_salt_stonecutting.json | 21 - .../data/mineralogy/recipes/rocksaltlamp.json | 15 +- .../recipes/rocksaltstreetlamp.json | 13 +- .../data/mineralogy/recipes/schist_brick.json | 43 +- .../recipes/schist_brick_block_polishing.json | 25 + .../recipes/schist_brick_furnace.json | 58 +- .../mineralogy/recipes/schist_brick_slab.json | 45 +- .../recipes/schist_brick_slab_polishing.json | 25 + .../schist_brick_slab_recombination.json | 25 + .../recipes/schist_brick_stairs.json | 49 +- .../schist_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/schist_brick_wall.json | 47 +- .../recipes/schist_brick_wall_polishing.json | 25 + .../recipes/schist_cobblestone.json | 5 +- .../mineralogy/recipes/schist_furnace.json | 54 +- .../recipes/schist_furnace_from_rock.json | 29 - ...ist_polished_brick_slab_recombination.json | 25 + .../schist_polished_slab_recombination.json | 25 + .../schist_polished_slabs_to_brick.json | 26 + .../schist_polished_stairs_to_brick.json | 26 + .../schist_polished_walls_to_brick.json | 26 + .../recipes/schist_raw_slab_polishing.json | 25 + .../schist_raw_slab_recombination.json | 25 + .../recipes/schist_raw_slabs_to_brick.json | 26 + .../recipes/schist_raw_stairs_polishing.json | 25 + .../recipes/schist_raw_stairs_to_brick.json | 26 + .../recipes/schist_raw_wall_polishing.json | 25 + .../recipes/schist_raw_walls_to_brick.json | 26 + .../mineralogy/recipes/schist_relief_axe.json | 89 +- .../recipes/schist_relief_blank.json | 49 +- .../recipes/schist_relief_cross.json | 49 +- .../recipes/schist_relief_hammer.json | 61 +- .../mineralogy/recipes/schist_relief_hoe.json | 89 +- .../recipes/schist_relief_horizontal.json | 45 +- .../mineralogy/recipes/schist_relief_i.json | 49 +- .../recipes/schist_relief_left.json | 49 +- .../recipes/schist_relief_pickaxe.json | 89 +- .../recipes/schist_relief_plus.json | 49 +- .../recipes/schist_relief_right.json | 47 +- .../recipes/schist_relief_sword.json | 89 +- .../recipes/schist_relief_vertical.json | 49 +- .../data/mineralogy/recipes/schist_slab.json | 41 +- .../schist_slab_from_schist_stonecutting.json | 21 - .../mineralogy/recipes/schist_smooth.json | 40 +- .../recipes/schist_smooth_brick.json | 47 +- .../recipes/schist_smooth_brick_furnace.json | 62 +- .../recipes/schist_smooth_brick_slab.json | 49 +- .../recipes/schist_smooth_brick_stairs.json | 53 +- .../recipes/schist_smooth_brick_wall.json | 51 +- .../recipes/schist_smooth_furnace.json | 58 +- .../recipes/schist_smooth_slab.json | 45 +- .../recipes/schist_smooth_stairs.json | 49 +- .../recipes/schist_smooth_wall.json | 47 +- .../mineralogy/recipes/schist_stairs.json | 45 +- ...chist_stairs_from_schist_stonecutting.json | 21 - .../data/mineralogy/recipes/schist_wall.json | 43 +- .../schist_wall_from_schist_stonecutting.json | 21 - .../data/mineralogy/recipes/scoria_brick.json | 43 +- .../recipes/scoria_brick_block_polishing.json | 25 + .../recipes/scoria_brick_furnace.json | 58 +- .../mineralogy/recipes/scoria_brick_slab.json | 45 +- .../recipes/scoria_brick_slab_polishing.json | 25 + .../scoria_brick_slab_recombination.json | 25 + .../recipes/scoria_brick_stairs.json | 49 +- .../scoria_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/scoria_brick_wall.json | 47 +- .../recipes/scoria_brick_wall_polishing.json | 25 + .../recipes/scoria_cobblestone.json | 5 +- .../mineralogy/recipes/scoria_furnace.json | 54 +- .../recipes/scoria_furnace_from_rock.json | 29 - ...ria_polished_brick_slab_recombination.json | 25 + .../scoria_polished_slab_recombination.json | 25 + .../scoria_polished_slabs_to_brick.json | 26 + .../scoria_polished_stairs_to_brick.json | 26 + .../scoria_polished_walls_to_brick.json | 26 + .../recipes/scoria_raw_slab_polishing.json | 25 + .../scoria_raw_slab_recombination.json | 25 + .../recipes/scoria_raw_slabs_to_brick.json | 26 + .../recipes/scoria_raw_stairs_polishing.json | 25 + .../recipes/scoria_raw_stairs_to_brick.json | 26 + .../recipes/scoria_raw_wall_polishing.json | 25 + .../recipes/scoria_raw_walls_to_brick.json | 26 + .../mineralogy/recipes/scoria_relief_axe.json | 89 +- .../recipes/scoria_relief_blank.json | 49 +- .../recipes/scoria_relief_cross.json | 49 +- .../recipes/scoria_relief_hammer.json | 61 +- .../mineralogy/recipes/scoria_relief_hoe.json | 89 +- .../recipes/scoria_relief_horizontal.json | 45 +- .../mineralogy/recipes/scoria_relief_i.json | 49 +- .../recipes/scoria_relief_left.json | 49 +- .../recipes/scoria_relief_pickaxe.json | 89 +- .../recipes/scoria_relief_plus.json | 49 +- .../recipes/scoria_relief_right.json | 47 +- .../recipes/scoria_relief_sword.json | 89 +- .../recipes/scoria_relief_vertical.json | 49 +- .../data/mineralogy/recipes/scoria_slab.json | 41 +- .../scoria_slab_from_scoria_stonecutting.json | 21 - .../mineralogy/recipes/scoria_smooth.json | 40 +- .../recipes/scoria_smooth_brick.json | 47 +- .../recipes/scoria_smooth_brick_furnace.json | 62 +- .../recipes/scoria_smooth_brick_slab.json | 49 +- .../recipes/scoria_smooth_brick_stairs.json | 53 +- .../recipes/scoria_smooth_brick_wall.json | 51 +- .../recipes/scoria_smooth_furnace.json | 58 +- .../recipes/scoria_smooth_slab.json | 45 +- .../recipes/scoria_smooth_stairs.json | 49 +- .../recipes/scoria_smooth_wall.json | 47 +- .../mineralogy/recipes/scoria_stairs.json | 45 +- ...coria_stairs_from_scoria_stonecutting.json | 21 - .../data/mineralogy/recipes/scoria_wall.json | 43 +- .../scoria_wall_from_scoria_stonecutting.json | 21 - .../data/mineralogy/recipes/shale_brick.json | 43 +- .../recipes/shale_brick_block_polishing.json | 25 + .../recipes/shale_brick_furnace.json | 58 +- .../mineralogy/recipes/shale_brick_slab.json | 45 +- .../recipes/shale_brick_slab_polishing.json | 25 + .../shale_brick_slab_recombination.json | 25 + .../recipes/shale_brick_stairs.json | 49 +- .../recipes/shale_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/shale_brick_wall.json | 47 +- .../recipes/shale_brick_wall_polishing.json | 25 + .../mineralogy/recipes/shale_cobblestone.json | 5 +- .../mineralogy/recipes/shale_furnace.json | 54 +- .../recipes/shale_furnace_from_rock.json | 29 - ...ale_polished_brick_slab_recombination.json | 25 + .../shale_polished_slab_recombination.json | 25 + .../shale_polished_slabs_to_brick.json | 26 + .../shale_polished_stairs_to_brick.json | 26 + .../shale_polished_walls_to_brick.json | 26 + .../recipes/shale_raw_slab_polishing.json | 25 + .../recipes/shale_raw_slab_recombination.json | 25 + .../recipes/shale_raw_slabs_to_brick.json | 26 + .../recipes/shale_raw_stairs_polishing.json | 25 + .../recipes/shale_raw_stairs_to_brick.json | 26 + .../recipes/shale_raw_wall_polishing.json | 25 + .../recipes/shale_raw_walls_to_brick.json | 26 + .../mineralogy/recipes/shale_relief_axe.json | 89 +- .../recipes/shale_relief_blank.json | 49 +- .../recipes/shale_relief_cross.json | 49 +- .../recipes/shale_relief_hammer.json | 61 +- .../mineralogy/recipes/shale_relief_hoe.json | 89 +- .../recipes/shale_relief_horizontal.json | 45 +- .../mineralogy/recipes/shale_relief_i.json | 49 +- .../mineralogy/recipes/shale_relief_left.json | 49 +- .../recipes/shale_relief_pickaxe.json | 89 +- .../mineralogy/recipes/shale_relief_plus.json | 49 +- .../recipes/shale_relief_right.json | 47 +- .../recipes/shale_relief_sword.json | 89 +- .../recipes/shale_relief_vertical.json | 49 +- .../data/mineralogy/recipes/shale_slab.json | 41 +- .../shale_slab_from_shale_stonecutting.json | 21 - .../data/mineralogy/recipes/shale_smooth.json | 40 +- .../recipes/shale_smooth_brick.json | 47 +- .../recipes/shale_smooth_brick_furnace.json | 62 +- .../recipes/shale_smooth_brick_slab.json | 49 +- .../recipes/shale_smooth_brick_stairs.json | 53 +- .../recipes/shale_smooth_brick_wall.json | 51 +- .../recipes/shale_smooth_furnace.json | 58 +- .../mineralogy/recipes/shale_smooth_slab.json | 45 +- .../recipes/shale_smooth_stairs.json | 49 +- .../mineralogy/recipes/shale_smooth_wall.json | 47 +- .../data/mineralogy/recipes/shale_stairs.json | 45 +- .../shale_stairs_from_shale_stonecutting.json | 21 - .../data/mineralogy/recipes/shale_wall.json | 43 +- .../shale_wall_from_shale_stonecutting.json | 21 - .../mineralogy/recipes/siltstone_brick.json | 43 +- .../siltstone_brick_block_polishing.json | 25 + .../recipes/siltstone_brick_furnace.json | 58 +- .../recipes/siltstone_brick_slab.json | 45 +- .../siltstone_brick_slab_polishing.json | 25 + .../siltstone_brick_slab_recombination.json | 25 + .../recipes/siltstone_brick_stairs.json | 49 +- .../siltstone_brick_stairs_polishing.json | 25 + .../recipes/siltstone_brick_wall.json | 47 +- .../siltstone_brick_wall_polishing.json | 25 + .../recipes/siltstone_cobblestone.json | 5 +- .../mineralogy/recipes/siltstone_furnace.json | 54 +- .../recipes/siltstone_furnace_from_rock.json | 29 - ...one_polished_brick_slab_recombination.json | 25 + ...siltstone_polished_slab_recombination.json | 25 + .../siltstone_polished_slabs_to_brick.json | 26 + .../siltstone_polished_stairs_to_brick.json | 26 + .../siltstone_polished_walls_to_brick.json | 26 + .../recipes/siltstone_raw_slab_polishing.json | 25 + .../siltstone_raw_slab_recombination.json | 25 + .../recipes/siltstone_raw_slabs_to_brick.json | 26 + .../siltstone_raw_stairs_polishing.json | 25 + .../siltstone_raw_stairs_to_brick.json | 26 + .../recipes/siltstone_raw_wall_polishing.json | 25 + .../recipes/siltstone_raw_walls_to_brick.json | 26 + .../recipes/siltstone_relief_axe.json | 89 +- .../recipes/siltstone_relief_blank.json | 49 +- .../recipes/siltstone_relief_cross.json | 49 +- .../recipes/siltstone_relief_hammer.json | 61 +- .../recipes/siltstone_relief_hoe.json | 89 +- .../recipes/siltstone_relief_horizontal.json | 45 +- .../recipes/siltstone_relief_i.json | 49 +- .../recipes/siltstone_relief_left.json | 49 +- .../recipes/siltstone_relief_pickaxe.json | 89 +- .../recipes/siltstone_relief_plus.json | 49 +- .../recipes/siltstone_relief_right.json | 47 +- .../recipes/siltstone_relief_sword.json | 89 +- .../recipes/siltstone_relief_vertical.json | 49 +- .../mineralogy/recipes/siltstone_slab.json | 41 +- ...tone_slab_from_siltstone_stonecutting.json | 21 - .../mineralogy/recipes/siltstone_smooth.json | 40 +- .../recipes/siltstone_smooth_brick.json | 47 +- .../siltstone_smooth_brick_furnace.json | 62 +- .../recipes/siltstone_smooth_brick_slab.json | 49 +- .../siltstone_smooth_brick_stairs.json | 53 +- .../recipes/siltstone_smooth_brick_wall.json | 51 +- .../recipes/siltstone_smooth_furnace.json | 58 +- .../recipes/siltstone_smooth_slab.json | 45 +- .../recipes/siltstone_smooth_stairs.json | 49 +- .../recipes/siltstone_smooth_wall.json | 47 +- .../mineralogy/recipes/siltstone_stairs.json | 45 +- ...ne_stairs_from_siltstone_stonecutting.json | 21 - .../mineralogy/recipes/siltstone_wall.json | 43 +- ...tone_wall_from_siltstone_stonecutting.json | 21 - .../data/mineralogy/recipes/slate_brick.json | 43 +- .../recipes/slate_brick_block_polishing.json | 25 + .../recipes/slate_brick_furnace.json | 58 +- .../mineralogy/recipes/slate_brick_slab.json | 45 +- .../recipes/slate_brick_slab_polishing.json | 25 + .../slate_brick_slab_recombination.json | 25 + .../recipes/slate_brick_stairs.json | 49 +- .../recipes/slate_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/slate_brick_wall.json | 47 +- .../recipes/slate_brick_wall_polishing.json | 25 + .../mineralogy/recipes/slate_cobblestone.json | 5 +- .../mineralogy/recipes/slate_furnace.json | 54 +- .../recipes/slate_furnace_from_rock.json | 29 - ...ate_polished_brick_slab_recombination.json | 25 + .../slate_polished_slab_recombination.json | 25 + .../slate_polished_slabs_to_brick.json | 26 + .../slate_polished_stairs_to_brick.json | 26 + .../slate_polished_walls_to_brick.json | 26 + .../recipes/slate_raw_slab_polishing.json | 25 + .../recipes/slate_raw_slab_recombination.json | 25 + .../recipes/slate_raw_slabs_to_brick.json | 26 + .../recipes/slate_raw_stairs_polishing.json | 25 + .../recipes/slate_raw_stairs_to_brick.json | 26 + .../recipes/slate_raw_wall_polishing.json | 25 + .../recipes/slate_raw_walls_to_brick.json | 26 + .../mineralogy/recipes/slate_relief_axe.json | 89 +- .../recipes/slate_relief_blank.json | 49 +- .../recipes/slate_relief_cross.json | 49 +- .../recipes/slate_relief_hammer.json | 61 +- .../mineralogy/recipes/slate_relief_hoe.json | 89 +- .../recipes/slate_relief_horizontal.json | 45 +- .../mineralogy/recipes/slate_relief_i.json | 49 +- .../mineralogy/recipes/slate_relief_left.json | 49 +- .../recipes/slate_relief_pickaxe.json | 89 +- .../mineralogy/recipes/slate_relief_plus.json | 49 +- .../recipes/slate_relief_right.json | 47 +- .../recipes/slate_relief_sword.json | 89 +- .../recipes/slate_relief_vertical.json | 49 +- .../data/mineralogy/recipes/slate_slab.json | 41 +- .../slate_slab_from_slate_stonecutting.json | 21 - .../data/mineralogy/recipes/slate_smooth.json | 40 +- .../recipes/slate_smooth_brick.json | 47 +- .../recipes/slate_smooth_brick_furnace.json | 62 +- .../recipes/slate_smooth_brick_slab.json | 49 +- .../recipes/slate_smooth_brick_stairs.json | 53 +- .../recipes/slate_smooth_brick_wall.json | 51 +- .../recipes/slate_smooth_furnace.json | 58 +- .../mineralogy/recipes/slate_smooth_slab.json | 45 +- .../recipes/slate_smooth_stairs.json | 49 +- .../mineralogy/recipes/slate_smooth_wall.json | 47 +- .../data/mineralogy/recipes/slate_stairs.json | 45 +- .../slate_stairs_from_slate_stonecutting.json | 21 - .../data/mineralogy/recipes/slate_wall.json | 43 +- .../slate_wall_from_slate_stonecutting.json | 21 - .../data/mineralogy/recipes/sulfur_block.json | 15 +- .../data/mineralogy/recipes/sulfur_dust.json | 10 + .../data/mineralogy/recipes/tuff_brick.json | 43 +- .../recipes/tuff_brick_block_polishing.json | 25 + .../recipes/tuff_brick_furnace.json | 58 +- .../mineralogy/recipes/tuff_brick_slab.json | 45 +- .../recipes/tuff_brick_slab_polishing.json | 25 + .../tuff_brick_slab_recombination.json | 25 + .../mineralogy/recipes/tuff_brick_stairs.json | 49 +- .../recipes/tuff_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/tuff_brick_wall.json | 47 +- .../recipes/tuff_brick_wall_polishing.json | 25 + .../mineralogy/recipes/tuff_cobblestone.json | 5 +- .../data/mineralogy/recipes/tuff_furnace.json | 54 +- .../recipes/tuff_furnace_from_rock.json | 29 - ...uff_polished_brick_slab_recombination.json | 25 + .../tuff_polished_slab_recombination.json | 25 + .../recipes/tuff_polished_slabs_to_brick.json | 26 + .../tuff_polished_stairs_to_brick.json | 26 + .../recipes/tuff_polished_walls_to_brick.json | 26 + .../recipes/tuff_raw_slab_polishing.json | 25 + .../recipes/tuff_raw_slab_recombination.json | 25 + .../recipes/tuff_raw_slabs_to_brick.json | 26 + .../recipes/tuff_raw_stairs_polishing.json | 25 + .../recipes/tuff_raw_stairs_to_brick.json | 26 + .../recipes/tuff_raw_wall_polishing.json | 25 + .../recipes/tuff_raw_walls_to_brick.json | 26 + .../mineralogy/recipes/tuff_relief_axe.json | 89 +- .../mineralogy/recipes/tuff_relief_blank.json | 49 +- .../mineralogy/recipes/tuff_relief_cross.json | 49 +- .../recipes/tuff_relief_hammer.json | 61 +- .../mineralogy/recipes/tuff_relief_hoe.json | 89 +- .../recipes/tuff_relief_horizontal.json | 45 +- .../mineralogy/recipes/tuff_relief_i.json | 49 +- .../mineralogy/recipes/tuff_relief_left.json | 49 +- .../recipes/tuff_relief_pickaxe.json | 89 +- .../mineralogy/recipes/tuff_relief_plus.json | 49 +- .../mineralogy/recipes/tuff_relief_right.json | 47 +- .../mineralogy/recipes/tuff_relief_sword.json | 89 +- .../recipes/tuff_relief_vertical.json | 49 +- .../data/mineralogy/recipes/tuff_slab.json | 41 +- .../tuff_slab_from_tuff_stonecutting.json | 21 - .../data/mineralogy/recipes/tuff_smooth.json | 40 +- .../mineralogy/recipes/tuff_smooth_brick.json | 47 +- .../recipes/tuff_smooth_brick_furnace.json | 62 +- .../recipes/tuff_smooth_brick_slab.json | 49 +- .../recipes/tuff_smooth_brick_stairs.json | 53 +- .../recipes/tuff_smooth_brick_wall.json | 51 +- .../recipes/tuff_smooth_furnace.json | 58 +- .../mineralogy/recipes/tuff_smooth_slab.json | 45 +- .../recipes/tuff_smooth_stairs.json | 49 +- .../mineralogy/recipes/tuff_smooth_wall.json | 47 +- .../data/mineralogy/recipes/tuff_stairs.json | 45 +- .../tuff_stairs_from_tuff_stonecutting.json | 21 - .../data/mineralogy/recipes/tuff_wall.json | 43 +- .../tuff_wall_from_tuff_stonecutting.json | 21 - .../mineralogy/tags/items/drywall/white.json | 6 + .../tags/items/slabs/amphibolite.json | 6 + .../tags/items/slabs/amphibolite/brick.json | 6 + .../tags/items/slabs/amphibolite/smooth.json | 6 + .../items/slabs/amphibolite/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/andesite.json | 6 + .../tags/items/slabs/andesite/brick.json | 6 + .../tags/items/slabs/andesite/smooth.json | 6 + .../items/slabs/andesite/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/basalt.json | 6 + .../tags/items/slabs/basalt/brick.json | 6 + .../tags/items/slabs/basalt/smooth.json | 6 + .../tags/items/slabs/basalt/smooth_brick.json | 6 + .../tags/items/slabs/basaltic_glass.json | 6 + .../items/slabs/basaltic_glass/brick.json | 6 + .../items/slabs/basaltic_glass/smooth.json | 6 + .../slabs/basaltic_glass/smooth_brick.json | 6 + .../tags/items/slabs/conglomerate.json | 6 + .../tags/items/slabs/conglomerate/brick.json | 6 + .../tags/items/slabs/conglomerate/smooth.json | 6 + .../slabs/conglomerate/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/diabase.json | 6 + .../tags/items/slabs/diabase/brick.json | 6 + .../tags/items/slabs/diabase/smooth.json | 6 + .../items/slabs/diabase/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/diorite.json | 6 + .../tags/items/slabs/diorite/brick.json | 6 + .../tags/items/slabs/diorite/smooth.json | 6 + .../items/slabs/diorite/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/dolomite.json | 6 + .../tags/items/slabs/dolomite/brick.json | 6 + .../tags/items/slabs/dolomite/smooth.json | 6 + .../items/slabs/dolomite/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/gabbro.json | 6 + .../tags/items/slabs/gabbro/brick.json | 6 + .../tags/items/slabs/gabbro/smooth.json | 6 + .../tags/items/slabs/gabbro/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/gneiss.json | 6 + .../tags/items/slabs/gneiss/brick.json | 6 + .../tags/items/slabs/gneiss/smooth.json | 6 + .../tags/items/slabs/gneiss/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/granite.json | 6 + .../tags/items/slabs/granite/brick.json | 6 + .../tags/items/slabs/granite/smooth.json | 6 + .../items/slabs/granite/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/hornfels.json | 6 + .../tags/items/slabs/hornfels/brick.json | 6 + .../tags/items/slabs/hornfels/smooth.json | 6 + .../items/slabs/hornfels/smooth_brick.json | 6 + .../tags/items/slabs/limestone.json | 6 + .../tags/items/slabs/limestone/brick.json | 6 + .../tags/items/slabs/limestone/smooth.json | 6 + .../items/slabs/limestone/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/marble.json | 6 + .../tags/items/slabs/marble/brick.json | 6 + .../tags/items/slabs/marble/smooth.json | 6 + .../tags/items/slabs/marble/smooth_brick.json | 6 + .../tags/items/slabs/novaculite.json | 6 + .../tags/items/slabs/novaculite/brick.json | 6 + .../tags/items/slabs/novaculite/smooth.json | 6 + .../items/slabs/novaculite/smooth_brick.json | 6 + .../tags/items/slabs/pegmatite.json | 6 + .../tags/items/slabs/pegmatite/brick.json | 6 + .../tags/items/slabs/pegmatite/smooth.json | 6 + .../items/slabs/pegmatite/smooth_brick.json | 6 + .../tags/items/slabs/peridotite.json | 6 + .../tags/items/slabs/peridotite/brick.json | 6 + .../tags/items/slabs/peridotite/smooth.json | 6 + .../items/slabs/peridotite/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/phyllite.json | 6 + .../tags/items/slabs/phyllite/brick.json | 6 + .../tags/items/slabs/phyllite/smooth.json | 6 + .../items/slabs/phyllite/smooth_brick.json | 6 + .../tags/items/slabs/quartzite.json | 6 + .../tags/items/slabs/quartzite/brick.json | 6 + .../tags/items/slabs/quartzite/smooth.json | 6 + .../items/slabs/quartzite/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/rhyolite.json | 6 + .../tags/items/slabs/rhyolite/brick.json | 6 + .../tags/items/slabs/rhyolite/smooth.json | 6 + .../items/slabs/rhyolite/smooth_brick.json | 6 + .../tags/items/slabs/rock_salt.json | 6 + .../tags/items/slabs/rock_salt/brick.json | 6 + .../tags/items/slabs/rock_salt/smooth.json | 6 + .../items/slabs/rock_salt/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/schist.json | 6 + .../tags/items/slabs/schist/brick.json | 6 + .../tags/items/slabs/schist/smooth.json | 6 + .../tags/items/slabs/schist/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/scoria.json | 6 + .../tags/items/slabs/scoria/brick.json | 6 + .../tags/items/slabs/scoria/smooth.json | 6 + .../tags/items/slabs/scoria/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/shale.json | 6 + .../tags/items/slabs/shale/brick.json | 6 + .../tags/items/slabs/shale/smooth.json | 6 + .../tags/items/slabs/shale/smooth_brick.json | 6 + .../tags/items/slabs/siltstone.json | 6 + .../tags/items/slabs/siltstone/brick.json | 6 + .../tags/items/slabs/siltstone/smooth.json | 6 + .../items/slabs/siltstone/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/slate.json | 6 + .../tags/items/slabs/slate/brick.json | 6 + .../tags/items/slabs/slate/smooth.json | 6 + .../tags/items/slabs/slate/smooth_brick.json | 6 + .../mineralogy/tags/items/slabs/tuff.json | 6 + .../tags/items/slabs/tuff/brick.json | 6 + .../tags/items/slabs/tuff/smooth.json | 6 + .../tags/items/slabs/tuff/smooth_brick.json | 6 + .../tags/items/stones/amphibolite.json | 6 + .../tags/items/stones/amphibolite/brick.json | 6 + .../tags/items/stones/amphibolite/smooth.json | 6 + .../stones/amphibolite/smooth_brick.json | 6 + .../tags/items/stones/andesite.json | 6 + .../tags/items/stones/andesite/brick.json | 6 + .../tags/items/stones/andesite/smooth.json | 6 + .../items/stones/andesite/smooth_brick.json | 6 + .../mineralogy/tags/items/stones/basalt.json | 6 + .../tags/items/stones/basalt/brick.json | 6 + .../tags/items/stones/basalt/smooth.json | 6 + .../items/stones/basalt/smooth_brick.json | 6 + .../tags/items/stones/basaltic_glass.json | 6 + .../items/stones/basaltic_glass/brick.json | 6 + .../items/stones/basaltic_glass/smooth.json | 6 + .../stones/basaltic_glass/smooth_brick.json | 6 + .../tags/items/stones/conglomerate.json | 6 + .../tags/items/stones/conglomerate/brick.json | 6 + .../items/stones/conglomerate/smooth.json | 6 + .../stones/conglomerate/smooth_brick.json | 6 + .../mineralogy/tags/items/stones/diabase.json | 6 + .../tags/items/stones/diabase/brick.json | 6 + .../tags/items/stones/diabase/smooth.json | 6 + .../items/stones/diabase/smooth_brick.json | 6 + .../mineralogy/tags/items/stones/diorite.json | 6 + .../tags/items/stones/diorite/brick.json | 6 + .../tags/items/stones/diorite/smooth.json | 6 + .../items/stones/diorite/smooth_brick.json | 6 + .../tags/items/stones/dolomite.json | 6 + .../tags/items/stones/dolomite/brick.json | 6 + .../tags/items/stones/dolomite/smooth.json | 6 + .../items/stones/dolomite/smooth_brick.json | 6 + .../mineralogy/tags/items/stones/gabbro.json | 6 + .../tags/items/stones/gabbro/brick.json | 6 + .../tags/items/stones/gabbro/smooth.json | 6 + .../items/stones/gabbro/smooth_brick.json | 6 + .../mineralogy/tags/items/stones/gneiss.json | 6 + .../tags/items/stones/gneiss/brick.json | 6 + .../tags/items/stones/gneiss/smooth.json | 6 + .../items/stones/gneiss/smooth_brick.json | 6 + .../mineralogy/tags/items/stones/granite.json | 6 + .../tags/items/stones/granite/brick.json | 6 + .../tags/items/stones/granite/smooth.json | 6 + .../items/stones/granite/smooth_brick.json | 6 + .../tags/items/stones/hornfels.json | 6 + .../tags/items/stones/hornfels/brick.json | 6 + .../tags/items/stones/hornfels/smooth.json | 6 + .../items/stones/hornfels/smooth_brick.json | 6 + .../tags/items/stones/limestone.json | 6 + .../tags/items/stones/limestone/brick.json | 6 + .../tags/items/stones/limestone/smooth.json | 6 + .../items/stones/limestone/smooth_brick.json | 6 + .../mineralogy/tags/items/stones/marble.json | 6 + .../tags/items/stones/marble/brick.json | 6 + .../tags/items/stones/marble/smooth.json | 6 + .../items/stones/marble/smooth_brick.json | 6 + .../tags/items/stones/novaculite.json | 6 + .../tags/items/stones/novaculite/brick.json | 6 + .../tags/items/stones/novaculite/smooth.json | 6 + .../items/stones/novaculite/smooth_brick.json | 6 + .../tags/items/stones/pegmatite.json | 6 + .../tags/items/stones/pegmatite/brick.json | 6 + .../tags/items/stones/pegmatite/smooth.json | 6 + .../items/stones/pegmatite/smooth_brick.json | 6 + .../tags/items/stones/peridotite.json | 6 + .../tags/items/stones/peridotite/brick.json | 6 + .../tags/items/stones/peridotite/smooth.json | 6 + .../items/stones/peridotite/smooth_brick.json | 6 + .../tags/items/stones/phyllite.json | 6 + .../tags/items/stones/phyllite/brick.json | 6 + .../tags/items/stones/phyllite/smooth.json | 6 + .../items/stones/phyllite/smooth_brick.json | 6 + .../tags/items/stones/quartzite.json | 6 + .../tags/items/stones/quartzite/brick.json | 6 + .../tags/items/stones/quartzite/smooth.json | 6 + .../items/stones/quartzite/smooth_brick.json | 6 + .../tags/items/stones/rhyolite.json | 6 + .../tags/items/stones/rhyolite/brick.json | 6 + .../tags/items/stones/rhyolite/smooth.json | 6 + .../items/stones/rhyolite/smooth_brick.json | 6 + .../tags/items/stones/rock_salt.json | 6 + .../tags/items/stones/rock_salt/brick.json | 6 + .../tags/items/stones/rock_salt/smooth.json | 6 + .../items/stones/rock_salt/smooth_brick.json | 6 + .../mineralogy/tags/items/stones/schist.json | 6 + .../tags/items/stones/schist/brick.json | 6 + .../tags/items/stones/schist/smooth.json | 6 + .../items/stones/schist/smooth_brick.json | 6 + .../mineralogy/tags/items/stones/scoria.json | 6 + .../tags/items/stones/scoria/brick.json | 6 + .../tags/items/stones/scoria/smooth.json | 6 + .../items/stones/scoria/smooth_brick.json | 6 + .../mineralogy/tags/items/stones/shale.json | 6 + .../tags/items/stones/shale/brick.json | 6 + .../tags/items/stones/shale/smooth.json | 6 + .../tags/items/stones/shale/smooth_brick.json | 6 + .../tags/items/stones/siltstone.json | 6 + .../tags/items/stones/siltstone/brick.json | 6 + .../tags/items/stones/siltstone/smooth.json | 6 + .../items/stones/siltstone/smooth_brick.json | 6 + .../mineralogy/tags/items/stones/slate.json | 6 + .../tags/items/stones/slate/brick.json | 6 + .../tags/items/stones/slate/smooth.json | 6 + .../tags/items/stones/slate/smooth_brick.json | 6 + .../mineralogy/tags/items/stones/tuff.json | 6 + .../tags/items/stones/tuff/brick.json | 6 + .../tags/items/stones/tuff/smooth.json | 6 + .../tags/items/stones/tuff/smooth_brick.json | 6 + .../tags/items/vanilla_furnace_materials.json | 8 - .../ConfigurationAndMigrationTest.java | 224 ++ .../mc/mineralogy/GameplayContractTest.java | 165 ++ .../mineralogy/LocalizationQualityTest.java | 179 ++ .../mc/mineralogy/ResourceContractTest.java | 296 +++ .../mc/mineralogy/WorkflowContractTest.java | 107 + .../LegacyTileEntityIdNormalizerTest.java | 33 + 3274 files changed, 83902 insertions(+), 44566 deletions(-) create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/codeql-analysis.yml create mode 100644 .github/workflows/release-on-tag.yml create mode 100644 .github/workflows/validate-gradle-build.yml create mode 100644 docs/CONTENT_CONFIG.md create mode 100644 docs/DEVELOPER_GUIDE.md create mode 100644 docs/PLAYER_GUIDE.md create mode 100644 docs/PROVIDER.md create mode 100644 docs/README.md create mode 100644 docs/VERSIONS.md create mode 100644 gradle/stage-orespawn-release.sh create mode 100644 scripts/generate-locales.ps1 create mode 100644 scripts/generate-recipes.ps1 delete mode 100644 src/main/java/com/mcmoddev/mineralogy/Mineralogy.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/MineralogyConfig.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/RockType.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/blocks/DoubleSlab.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/blocks/RockFurnace.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/blocks/RockSaltLamp.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/blocks/RockStairs.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/blocks/RockWall.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/client/ClientSetup.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/init/Features.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/init/MineralogyItemGroups.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/init/MineralogyRegistry.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/worldgen/BakedGeomeConfig.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/worldgen/Geology.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/worldgen/GeomeConfig.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/worldgen/GeomeDistributionSampler.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/worldgen/GeomeGeology.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/worldgen/MineralogyOreGeneration.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/worldgen/RockFamily.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/worldgen/StoneReplacer.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/worldgen/math/CubicInterpolator.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/worldgen/math/NoiseLayer2D.java delete mode 100644 src/main/java/com/mcmoddev/mineralogy/worldgen/math/PerlinNoise2D.java rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/Constants.java (95%) create mode 100644 src/main/java/zone/moddev/mc/mineralogy/ContentPolicy.java create mode 100644 src/main/java/zone/moddev/mc/mineralogy/CreativeTabPolicy.java create mode 100644 src/main/java/zone/moddev/mc/mineralogy/Mineralogy.java create mode 100644 src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/Chalk.java (91%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/Chert.java (69%) create mode 100644 src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/DryWall.java (93%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/Gypsum.java (92%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/Ore.java (95%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/Rock.java (86%) create mode 100644 src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/RockRelief.java (97%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/RockSalt.java (91%) create mode 100644 src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/RockSaltStreetLamp.java (98%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/RockSlab.java (53%) create mode 100644 src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java create mode 100644 src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java create mode 100644 src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java create mode 100644 src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/data/Material.java (67%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/data/MaterialData.java (53%) create mode 100644 src/main/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporter.java create mode 100644 src/main/java/zone/moddev/mc/mineralogy/fluids/MineralogyFluids.java rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/init/Blocks.java (81%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/init/Items.java (66%) create mode 100644 src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java create mode 100644 src/main/java/zone/moddev/mc/mineralogy/init/MineralogyRegistry.java rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/init/TileEntities.java (86%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/inventory/ContainerRockFurnace.java (83%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/inventory/SlotRockFurnaceOutput.java (96%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/items/MineralFertilizer.java (92%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/lib/data/MaterialStats.java (82%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/lib/data/MaterialType.java (72%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/lib/data/Names.java (79%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/lib/exceptions/ItemNotFoundException.java (75%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/lib/exceptions/MaterialNotFoundException.java (77%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/lib/exceptions/TabNotFoundException.java (75%) create mode 100644 src/main/java/zone/moddev/mc/mineralogy/migration/LegacyOreConfigMigrator.java create mode 100644 src/main/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizer.java rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/patching/LegacyWorldDataHook.java (100%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/patching/PatchHandler.java (94%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/tileentity/TileEntityRockFurnace.java (98%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/util/BlockItemPair.java (87%) create mode 100644 src/main/resources/assets/mineralogy/blockstates/crude_oil.json create mode 100644 src/main/resources/assets/mineralogy/lang/ja_jp.json create mode 100644 src/main/resources/assets/mineralogy/lang/ko_kr.json create mode 100644 src/main/resources/assets/mineralogy/lang/pt_br.json create mode 100644 src/main/resources/assets/mineralogy/lang/pt_pt.json create mode 100644 src/main/resources/assets/mineralogy/lang/ru_ru.json create mode 100644 src/main/resources/assets/mineralogy/models/block/crude_oil.json create mode 100644 src/main/resources/assets/mineralogy/models/item/crude_oil_bucket.json create mode 100644 src/main/resources/assets/mineralogy/textures/blocks/crude_oil_flow.png create mode 100644 src/main/resources/assets/mineralogy/textures/blocks/crude_oil_flow.png.mcmeta create mode 100644 src/main/resources/assets/mineralogy/textures/blocks/crude_oil_still.png create mode 100644 src/main/resources/assets/mineralogy/textures/blocks/crude_oil_still.png.mcmeta create mode 100644 src/main/resources/assets/mineralogy/textures/items/crude_oil_bucket.png create mode 100644 src/main/resources/data/forge/tags/fluids/crude_oil.json create mode 100644 src/main/resources/data/forge/tags/items/buckets/crude_oil.json create mode 100644 src/main/resources/data/forge/tags/items/dusts/coal.json create mode 100644 src/main/resources/data/forge/tags/items/paper.json create mode 100644 src/main/resources/data/forge/tags/items/sand.json delete mode 100644 src/main/resources/data/minecraft/recipes/andesite.json delete mode 100644 src/main/resources/data/minecraft/recipes/diorite.json delete mode 100644 src/main/resources/data/minecraft/recipes/dispenser.json delete mode 100644 src/main/resources/data/minecraft/recipes/dropper.json delete mode 100644 src/main/resources/data/minecraft/recipes/furnace.json delete mode 100644 src/main/resources/data/minecraft/recipes/lever.json delete mode 100644 src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json delete mode 100644 src/main/resources/data/minecraft/recipes/observer.json delete mode 100644 src/main/resources/data/minecraft/recipes/piston.json delete mode 100644 src/main/resources/data/minecraft/recipes/stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/amphibolite_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basalt_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/chalk.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/conglomerate_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diabase_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/dolomite_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_light_blue.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gabbro_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gneiss_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gravel_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_carbon_dust.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_charcoal.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_coal_dust.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_sugar.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gypsum.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/hornfels_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/limestone_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/marble_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/novaculite_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/pegmatite_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/peridotite_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/phyllite_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/quartzite_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rhyolite_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_dust.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/rock_salt_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/schist_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/scoria_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/shale_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/siltstone_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/slate_to_stone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/tuff_to_stone.json create mode 100644 src/main/resources/data/mineralogy/orespawn/provider.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_slab_from_amphibolite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_stairs_from_amphibolite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/amphibolite_wall_from_amphibolite_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/andesite_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/andesite_slab_from_andesite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/andesite_stairs_from_andesite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/andesite_wall_from_andesite_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/basalt_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/basalt_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/basalt_slab_from_basalt_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/basalt_stairs_from_basalt_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/basalt_wall_from_basalt_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_slab_from_basaltic_glass_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs_from_basaltic_glass_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/basaltic_glass_wall_from_basaltic_glass_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_slab_from_conglomerate_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_stairs_from_conglomerate_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/conglomerate_wall_from_conglomerate_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/diabase_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/diabase_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/diabase_slab_from_diabase_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/diabase_stairs_from_diabase_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/diabase_wall_from_diabase_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/diorite_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/diorite_slab_from_diorite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/diorite_stairs_from_diorite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/diorite_wall_from_diorite_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_slab_from_dolomite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_stairs_from_dolomite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/dolomite_wall_from_dolomite_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_slab_from_gabbro_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_stairs_from_gabbro_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/gabbro_wall_from_gabbro_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_slab_from_gneiss_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_stairs_from_gneiss_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/gneiss_wall_from_gneiss_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/granite_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/granite_slab_from_granite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/granite_stairs_from_granite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/granite_wall_from_granite_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon_dust.json rename src/main/resources/data/mineralogy/recipes/{gunpowder_from_carbon.json => gunpowder_from_charcoal.json} (63%) delete mode 100644 src/main/resources/data/mineralogy/recipes/gunpowder_from_coal.json create mode 100644 src/main/resources/data/mineralogy/recipes/gunpowder_from_coal_dust.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_slab_from_hornfels_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_stairs_from_hornfels_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/hornfels_wall_from_hornfels_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/limestone_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/limestone_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/limestone_slab_from_limestone_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/limestone_stairs_from_limestone_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/limestone_wall_from_limestone_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/marble_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/marble_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/marble_slab_from_marble_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/marble_stairs_from_marble_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/marble_wall_from_marble_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/mineral_fertilizer.json create mode 100644 src/main/resources/data/mineralogy/recipes/mineralfertilizer.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_slab_from_novaculite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_stairs_from_novaculite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/novaculite_wall_from_novaculite_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_slab_from_pegmatite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_stairs_from_pegmatite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/pegmatite_wall_from_pegmatite_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_slab_from_peridotite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_stairs_from_peridotite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/peridotite_wall_from_peridotite_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_slab_from_phyllite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_stairs_from_phyllite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/phyllite_wall_from_phyllite_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_slab_from_quartzite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_stairs_from_quartzite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/quartzite_wall_from_quartzite_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_slab_from_rhyolite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_stairs_from_rhyolite_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/rhyolite_wall_from_rhyolite_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_slab_from_rock_salt_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_stairs_from_rock_salt_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/rock_salt_wall_from_rock_salt_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/schist_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/schist_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/schist_slab_from_schist_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/schist_stairs_from_schist_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/schist_wall_from_schist_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/scoria_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/scoria_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/scoria_slab_from_scoria_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/scoria_stairs_from_scoria_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/scoria_wall_from_scoria_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/shale_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/shale_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/shale_slab_from_shale_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/shale_stairs_from_shale_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/shale_wall_from_shale_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_slab_from_siltstone_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_stairs_from_siltstone_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/siltstone_wall_from_siltstone_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/slate_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/slate_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/slate_slab_from_slate_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/slate_stairs_from_slate_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/slate_wall_from_slate_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_brick_block_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_brick_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_brick_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_brick_wall_polishing.json delete mode 100644 src/main/resources/data/mineralogy/recipes/tuff_furnace_from_rock.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_polished_brick_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_polished_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_polished_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_polished_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_polished_walls_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_raw_slab_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_raw_slab_recombination.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_raw_slabs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_to_brick.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_raw_wall_polishing.json create mode 100644 src/main/resources/data/mineralogy/recipes/tuff_raw_walls_to_brick.json delete mode 100644 src/main/resources/data/mineralogy/recipes/tuff_slab_from_tuff_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/tuff_stairs_from_tuff_stonecutting.json delete mode 100644 src/main/resources/data/mineralogy/recipes/tuff_wall_from_tuff_stonecutting.json create mode 100644 src/main/resources/data/mineralogy/tags/items/drywall/white.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/amphibolite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/andesite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/andesite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/basalt.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/basalt/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/conglomerate.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/diabase.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/diabase/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/diorite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/diorite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/dolomite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/dolomite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/gabbro.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/gabbro/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/gneiss.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/gneiss/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/granite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/granite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/hornfels.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/hornfels/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/limestone.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/limestone/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/marble.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/marble/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/novaculite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/novaculite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/pegmatite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/peridotite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/peridotite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/phyllite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/phyllite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/quartzite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/quartzite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/rhyolite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/rock_salt.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/schist.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/schist/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/scoria.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/scoria/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/shale.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/shale/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/siltstone.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/siltstone/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/slate.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/slate/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/tuff.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/tuff/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/amphibolite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/amphibolite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/andesite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/andesite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/basalt.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/basalt/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/conglomerate.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/conglomerate/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/diabase.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/diabase/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/diorite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/diorite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/dolomite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/dolomite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/gabbro.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/gabbro/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/gneiss.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/gneiss/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/granite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/granite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/granite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/hornfels.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/hornfels/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/limestone.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/limestone/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/marble.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/marble/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/marble/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/marble/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/novaculite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/novaculite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/pegmatite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/pegmatite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/peridotite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/peridotite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/phyllite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/phyllite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/quartzite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/quartzite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/rhyolite.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/rhyolite/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/rock_salt.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/rock_salt/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/schist.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/schist/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/schist/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/schist/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/scoria.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/scoria/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/shale.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/shale/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/shale/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/shale/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/siltstone.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/siltstone/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/slate.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/slate/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/slate/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/slate/smooth_brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/tuff.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/tuff/brick.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth_brick.json delete mode 100644 src/main/resources/data/mineralogy/tags/items/vanilla_furnace_materials.json create mode 100644 src/test/java/zone/moddev/mc/mineralogy/ConfigurationAndMigrationTest.java create mode 100644 src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java create mode 100644 src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java create mode 100644 src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java create mode 100644 src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java create mode 100644 src/test/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizerTest.java diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..39b46c6f7 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,88 @@ +name: Mineralogy 1.16.5 CI + +on: + push: + branches: + - master-1.16.5 + - 'feature/**' + pull_request: + branches: + - master-1.16.5 + +permissions: + contents: read + +concurrency: + group: mineralogy-1.16-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build: + name: Build, test, and audit + runs-on: ubuntu-latest + timeout-minutes: 60 + + steps: + - name: Check out source + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + + - name: Install Java 8 toolchain + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + with: + distribution: temurin + java-version: '8.0.502+7' + + - name: Install Java 17 for Gradle + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + with: + distribution: microsoft + java-version: '17' + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 + + - name: Stage exact OreSpawn release dependency + id: orespawn + run: | + mirror="$RUNNER_TEMP/orespawn-mirror" + bash gradle/stage-orespawn-release.sh "$mirror" + echo "repository=$mirror" >> "$GITHUB_OUTPUT" + + - name: Build, test, and audit release artifacts + run: | + chmod +x ./gradlew + ./gradlew clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums \ + -PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}" \ + --no-daemon --stacktrace + + - name: Generate and audit Eclipse production launches + run: >- + ./gradlew genEclipseRuns eclipse isolateEclipseProductionRuns verifyEclipseProductionClasspath + -PorespawnVerificationRepository=${{ steps.orespawn.outputs.repository }} + --no-daemon --stacktrace + + - name: Upload audited release candidate + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 + with: + name: Mineralogy-1.16.5-${{ github.sha }} + if-no-files-found: error + retention-days: 30 + path: | + build/libs/Mineralogy-6.0.1.116051.jar + build/libs/Mineralogy-6.0.1.116051-sources.jar + build/libs/Mineralogy-6.0.1.116051-javadoc.jar + build/release/SHA256SUMS + CHANGELOG.txt + + - name: Upload diagnostics on failure + if: failure() + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 + with: + name: Mineralogy-1.16.5-diagnostics-${{ github.sha }} + if-no-files-found: ignore + retention-days: 14 + path: | + build/test-results/** + build/reports/** + build/*-run/logs/** + build/problems/** diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 000000000..bf5ea7c28 --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,53 @@ +name: CodeQL + +on: + push: + branches: + - master-1.16.5 + - 'feature/**' + pull_request: + branches: + - master-1.16.5 + +permissions: + actions: read + contents: read + security-events: write + +jobs: + analyze: + name: Analyze Java + runs-on: ubuntu-latest + timeout-minutes: 45 + + steps: + - name: Check out source + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + + - name: Install Java 8 toolchain + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + with: + distribution: temurin + java-version: '8.0.502+7' + + - name: Install Java 17 for Gradle + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + with: + distribution: microsoft + java-version: '17' + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 + + - name: Initialize CodeQL + uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4 + with: + languages: java-kotlin + + - name: Compile production code + run: | + chmod +x ./gradlew + ./gradlew clean classes --rerun-tasks --no-build-cache --no-daemon --stacktrace + + - name: Analyze + uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4 diff --git a/.github/workflows/release-on-tag.yml b/.github/workflows/release-on-tag.yml new file mode 100644 index 000000000..78326a6c9 --- /dev/null +++ b/.github/workflows/release-on-tag.yml @@ -0,0 +1,92 @@ +name: Validate Mineralogy release tag + +on: + push: + tags: + - '*.*.*.*' + +permissions: + actions: read + contents: read + +concurrency: + group: mineralogy-release-tag-${{ github.ref_name }} + cancel-in-progress: false + +jobs: + validate-release-tag: + name: Validate tag for manual release confirmation + if: github.repository == 'MinecraftModDevelopmentMods/MinecraftMineralogy' + runs-on: ubuntu-latest + timeout-minutes: 10 + + steps: + - name: Check out tagged source + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + with: + fetch-depth: 0 + + - name: Validate release tag, target metadata, and prior CI + env: + GH_TOKEN: ${{ github.token }} + run: | + set -euo pipefail + + value() { sed -n "s/^$1=//p" gradle.properties; } + release_version="$(value mod_version)" + minecraft_version="$(value minecraft_version)" + loader_name="$(value loader_name)" + loader_code="$(value loader_code)" + + IFS=. read -r mc_major mc_minor mc_patch extra <<<"$minecraft_version" + if [[ -n "${extra:-}" || -z "${mc_major:-}" || -z "${mc_minor:-}" ]]; then + echo "Invalid minecraft_version=$minecraft_version" >&2 + exit 1 + fi + mc_patch="${mc_patch:-0}" + if [[ ! "$mc_major" =~ ^[0-9]+$ || ! "$mc_minor" =~ ^[0-9]+$ || ! "$mc_patch" =~ ^[0-9]+$ ]]; then + echo "Invalid minecraft_version=$minecraft_version" >&2 + exit 1 + fi + case "$loader_name:$loader_code" in + forge:1|neoforge:2) ;; + *) echo "Invalid loader metadata $loader_name/$loader_code" >&2; exit 1 ;; + esac + printf -v minor_padded '%02d' "$((10#$mc_minor))" + printf -v patch_padded '%02d' "$((10#$mc_patch))" + target_suffix="${mc_major}${minor_padded}${patch_padded}${loader_code}" + + if [[ ! "$release_version" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.${target_suffix}$ ]]; then + echo "mod_version $release_version does not match $minecraft_version $loader_name target $target_suffix" >&2 + exit 1 + fi + if [[ "$GITHUB_REF_NAME" != "$release_version" ]]; then + echo "Release tag must equal mod_version $release_version; found $GITHUB_REF_NAME" >&2 + exit 1 + fi + + successful_ci="$(gh api \ + "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA/check-runs?per_page=100" \ + --jq '[.check_runs[] | select(.name == "Build, test, and audit" and .conclusion == "success")] | length')" + if [[ "$successful_ci" -lt 1 ]]; then + echo "The tagged commit has no successful Build, test, and audit check" >&2 + exit 1 + fi + + - name: Record the manual publication interface + env: + RELEASE_WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/workflows/deploy-release.yml + run: | + { + echo "## Release tag validated" + echo + echo "Tag \`$GITHUB_REF_NAME\` matches the selected target and has a successful Build, test, and audit check." + echo + echo "If this tag was created outside the release workflow, nothing has been published." + echo + echo "To start or recover publication, open [Release Mineralogy]($RELEASE_WORKFLOW_URL), select **Run workflow**, and enter:" + echo + echo "- release version: \`$GITHUB_REF_NAME\`" + echo "- CurseForge release level: \`release\`, \`beta\`, or \`alpha\`" + echo "- confirm live publication: checked" + } >> "$GITHUB_STEP_SUMMARY" diff --git a/.github/workflows/validate-gradle-build.yml b/.github/workflows/validate-gradle-build.yml new file mode 100644 index 000000000..fc66575a5 --- /dev/null +++ b/.github/workflows/validate-gradle-build.yml @@ -0,0 +1,23 @@ +name: Validate Gradle Wrapper + +on: + push: + branches: + - master-1.16.5 + - 'feature/**' + pull_request: + branches: + - master-1.16.5 + +permissions: + contents: read + +jobs: + validation: + name: Validation + runs-on: ubuntu-latest + steps: + - name: Check out source + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + - name: Validate wrapper integrity + uses: gradle/actions/wrapper-validation@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 diff --git a/.gitignore b/.gitignore index afad86c71..4ee2ad23c 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ build eclipse run classes -logs +/logs/ # local agent context /AGENTS.md diff --git a/.project b/.project index 60146626e..b9de2a9bc 100644 --- a/.project +++ b/.project @@ -1,22 +1,22 @@ - - - Mineralogy - - - - org.eclipse.jdt.core.javanature - org.eclipse.buildship.core.gradleprojectnature - - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - + + + MinecraftMineralogy + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8067d0f67..a30501406 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1 +1,66 @@ -Mineralogy 1.12.x +Mineralogy 6.0.1.116051 for Minecraft 1.16.5 + +- Delegated terrain, strata, ore, and covered fluid-deposit generation to the + released OreSpawn 4.0.9.116051 provider engine, retaining the supported + `[4.0.6,5.0.0)` range; removed Mineralogy's parallel + geology, geome, ore, noise, and stone-replacement generators. +- Preserved all world-facing registry, tile, NBT, recipe, asset, patch, and + pre-flattening conversion identities while moving production packages to + zone.moddev.mc.mineralogy. Existing 1.10/1.12 chunks are protected during + 1.16.5's flattening conversion. Legacy rock-furnace IDs are established + before Mojang data fixing, then all pre-namespaced tile IDs are made safe + before Forge constructs tile entities, so inventories and progress survive + and an uppercase vanilla ID cannot abort the complete chunk load. + Legacy state tables now support the complete 12-bit mod block-ID range in + both development and packaged runtimes, and each selected save reinstalls + its own numeric mapping after the client enumerates multiple old worlds. +- Added compatibility-safe controls for drywall, rock-salt lamps, mineral + dusts, and fertilizer, plus the stable five-way grouped creative tabs. + Disabled content remains registered and usable in established worlds. +- Preserved vertically mounted legacy rock-salt lamps on torch-supporting + blocks such as fences during pre-flattening world conversion. +- Made the historical `COBBLESTONE_EQUIVILENT` option functional through + target-native block and item tags, reapplied after data reloads and reflected + in already-parsed recipe ingredients. Chert and pumice remain unconditional + cobblestone equivalents. +- Added isolated Mineralogy crude-oil source and flowing fluids, block, bucket, + rendering resources, and the covered Ocean deposit declaration. +- Uses Minecraft 1.16's native basalt for new OreSpawn terrain while retaining + Mineralogy's historical basalt registrations and conversion aliases; tuff + remains Mineralogy content because vanilla tuff is not present in 1.16.5. +- Preserved rock-furnace save recovery and novaculite's 3/15/1 properties; + corrected replacement drop semantics and exact full-block Silk Touch results + for double slabs. +- Ported the accepted recipe contract as 1,415 native JSON recipes and matching + advancements: safe 4-to-1 mineral packing, charcoal and Base Metals dust + gunpowder routes, exact slabs, slab recombination, construction-form brick + conversions, progressive sand polishing, matching-slab rock furnaces, and + blank-to-marked relief progression. +- Extended Minecraft 1.16's native stone crafting and tool-material tags so + every enabled Forge cobblestone equivalent, including all 27 Mineralogy rock + families, works in vanilla furnaces and tools without overriding vanilla + recipes or conflicting with matching-slab rock-furnace upgrades. +- Prevented Forge 36 from silently reducing optional carbon- or coal-dust + gunpowder recipes to nitrate plus sulfur when their compatibility tag is + empty; every loaded gunpowder recipe now requires all three components. +- Added 17 reviewed UTF-8 JSON locales with the same 938 ordered keys, including + Brazilian and European Portuguese, Canadian French, Japanese, Korean, and + Russian. +- Added first-start player, developer, content, provider, and version guides, + plus an exact provider example. Existing exported guides are never + overwritten. Forge 36 Eclipse launches keep their required merged + `bin/main` mod output while synchronizing the same processed guide resources + used by ordinary Gradle and packaged launches. +- Added independent, atomic migration of valid non-default legacy ore settings + into a Mineralogy OreSpawn provider override, including deterministic reports + and exclusive-to-inclusive maximum-height conversion. +- Preserved 1.16-native wall tall-side blockstates and models, wall/item tags, + loot tables, fluid APIs, rendering setup, and pack format 6 resources. +- Added reproducible Java 8 main, sources, and Javadoc artifacts, exact released + OreSpawn dependency verification, guarded 1.16.5 CI, and the four-component + release tag `6.0.1.116051`. +- Isolated CI's verified OreSpawn artifact in an exclusive Gradle repository so + dependency resolution cannot fall through to an unverified public copy. + Release verification also enforces Maven coordinate + `zone.moddev.mc.mineralogy:Mineralogy`, its generated POM, and the jar's + `Maven-Artifact` manifest entry. diff --git a/README.md b/README.md index eb275d941..b7ea3c284 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,39 @@ -[![](https://img.shields.io/badge/Discord-MMD-green.svg?style=flat&logo=Discord)](https://discord.mcmoddev.com) -[![](http://cf.way2muchnoise.eu/full_minecraft-mineralogy_downloads.svg)](http://minecraft.curseforge.com/projects/minecraft-mineralogy) -[![](http://cf.way2muchnoise.eu/versions/Minecraft_minecraft-mineralogy_all.svg)](http://minecraft.curseforge.com/projects/minecraft-mineralogy) -[![Build Status](https://ci.mcmoddev.com/job/Minecraft%20Mineralogy/job/Minecraft%20Mineralogy%201.12/badge/icon)](https://ci.mcmoddev.com/job/Minecraft%20Mineralogy/job/Minecraft%20Mineralogy%201.12/) +[![Discord](https://img.shields.io/badge/Discord-MMD-green.svg?style=flat&logo=Discord)](https://discord.moddev.zone) +[![CurseForge downloads](https://cf.way2muchnoise.eu/full_minecraft-mineralogy_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy) +[![Supported Minecraft versions](https://cf.way2muchnoise.eu/versions/Minecraft_minecraft-mineralogy_all.svg)](https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy) +[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml/badge.svg?branch=master-1.16.5)](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml?query=branch%3Amaster-1.16.5) -# Mineralogy -## MMD's Minecraft Mineralogy Mod -This mod replaces the generic "stone" in Minecraft with real-world rock types. +# Mineralogy 6 for Minecraft 1.16.5 -## Texture Packs -There are three levels of texture resolution available. The default textures are low-resolution (16x16 pixels, same as Minecraft), but I recommend trying the high-resolution (64x64 pixels) textures via the high-res texture pack (available on the Release page). +Mineralogy adds real-world rock families, matching construction blocks, +mineral ores and dusts, rock furnaces, drywall, rock-salt lighting, fertilizer, +and crude oil. OreSpawn 4 is the sole terrain, strata, ore, and deposit engine; +Mineralogy no longer installs a parallel world generator. -## Q&A -Q: Why make this mod? -A: Minecraft is a game that involves a lot of mining, yet it takes very little inspiration from actual geology. We made this mod to give Minecraft more of a geology vibe. After all, there's no mineral called "stone" in the geology textbook. +This branch builds Mineralogy `6.0.1.116051` for Forge `36.2.34` and is built +and tested against OreSpawn `4.0.9.116051`. Its declared compatibility range is +OreSpawn `[4.0.6,5.0.0)`. Install both mods on clients and servers. -Q: Where's the cobblestone?! -A: Many of the stone types can be used as cobblestone or as stone in crafting recipes. If you want "Stone", smelt gravel. If you want "Cobblestone", craft two blocks of rock with 2 blocks of gravel. +## Configuration and help -Q: There's too much lag when generating new chunks! -A: Yes, that can happen. Mineralogy puts a lot more computation into world generation, so you don't want to run the server (or play single-player) on a computer with a slow CPU. We tried to improve performance as much as possible, but there's no getting around the fact that the stone type needs to be calculated for every single underground block in the game. +Mineralogy's content and recipe switches remain in +`config/mineralogy-common.toml`. Use OreSpawn's world-creation UI or saved world +profile for rock, ore, fluid, dimension, altitude, and terrain-host settings. +Generation changes apply to new chunks only. -Q: Why do the ores look funny? -A: We re-textured the ores to better match the appearance of the new rock types. You can change them back by making your own texture pack from the default Minecraft resources. +After the first start, the complete human guide is available under +`config/mineralogy-guide/`. The maintained source is in [docs](docs/README.md) +and covers upgrades, content controls, pack overrides, provider data, and +four-component release versions. -## Notes to Other Modders -This mod replaces the WorldProvider for the Overworld in Minecraft. There can only be one provider per dimension, so this mod is therefore incompatible with other mods that also replace the same WorldProvider. +## Compatibility -The stone types are all registered with the OreDictionary as Stone and/or Cobblestone. If you use OreDictionary crafting recipes (ShapelessOreRecipe or ShapedOreRecipe), then there shouldn't be any trouble. However, if you manually specify the Stone or Cobblestone blocks in a standard crafting recipe object, then users of the Mineralogy mod will have to craft Cobblestone (2 gravel + 2 rock blocks) to use your recipe. +The `mineralogy` mod ID and historical block, item, tile, NBT, recipe, asset, +patch, and pre-flattening world-conversion identities are retained. Existing +Mineralogy 5 configuration is read without being rewritten. Established worlds +continue through OreSpawn's migrated Cyano/geome profile unless their owner +explicitly selects a different engine. + +[CurseForge](https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy) · +[Source and issues](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy) · +[MMD Discord](https://discord.moddev.zone) diff --git a/build.gradle b/build.gradle index 850797b0f..46cf6f250 100644 --- a/build.gradle +++ b/build.gradle @@ -1,175 +1,796 @@ -buildscript { - repositories { - maven { url = 'https://maven.minecraftforge.net' } - mavenCentral() - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - } +import groovy.json.JsonSlurper +import groovy.xml.XmlSlurper +import java.security.MessageDigest +import java.util.zip.ZipFile +import org.apache.tools.ant.filters.FixCrLfFilter + +plugins { + id 'java' + id 'eclipse' + id 'idea' + id 'maven-publish' + id 'net.minecraftforge.renamer' version '1.1.5' + id 'net.minecraftforge.gradle' version '7.0.34' } -apply plugin: 'net.minecraftforge.gradle' -// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. -apply plugin: 'eclipse' -apply plugin: 'maven-publish' version = project.mod_version -group = 'com.mcmoddev' -archivesBaseName = "Mineralogy-${project.mc_version}" - -// Mojang ships Java 16 to end users in 1.17, so the mod should target Java 16. -java.toolchain.languageVersion = JavaLanguageVersion.of(16) +group = project.mod_group +base.archivesName = 'Mineralogy' -println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) -minecraft { - // The mappings can be changed at any time, and must be in the following format. - // Channel: Version: - // snapshot YYYYMMDD Snapshot are built nightly. - // stable # Stables are built at the discretion of the MCP team. - // official MCVersion Official field/method names from Mojang mapping files - // - // You must be aware of the Mojang license when using the 'official' mappings. - // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - // - // Use non-default mappings at your own risk. they may not always work. - // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: 'official', version: project.mc_version - // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. - - // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - - // Default run configurations. - // These can be tweaked, removed, or duplicated as needed. - runs { - client { - workingDirectory project.file('run') +// Eclipse imports this nested checkout under its folder name. Keep the +// generated project and Forge launch configurations aligned with that stable +// workspace identity rather than Gradle's publication-facing root name. +def eclipseWorkspaceProjectName = projectDir.name +eclipse { + project { + name = eclipseWorkspaceProjectName + } +} - // Recommended logging data for a userdev environment - // The markers can be changed as needed. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - property 'forge.logging.markers', 'REGISTRIES' +def versionParts = project.mod_version.toString().tokenize('.') +if (versionParts.size() != 4 || !versionParts.every { it ==~ /\d+/ }) { + throw new GradleException("mod_version must use Major.Minor.Bug.Target numeric form: ${project.mod_version}") +} +if (versionParts[3] != '116051') { + throw new GradleException("Mineralogy 1.16.5 Forge releases must use target 116051: ${project.mod_version}") +} - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - property 'forge.logging.console.level', 'debug' +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + vendor = JvmVendorSpec.ADOPTIUM + } + withSourcesJar() + withJavadocJar() +} - mods { - mineralogy { - source sourceSets.main - } - } - } +tasks.named('sourcesJar', Jar) { + includeEmptyDirs = false + exclude 'com/mcmoddev/mineralogy/**' +} - server { - workingDirectory project.file('run') +tasks.withType(JavaCompile).configureEach { + javaCompiler = javaToolchains.compilerFor { + languageVersion = JavaLanguageVersion.of(8) + vendor = JvmVendorSpec.ADOPTIUM + } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + options.encoding = 'UTF-8' + options.compilerArgs.addAll(['-Xlint:deprecation', '-Xmaxerrs', '1000']) +} - // Recommended logging data for a userdev environment - // The markers can be changed as needed. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - property 'forge.logging.markers', 'REGISTRIES' +tasks.named('compileTestJava', JavaCompile) { + options.compilerArgs.add('-proc:none') +} - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - property 'forge.logging.console.level', 'debug' +minecraft { + mappings channel: project.mcp_mappings_channel, version: project.mcp_mappings_version + runs { + configureEach { + workingDir.convention layout.projectDirectory.dir( + providers.gradleProperty('runDirectory').getOrElse('run')) + systemProperty 'forge.logging.markers', 'REGISTRIES' + systemProperty 'forge.logging.console.level', 'debug' mods { - mineralogy { - source sourceSets.main - } + mineralogy { source sourceSets.main } } } + register('client') + register('server') { + args '--nogui' + } + } +} - data { - workingDirectory project.file('run') +def developmentModOutput = layout.buildDirectory.dir('forge-run-mod-classes/main') +def prepareDevelopmentMod = tasks.register('prepareDevelopmentMod', Sync) { + group = 'ide' + description = 'Merges production classes and resources for Forge 36 development discovery.' + dependsOn tasks.named('classes') + from sourceSets.main.output.classesDirs + from sourceSets.main.output.resourcesDir + into developmentModOutput +} - // Recommended logging data for a userdev environment - // The markers can be changed as needed. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - property 'forge.logging.markers', 'REGISTRIES' +def configureForge36Run = { JavaExec runTask, String launchTarget -> + runTask.dependsOn prepareDevelopmentMod + runTask.environment 'target', launchTarget + runTask.environment 'MCP_MAPPINGS', "${mcp_mappings_channel}_${mcp_mappings_version}" + runTask.environment 'MCP_VERSION', mcp_version + runTask.environment 'FORGE_VERSION', forge_version + runTask.environment 'FORGE_GROUP', 'net.minecraftforge' + runTask.environment 'MC_VERSION', mc_version + runTask.environment 'MOD_CLASSES', "mineralogy%%${developmentModOutput.get().asFile}${File.pathSeparator}" + + "mineralogy%%${developmentModOutput.get().asFile}" + runTask.doFirst { + // Forge 36 scans the mods directory before FML creates it and logs an + // otherwise harmless ERROR on a completely fresh run directory. + File modsDirectory = new File(runTask.workingDir, 'mods') + if (!modsDirectory.isDirectory() && !modsDirectory.mkdirs()) { + throw new GradleException("Could not create development mods directory: ${modsDirectory}") + } + } +} - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - property 'forge.logging.console.level', 'debug' +tasks.withType(JavaExec).configureEach { JavaExec runTask -> + String launchTarget = [runClient: 'fmluserdevclient', runServer: 'fmluserdevserver'][runTask.name] + if (launchTarget != null) configureForge36Run(runTask, launchTarget) +} - // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. - args '--mod', 'mineralogy', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') +def orespawnModule = "mmd-orespawn-${project.orespawn_curse_project_id}" +def orespawnVerificationRepository = project.findProperty('orespawnVerificationRepository') +repositories { + minecraft.mavenizer(it) + maven fg.forgeMaven + maven fg.minecraftLibsMaven + mavenCentral() - mods { - mineralogy { - source sourceSets.main - } + // The staged CI mirror is the only permitted source for this exact + // OreSpawn module. Without exclusive routing, a transient HTTP error from + // Maven Central aborts resolution before Gradle reaches the verified jar. + exclusiveContent { + forRepository { + maven { + name = orespawnVerificationRepository == null + ? 'CurseMaven' + : 'OreSpawnReleaseVerificationMirror' + url = orespawnVerificationRepository == null + ? uri('https://www.cursemaven.com') + : uri(orespawnVerificationRepository) + metadataSources { artifact() } } } + filter { + includeModule('curse.maven', orespawnModule) + } } } -// Include resources generated by data generators. -sourceSets.main.resources { srcDir 'src/generated/resources' } +configurations { + orespawnRelease +} dependencies { - // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed - // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. - // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft "net.minecraftforge:forge:${project.mc_version}-${project.forge_version}" + implementation minecraft.dependency("net.minecraftforge:forge:${project.mc_version}-${project.forge_version}") + // Development runs need a mapped view of the released, reobfuscated + // OreSpawn jar. ForgeGradle 7 delegates third-party mod remapping to + // Renamer Gradle. The separate verification configuration below still + // resolves and hashes the untouched release file. + runtimeOnly renamer.dependency("curse.maven:mmd-orespawn-${project.orespawn_curse_project_id}:${project.orespawn_curse_file_id}") + orespawnRelease "curse.maven:mmd-orespawn-${project.orespawn_curse_project_id}:${project.orespawn_curse_file_id}" + testImplementation 'junit:junit:4.13.2' +} + +// ForgeGradle 7 exposes mapped third-party mod dependencies through Renamer +// Gradle. Use the same named-to-SRG map as this project's release jar; the +// dependency helper applies it in reverse for the development runtime. +renamer.mappings.from minecraft.dependency.toSrgFile - // You may put jars on which you depend on in ./libs or you may define them like so.. - // compile "some.group:artifact:version:classifier" - // compile "some.group:artifact:version" +configurations.named('testRuntimeClasspath') { + exclude group: 'curse.maven', module: "mmd-orespawn-${project.orespawn_curse_project_id}" +} - // Real examples - // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env +tasks.withType(Test).configureEach { + workingDir = project.projectDir +} - // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. - // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' +javadoc { + failOnError = false + options.encoding = 'UTF-8' + options.addStringOption('Xdoclint:none', '-quiet') + options.addBooleanOption('notimestamp', true) +} + +tasks.withType(AbstractArchiveTask).configureEach { + preserveFileTimestamps = false + reproducibleFileOrder = true +} - // These dependencies get remapped to your current MCP mappings - // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev' +processResources { + inputs.property 'version', project.version + inputs.property 'mc_version', project.mc_version + inputs.property 'forge_version', project.forge_version - // For more info... - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html + filesMatching('META-INF/mods.toml') { + expand version: project.version, + mc_version: project.mc_version, + forge_version: project.forge_version + } + from('docs') { + into 'META-INF/mineralogy/docs' + } + from('src/main/resources/data/mineralogy/orespawn/provider.json') { + into 'META-INF/mineralogy/docs/examples' + rename 'provider.json', 'mineralogy-provider.json' + } } -// Example for how to get properties into the manifest for reading by the runtime.. -jar { +tasks.named('jar', Jar) { + archiveClassifier = 'deobf' + destinationDirectory = layout.buildDirectory.dir('libs-dev') manifest { attributes([ - "Specification-Title": "Mineralogy", - "Specification-Vendor": "SkyBlade1978", - "Specification-Version": "1", // We are version 1 of ourselves - "Implementation-Title": project.name, - "Implementation-Version": "${version}", - "Implementation-Vendor" :"SkyBlade1978", - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + 'Maven-Artifact' : "${project.group}:${base.archivesName.get()}:${project.version}", + 'Specification-Title' : 'Mineralogy', + 'Specification-Vendor' : 'SkyBlade1978', + 'Specification-Version' : '1', + 'Implementation-Title' : 'Mineralogy', + 'Implementation-Version': project.version, + 'Implementation-Vendor' : 'SkyBlade1978', + 'Built-On-Java' : '8', + 'Built-On' : "${project.mc_version}-${project.forge_version}" ]) } } -// Example configuration to allow publishing using the maven-publish task -// This is the preferred method to reobfuscate your jar file -jar.finalizedBy('reobfJar') -// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing -//publish.dependsOn('reobfJar') +eclipse { + classpath { + downloadSources = true + downloadJavadoc = true + } + synchronizationTasks 'isolateEclipseProductionRuns' +} + +idea { + module { + downloadSources = true + downloadJavadoc = true + } +} + +def releaseJar = renamer.classes(tasks.named('jar', Jar)) { + map.from minecraft.dependency.toSrgFile + archiveClassifier = null + output = layout.buildDirectory.file( + "libs/${base.archivesName.get()}-${project.version}.jar") +} + +['apiElements', 'runtimeElements'].each { configurationName -> + configurations.named(configurationName) { artifacts.clear() } + artifacts { add(configurationName, releaseJar) } +} + +tasks.named('assemble') { + dependsOn releaseJar + dependsOn tasks.named('sourcesJar') + dependsOn tasks.named('javadocJar') +} + +def mainReleaseName = "Mineralogy-${project.version}.jar" +def sourcesReleaseName = "Mineralogy-${project.version}-sources.jar" +def javadocReleaseName = "Mineralogy-${project.version}-javadoc.jar" +def expectedReleaseNames = [mainReleaseName, sourcesReleaseName, javadocReleaseName] +def expectedMavenGroup = 'zone.moddev.mc.mineralogy' +def expectedMavenArtifact = 'Mineralogy' +def expectedMavenCoordinate = "${expectedMavenGroup}:${expectedMavenArtifact}:${project.version}" +def preparedReleaseDir = project.findProperty('preparedReleaseDir') +def mavenUploadUrl = System.getenv('MAVEN_UPLOAD_URL') ?: 'https://invalid.invalid/missing-maven-upload-url' +def mavenUploadUsername = System.getenv('MAVEN_UPLOAD_USERNAME') ?: '' +def mavenUploadPassword = System.getenv('MAVEN_UPLOAD_PASSWORD') ?: '' publishing { publications { mavenJava(MavenPublication) { - artifact jar + groupId = project.group + artifactId = expectedMavenArtifact + version = project.version + if (preparedReleaseDir != null) { + artifact new File(preparedReleaseDir.toString(), mainReleaseName) + artifact(new File(preparedReleaseDir.toString(), sourcesReleaseName)) { + classifier = 'sources' + } + artifact(new File(preparedReleaseDir.toString(), javadocReleaseName)) { + classifier = 'javadoc' + } + } + else { + artifact releaseJar + artifact tasks.named('sourcesJar') + artifact tasks.named('javadocJar') + } + pom.withXml { + def root = asNode() + root.appendNode('name', 'Minecraft Mineralogy') + root.appendNode('description', 'Geologically themed rocks, minerals, building blocks, and OreSpawn provider data.') + root.appendNode('url', 'https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy') + def license = root.appendNode('licenses').appendNode('license') + license.appendNode('name', 'GNU Lesser General Public License, Version 2.1') + license.appendNode('url', 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt') + } } } repositories { maven { - url "file:///${project.projectDir}/mcmodsrepo" + name = 'release' + url = uri(mavenUploadUrl) + credentials { + username = mavenUploadUsername + password = mavenUploadPassword + } } } } + +tasks.register('verifyMavenCoordinates') { + group = 'verification' + description = 'Verifies the generated POM uses Mineralogy\'s mod-specific Maven namespace.' + dependsOn tasks.named('generatePomFileForMavenJavaPublication') + doLast { + File pomFile = file("${buildDir}/publications/mavenJava/pom-default.xml") + if (!pomFile.isFile()) { + throw new GradleException("Generated Maven POM does not exist: ${pomFile}") + } + def pom = new XmlSlurper(false, false).parse(pomFile) + def actual = [pom.groupId.text(), pom.artifactId.text(), pom.version.text()] + def expected = [expectedMavenGroup, expectedMavenArtifact, project.version.toString()] + if (project.group.toString() != expectedMavenGroup || actual != expected) { + throw new GradleException("Expected Maven coordinate ${expected.join(':')}, found ${actual.join(':')}") + } + } +} + +tasks.register('verifyReleaseConfiguration') { + group = 'verification' + description = 'Verifies the exact Mineralogy 1.16 release identity.' + doLast { + if (project.mod_version != '6.0.1.116051' + || project.mod_group != expectedMavenGroup + || project.minecraft_version != '1.16.5' + || project.forge_version != '36.2.34' + || project.mcp_mappings_channel != 'snapshot' + || project.mcp_mappings_version != '20210309-1.16.5') { + throw new GradleException('Unexpected Mineralogy 1.16.5 release identity') + } + } +} + +tasks.register('verifyReleaseDependencies') { + group = 'verification' + description = 'Resolves and verifies the exact released OreSpawn dependency.' + doLast { + if (project.mod_version != '6.0.1.116051' + || project.minecraft_version != project.mc_version + || project.mc_version != '1.16.5' + || project.loader_name != 'forge' + || project.loader_code != '1' + || project.java_version != '8' + || project.java_toolchain_version != '8.0.502+7' + || project.gradle_java_version != '17' + || project.curseforge_project_id != '240974') { + throw new GradleException('Unexpected generic release dispatcher metadata') + } + if (project.orespawn_version != '4.0.9.116051' || + project.orespawn_curse_project_id != '245586' || + project.orespawn_curse_file_id != '8742102') { + throw new GradleException('Unexpected OreSpawn release coordinates') + } + File artifact = configurations.orespawnRelease.resolvedConfiguration.resolvedArtifacts + .find { it.moduleVersion.id.group == 'curse.maven' && it.file.name.endsWith('.jar') }?.file + if (artifact == null || !artifact.isFile()) { + throw new GradleException('Released OreSpawn artifact did not resolve') + } + String sha = MessageDigest.getInstance('SHA-256').digest(artifact.bytes).encodeHex().toString().toUpperCase() + if (sha != project.orespawn_sha256) { + throw new GradleException("OreSpawn SHA-256 mismatch: ${sha}") + } + } +} + +tasks.register('verifyReleaseArtifacts') { + group = 'verification' + description = 'Audits the three distributable jars and their production contents.' + dependsOn tasks.named('verifyReleaseConfiguration') + dependsOn tasks.named('assemble') + doLast { + File libs = file("${buildDir}/libs") + def actual = fileTree(libs) { include 'Mineralogy-*.jar' }.files.collect { it.name }.sort() + def expectedSorted = expectedReleaseNames.collect().sort() + if (actual != expectedSorted) { + throw new GradleException("Expected exactly ${expectedSorted}, found ${actual}") + } + expectedReleaseNames.each { artifactName -> + ZipFile artifactZip = new ZipFile(new File(libs, artifactName)) + try { + def artifactNames = artifactZip.entries().collect { it.name } + if (artifactNames.any { it.startsWith('com/mcmoddev/mineralogy/') || + it.startsWith('zone/moddev/mc/mineralogy/worldgen/') || + it.startsWith('zone/moddev/mc/mineralogy/probe/') || + it.startsWith('zone/moddev/mc/mineralogy/test/') || + it.startsWith('src/test/') || + it == 'AGENTS.md' || it.contains('/agent-notes/') }) { + throw new GradleException("${artifactName} contains a retired, test, probe, or agent-only path") + } + } + finally { + artifactZip.close() + } + } + File main = new File(libs, mainReleaseName) + ZipFile zip = new ZipFile(main) + try { + def names = zip.entries().collect { it.name } as Set + [ + 'META-INF/mods.toml', + 'data/mineralogy/orespawn/provider.json', + 'META-INF/mineralogy/docs/README.md', + 'META-INF/mineralogy/docs/examples/mineralogy-provider.json', + 'assets/mineralogy/lang/en_us.json' + ].each { required -> + if (!names.contains(required)) throw new GradleException("Release jar is missing ${required}") + } + def manifestEntry = zip.getEntry('META-INF/MANIFEST.MF') + if (manifestEntry == null) throw new GradleException('Release jar is missing META-INF/MANIFEST.MF') + def manifestStream = zip.getInputStream(manifestEntry) + try { + def manifest = new java.util.jar.Manifest(manifestStream) + def actualMavenCoordinate = manifest.mainAttributes.getValue('Maven-Artifact') + if (actualMavenCoordinate != expectedMavenCoordinate) { + throw new GradleException("Expected manifest Maven-Artifact ${expectedMavenCoordinate}, found ${actualMavenCoordinate}") + } + } + finally { + manifestStream.close() + } + if (names.any { it.startsWith('com/mcmoddev/mineralogy/') || + it.startsWith('zone/moddev/mc/mineralogy/worldgen/') || + it.startsWith('zone/moddev/mc/mineralogy/probe/') || + it.startsWith('zone/moddev/mc/mineralogy/test/') || + it == 'AGENTS.md' || it.contains('/agent-notes/') }) { + throw new GradleException('Release jar contains a retired, test, probe, or agent-only path') + } + def locales = names.findAll { it ==~ /assets\/mineralogy\/lang\/[a-z_]+\.json/ } + if (locales.size() != 17) { + throw new GradleException("Release jar must contain 17 locales, found ${locales.size()}") + } + zip.entries().findAll { !it.directory && it.name.endsWith('.class') }.each { entry -> + byte[] header = new byte[8] + def stream = zip.getInputStream(entry) + try { + if (stream.read(header) != 8 || header[0..3] != [(byte) 0xca, (byte) 0xfe, (byte) 0xba, (byte) 0xbe]) { + throw new GradleException("Invalid class header in ${entry.name}") + } + int major = ((header[6] & 0xff) << 8) | (header[7] & 0xff) + if (major != 52) throw new GradleException("${entry.name} is class version ${major}, expected Java 8 (52)") + } + finally { + stream.close() + } + } + def provider = new JsonSlurper().parse(zip.getInputStream(zip.getEntry('data/mineralogy/orespawn/provider.json'))) + if (provider.schema_version != 4 || provider.provider_revision != 3 || + provider.rocks.size() != 32 || provider.ores.size() != 3 || provider.fluid_deposits.size() != 1) { + throw new GradleException('Packaged provider contract is invalid') + } + if (provider.rocks['mineralogy:rock/minecraft/basalt']?.block != 'minecraft:basalt' || + provider.rocks['mineralogy:rock/minecraft/tuff']?.block != 'mineralogy:tuff' || + provider.profile_defaults?.worldgen_aliases != [ + 'mineralogy:andesite': 'minecraft:andesite', + 'mineralogy:basalt': 'minecraft:basalt', + 'mineralogy:diorite': 'minecraft:diorite', + 'mineralogy:granite': 'minecraft:granite' + ]) { + throw new GradleException('Packaged provider does not use the Minecraft 1.16 native basalt contract') + } + String recipePrefix = 'data/mineralogy/recipes/' + String advancementPrefix = 'data/mineralogy/advancements/recipes/' + def recipes = names.findAll { it.startsWith(recipePrefix) && it.endsWith('.json') && + !it.substring(recipePrefix.length()).contains('/') } + def advancements = names.findAll { it.startsWith(advancementPrefix) && it.endsWith('.json') && + !it.substring(advancementPrefix.length()).contains('/') } + if (recipes.size() != 1415 || advancements.size() != 1415) { + throw new GradleException("Release jar must contain 1415 recipes and advancements, found ${recipes.size()} and ${advancements.size()}") + } + if (names.any { it.startsWith('data/minecraft/recipes/') || it.contains('/stonecutting/') }) { + throw new GradleException('Release jar contains retired vanilla overrides or stonecutting recipes') + } + def wallBlockstates = names.findAll { it ==~ /assets\/mineralogy\/blockstates\/.+_wall\.json/ } + def tallWallModels = names.findAll { it ==~ /assets\/mineralogy\/models\/block\/.+_wall_side_tall\.json/ } + if (wallBlockstates.size() != 108 || tallWallModels.size() != 108) { + throw new GradleException("Release jar must contain all 108 Forge 36 wall blockstates and tall-side models") + } + } + finally { + zip.close() + } + } +} + +tasks.register('writeReleaseChecksums') { + group = 'verification' + dependsOn tasks.named('verifyReleaseArtifacts') + doLast { + File output = file("${buildDir}/release/SHA256SUMS") + output.parentFile.mkdirs() + output.setText(expectedReleaseNames.collect().sort().collect { name -> + File artifact = file("${buildDir}/libs/${name}") + String hash = MessageDigest.getInstance('SHA-256').digest(artifact.bytes).encodeHex().toString() + "${hash} ${name}" + }.join('\n') + '\n', 'UTF-8') + } +} + +tasks.register('verifyPreparedReleaseArtifacts') { + group = 'verification' + description = 'Verifies the immutable artifact bundle supplied to Maven publication.' + inputs.files { + preparedReleaseDir == null ? [] : + (expectedReleaseNames + ['SHA256SUMS', 'CHANGELOG.txt']).collect { + new File(preparedReleaseDir.toString(), it) + } + } + doLast { + if (preparedReleaseDir == null) { + throw new GradleException('preparedReleaseDir is required for prepared artifact publication') + } + File prepared = file(preparedReleaseDir.toString()) + if (!prepared.isDirectory()) { + throw new GradleException("Prepared release directory does not exist: ${prepared}") + } + + def expectedBundleNames = (expectedReleaseNames + ['SHA256SUMS', 'CHANGELOG.txt']).sort() + def actualBundleNames = prepared.listFiles().findAll { it.isFile() }.collect { it.name }.sort() + if (actualBundleNames != expectedBundleNames) { + throw new GradleException("Expected prepared bundle ${expectedBundleNames}, found ${actualBundleNames}") + } + + File checksumFile = new File(prepared, 'SHA256SUMS') + def declaredChecksums = [:] + checksumFile.readLines('UTF-8').findAll { !it.trim().isEmpty() }.each { line -> + def match = line =~ /^([0-9a-fA-F]{64}) (.+)$/ + if (!match.matches()) { + throw new GradleException("Invalid prepared checksum line: ${line}") + } + declaredChecksums[match[0][2]] = match[0][1].toLowerCase() + } + if (declaredChecksums.keySet().sort() != expectedReleaseNames.sort()) { + throw new GradleException('Prepared checksums do not declare exactly the three release jars') + } + declaredChecksums.each { name, expectedHash -> + File artifact = new File(prepared, name) + String actualHash = MessageDigest.getInstance('SHA-256') + .digest(artifact.bytes).encodeHex().toString() + if (actualHash != expectedHash) { + throw new GradleException("Prepared checksum mismatch for ${name}") + } + } + } +} + +tasks.register('validateMavenReleaseCredentials') { + group = 'publishing' + description = 'Prevents Maven publication from silently targeting a local or incomplete repository.' + doLast { + if (!System.getenv('MAVEN_UPLOAD_URL') + || !System.getenv('MAVEN_UPLOAD_USERNAME') + || !System.getenv('MAVEN_UPLOAD_PASSWORD')) { + throw new GradleException('MAVEN_UPLOAD_URL, MAVEN_UPLOAD_USERNAME, and MAVEN_UPLOAD_PASSWORD are required') + } + if (System.getenv('MAVEN_UPLOAD_URL').startsWith('file:')) { + throw new GradleException('Maven release publication must use a remote repository') + } + } +} + +tasks.withType(PublishToMavenRepository).configureEach { + dependsOn tasks.named('validateMavenReleaseCredentials') + dependsOn tasks.named('verifyMavenCoordinates') + dependsOn(preparedReleaseDir == null + ? tasks.named('verifyReleaseArtifacts') + : tasks.named('verifyPreparedReleaseArtifacts')) +} + +tasks.register('syncForge36EclipseLaunches') { + group = 'ide' + dependsOn tasks.named('processResources') + doLast { + String mainClass = 'net.minecraftforge.userdev.LaunchTesting' + String mainOutput = new File(projectDir, 'bin/main').absolutePath + String modClasses = "mineralogy%%${mainOutput}${File.pathSeparator}" + + "mineralogy%%${mainOutput}" + String eclipseGradleJavaHome = System.getenv('JAVA_HOME') ?: System.getProperty('java.home') + def escapePreference = { String value -> + value.replace('\\', '\\\\').replace(':', '\\:') + } + File buildshipPreferences = file('.settings/org.eclipse.buildship.core.prefs') + if (!buildshipPreferences.parentFile.isDirectory() + && !buildshipPreferences.parentFile.mkdirs()) { + throw new GradleException("Could not create ${buildshipPreferences.parentFile}") + } + buildshipPreferences.setText([ + 'arguments=', + 'auto.sync=false', + 'build.scans.enabled=false', + 'connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)', + "connection.gradle.user.home=${escapePreference(gradle.gradleUserHomeDir.absolutePath)}", + 'connection.project.dir=', + 'eclipse.preferences.version=1', + "gradle.user.home=${escapePreference(gradle.gradleUserHomeDir.absolutePath)}", + "java.home=${escapePreference(eclipseGradleJavaHome)}", + 'jvm.arguments=', + 'offline.mode=false', + 'override.workspace.settings=true', + 'show.console.view=false', + 'show.executions.view=false', + '' + ].join('\r\n'), 'UTF-8') + // Forge 36 loads the mod solely from Eclipse's merged bin/main output. + // Copy the processed production resources as a normal doLast action so + // token-expanded metadata and externally edited JSON cannot lag behind + // the source tree without making bin/main a Gradle-owned task output. + File processedResources = sourceSets.main.output.resourcesDir + copy { + from processedResources + into mainOutput + } + ['Client', 'Server'].each { String runName -> + File launch = file("run${runName}.launch") + if (!launch.isFile()) throw new GradleException("Missing generated Eclipse launch ${launch}") + String text = launch.getText('UTF-8') + if (text.contains('')) { + String target = runName == 'Client' ? 'fmluserdevclient' : 'fmluserdevserver' + String entries = + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + text = text.replace( + '', + '\r\n' + + entries + '') + } + text = text.replace('', + "") + text = text.replaceFirst( + //, + java.util.regex.Matcher.quoteReplacement( + "")) + text = text.replaceFirst(//, + java.util.regex.Matcher.quoteReplacement("")) + if (!text.contains('key="target"')) { + String target = runName == 'Client' ? 'fmluserdevclient' : 'fmluserdevserver' + String entries = + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + text = text.replace(' )/ + if (programArguments.count != 1) { + throw new GradleException("ForgeGradle generated malformed program arguments in ${launch.name}") + } + String arguments = programArguments[0][2] + ['cache', 'metadata', 'to-srg', 'to-obf'].each { flag -> + String prefix = "--${flag} " + int valueStart = arguments.indexOf(prefix) + if (valueStart < 0) { + throw new GradleException("ForgeGradle omitted --${flag} from ${launch.name}") + } + valueStart += prefix.length() + int valueEnd = arguments.indexOf(' --', valueStart) + if (valueEnd < 0) { + throw new GradleException("ForgeGradle generated an unterminated --${flag} path in ${launch.name}") + } + String value = arguments.substring(valueStart, valueEnd) + if (!value.startsWith('"') || !value.endsWith('"')) { + arguments = "${arguments.substring(0, valueStart)}"${value}"${arguments.substring(valueEnd)}" + } + } + text = text.replace(programArguments[0][0], + programArguments[0][1] + arguments + programArguments[0][3]) + if (!text.contains('ATTR_EXCLUDE_TEST_CODE')) { + text = text.replace('', + ' \r\n' + + '') + } + launch.setText(text, 'UTF-8') + } + } +} + +tasks.register('verifyEclipseProductionClasspath') { + group = 'verification' + dependsOn tasks.named('syncForge36EclipseLaunches') + doLast { + File classpath = file('.classpath') + if (!classpath.isFile()) throw new GradleException('Eclipse .classpath was not generated') + File eclipseProject = file('.project') + if (!eclipseProject.isFile() + || !eclipseProject.getText('UTF-8').contains("${eclipseWorkspaceProjectName}")) { + throw new GradleException("Eclipse project is not named ${eclipseWorkspaceProjectName}") + } + File buildshipPreferences = file('.settings/org.eclipse.buildship.core.prefs') + String expectedJavaHome = (System.getenv('JAVA_HOME') ?: System.getProperty('java.home')) + .replace('\\', '\\\\').replace(':', '\\:') + if (!buildshipPreferences.isFile() + || !buildshipPreferences.getText('UTF-8').contains("java.home=${expectedJavaHome}") + || !buildshipPreferences.getText('UTF-8').contains('override.workspace.settings=true')) { + throw new GradleException('Eclipse Buildship is not bound to the Gradle-compatible Java runtime') + } + String cp = classpath.getText('UTF-8') + def classpathXml = new XmlSlurper(false, false).parse(classpath) + classpathXml.classpathentry.each { entry -> + String path = entry.@path.text() + boolean testSource = path.replace('\\', '/').startsWith('src/test/') + boolean testLibrary = path ==~ /(?i).*\/(junit|hamcrest|mockito|byte-buddy)[^\/]*\/.*\.jar/ + if (testSource) { + String scope = entry.attributes.attribute.find { it.@name.text() == 'gradle_scope' }?.@value?.text() + if (entry.@output.text() != 'bin/test' || scope != 'test') { + throw new GradleException("Eclipse test source is not isolated: ${path}") + } + } + if (testLibrary) { + String scope = entry.attributes.attribute.find { it.@name.text() == 'gradle_used_by_scope' }?.@value?.text() + if (scope != 'test') { + throw new GradleException("Eclipse production classpath exposes test dependency: ${path}") + } + } + } + ['runClient.launch', 'runServer.launch'].each { name -> + String launch = file(name).getText('UTF-8') + if (!launch.contains('ATTR_EXCLUDE_TEST_CODE') || launch =~ /(?i)(junit|mockito|src\/test)/) { + throw new GradleException("Eclipse launch is not production-only: ${name}") + } + if (!launch.contains("key=\"org.eclipse.jdt.launching.PROJECT_ATTR\" value=\"${eclipseWorkspaceProjectName}\"")) { + throw new GradleException("Eclipse launch targets the wrong workspace project: ${name}") + } + String mainOutput = new File(projectDir, 'bin/main').absolutePath + String expectedModClasses = "mineralogy%%${mainOutput}${File.pathSeparator}" + + "mineralogy%%${mainOutput}" + if (!launch.contains(expectedModClasses)) { + throw new GradleException("Eclipse launch is not using Forge 36's merged production output: ${name}") + } + ['cache', 'metadata', 'to-srg', 'to-obf'].each { flag -> + if (!launch.contains("--${flag} "")) { + throw new GradleException("Eclipse launch does not quote its --${flag} path: ${name}") + } + } + } + ['README.md', 'PLAYER_GUIDE.md', 'DEVELOPER_GUIDE.md', 'CONTENT_CONFIG.md', + 'PROVIDER.md', 'VERSIONS.md', 'examples/mineralogy-provider.json'].each { name -> + File guide = new File(projectDir, "bin/main/META-INF/mineralogy/docs/${name}") + if (!guide.isFile()) { + throw new GradleException("Eclipse output is missing bundled documentation: ${name}") + } + } + File processedProvider = new File(sourceSets.main.output.resourcesDir, + 'data/mineralogy/orespawn/provider.json') + File eclipseProvider = new File(projectDir, + 'bin/main/data/mineralogy/orespawn/provider.json') + if (!eclipseProvider.isFile() + || !java.util.Arrays.equals(eclipseProvider.getBytes(), processedProvider.getBytes())) { + throw new GradleException('Eclipse output contains stale processed production resources') + } + } +} + +tasks.matching { it.name == 'genEclipseRuns' }.configureEach { + finalizedBy tasks.named('syncForge36EclipseLaunches') +} + +tasks.register('isolateEclipseProductionRuns') { + group = 'ide' + dependsOn tasks.named('genEclipseRuns') + dependsOn tasks.named('syncForge36EclipseLaunches') +} + +tasks.matching { it.name == 'eclipse' }.configureEach { + finalizedBy tasks.named('syncForge36EclipseLaunches') +} + +tasks.named('check') { + dependsOn tasks.named('verifyReleaseDependencies') + dependsOn tasks.named('verifyMavenCoordinates') +} diff --git a/docs/CONTENT_CONFIG.md b/docs/CONTENT_CONFIG.md new file mode 100644 index 000000000..a6a6ec491 --- /dev/null +++ b/docs/CONTENT_CONFIG.md @@ -0,0 +1,102 @@ +# Mineralogy Content Configuration + +Mineralogy writes content options to `config/mineralogy-common.toml`. Changes require +a restart. OreSpawn owns terrain, rock, ore, and fluid-deposit placement; its +world settings are separate from these content and recipe switches. + +To add modded terrain blocks that Mineralogy rock may replace, do not add a +Mineralogy option. Configure OreSpawn's `terrain_dimensions` host list as +described under **Choosing Which Terrain Blocks Mineralogy Replaces** in the +[Player Guide](PLAYER_GUIDE.md). + +## General options + +| Key | Default | Purpose | +| --- | --- | --- | +| `patch_world` | `true` | Preserve compatibility placeholders for older Mineralogy worlds. | +| `SMELTABLE_GRAVEL` | `true` | Allow gravel to be smelted into generic stone. | +| `DROP_COBBLESTONE` | `false` | Make an ordinary raw rock drop one vanilla cobblestone instead of itself. | +| `COBBLESTONE_EQUIVILENT` | `true` | Treat raw rocks as cobblestone in compatible recipes. The misspelling is the real historical key. | +| `GROUP_TABS_BY_TYPE` | `false` | Split creative inventory entries into Rocks, Stairs, Slabs, Walls, and Items tabs. | + +`GROUP_TABS_BY_TYPE` changes only creative organization. It never changes +registration, recipes, drops, or world generation. With the default `false`, +Mineralogy retains its single searchable tab and existing vanilla-tab +placements such as mineral fertilizer under Materials. With `true`, reliefs, +furnaces, lamps, drywall, storage blocks, dusts, fertilizer, and the crude-oil +bucket use Mineralogy Items. + +## Compatibility-safe content switches + +These four keys default to `true`: + +| Key | What `false` does | +| --- | --- | +| `ENABLE_DRYWALLS` | Hides all 16 drywalls and omits their base and dye recipes. | +| `ENABLE_ROCK_SALT_LAMPS` | Hides both rock salt lights and omits their recipes. | +| `ENABLE_MINERAL_DUSTS` | Hides sulfur, phosphorous, and nitrate dusts plus their storage blocks; omits storage conversions and Mineralogy's gunpowder recipes. | +| `ENABLE_MINERAL_FERTILIZER` | Hides mineral fertilizer and omits its recipe. | + +These switches never unregister content. Existing blocks, inventory stacks, +drops, Forge tag entries, and integrations remain valid. The dust and +fertilizer switches are independent, so enabled fertilizer may use dusts from +existing ore, OreSpawn-generated ore, or another mod. + +Every Mineralogy gunpowder route requires three components: nitrate dust, +sulfur dust, and one of sugar, charcoal, `forge:dusts/carbon`, or +`forge:dusts/coal`. The two compatibility-tag recipes are loaded only when +another installed mod supplies the corresponding nonempty tag; an absent +optional dust never reduces the recipe to nitrate plus sulfur. + +A clean installation writes these keys. Mineralogy deliberately does not save +an existing `mineralogy-common.toml`, so missing keys retain their documented defaults. +To change them in an older file, add entries to its existing `options` block: + +```toml +[options] +COBBLESTONE_EQUIVILENT = false +ENABLE_DRYWALLS = false +ENABLE_MINERAL_DUSTS = false +ENABLE_MINERAL_FERTILIZER = false +ENABLE_ROCK_SALT_LAMPS = false +GROUP_TABS_BY_TYPE = true +``` + +## Rock recipe compatibility + +With `COBBLESTONE_EQUIVILENT=true`, all 27 raw Mineralogy rock families, +including rock salt, participate in Forge `cobblestone` tag recipes such +as levers, pistons, dispensers, droppers, and brewing stands. Setting it to +`false` removes only that broad identity. Rocks remain `stone`, retain their +material-specific tags, make stone tools and furnaces, and use exact +Mineralogy slab, stair, and wall recipes. Chert and pumice remain historical +unconditional cobblestone equivalents. + +## Disabling Mineralogy ores + +Mineralogy does not provide a second ore-generation switch. In OreSpawn's +world settings, open **Rocks & Ores...**, select **Ores**, and disable these +rules: + +- `mineralogy:ore/mineralogy/sulfur_ore` +- `mineralogy:ore/mineralogy/phosphorous_ore` +- `mineralogy:ore/mineralogy/nitrate_ore` + +Disabling a rule affects newly generated chunks; it does not remove existing +ore. If mineral dust recipes are disabled but these rules remain enabled, the +new ore retains its historical dust drops. + +## Historical generated-content flags + +The following historical keys default to `true`: `GENERATE_RELIEFS`, +`GENERATE_ROCKSTAIRS`, `GENERATE_ROCKSLAB`, `GENERATE_ROCKWALL`, +`GENERATE_ROCKFURNACE`, `GENERATE_BRICK`, `GENERATE_BRICKSTAIRS`, +`GENERATE_BRICKSLAB`, `GENERATE_BRICKWALL`, `GENERATE_BRICKFURNACE`, +`GENERATE_SMOOTH`, `GENERATE_SMOOTHSTAIRS`, `GENERATE_SMOOTHSLAB`, +`GENERATE_SMOOTHWALL`, `GENERATE_SMOOTHFURNACE`, `GENERATE_SMOOTHBRICK`, +`GENERATE_SMOOTHBRICKSTAIRS`, `GENERATE_SMOOTHBRICKSLAB`, +`GENERATE_SMOOTHBRICKWALL`, and `GENERATE_SMOOTHBRICKFURNACE`. + +Despite their names, these control construction-content registration and +recipes rather than chunk generation. Disabling them can make existing content +unavailable on the next start; back up a world before changing them. diff --git a/docs/DEVELOPER_GUIDE.md b/docs/DEVELOPER_GUIDE.md new file mode 100644 index 000000000..ef7ee719e --- /dev/null +++ b/docs/DEVELOPER_GUIDE.md @@ -0,0 +1,116 @@ +# Mineralogy Developer Guide + +## Responsibility Split + +| Mineralogy owns | OreSpawn owns | +| --- | --- | +| Blocks, items, fluids, and tile entities | Terrain replacement and formations | +| Models, textures, language, recipes, and drops | Geomes and biome influences | +| Forge tag identities and old-save compatibility | Ore and fluid-deposit placement | +| Mineralogy's provider declaration and migration | Profiles, UI, retrogen, and templates | + +Mineralogy requires OreSpawn `[4.0.6,5.0.0)`. Reusable worldgen integrations +belong in `zone.moddev.mc.orespawn.api` or an OreSpawn provider rather than +Mineralogy internals. + +## Packaged Provider + +The schema-4, revision-3 provider is at: + +```text +src/main/resources/data/mineralogy/orespawn/provider.json +``` + +It declares 32 rock rules, sulfur, phosphorous, and nitrate ores, and the +provider-owned `mineralogy:fluid_deposit/crude_oil` rule. OreSpawn owns optional +vanilla-ore management and must not be duplicated in Mineralogy. + +Keep provider-owned IDs stable. Existing worlds contain self-contained +profiles; provider updates must not overwrite established world choices. A pack +may supply an authoritative full override at +`config/mineralogy-orespawn.json`. + +## Forge Tag Integration + +All raw rocks use `forge:stone` and their material-specific Mineralogy tags. +When the historical `COBBLESTONE_EQUIVILENT` option is enabled, all 27 raw +families additionally use `cobblestone`; chert and pumice always retain that +identity. Gypsum, chalk, rock salt, and both rock salt lamps retain their +specialty aliases. + +Minecraft 1.16's `minecraft:stone_crafting_materials` and +`minecraft:stone_tool_materials` item tags include `#forge:cobblestone`, so +enabled Mineralogy rocks work in native tool and furnace-style recipes without +overriding Minecraft recipe files. Forge 36 exposes immutable tag snapshots; +Mineralogy rebuilds only the block and item tag collections after initial tag +loading and every data reload, preserves other mods' members, then invalidates +recipe ingredient caches. Do not replace this with startup-only mutation or +restore the retired `data/minecraft/recipes` overrides. + +Use broad `stone` or `cobblestone` inputs only when any matching material is +valid. Recipes returning a Mineralogy construction form must use the exact +material and finish so basalt cannot produce a different rock's slab or wall. + +## Crafting Data + +All Mineralogy recipes are native Minecraft/Forge 1.16.5 JSON under +`data/mineralogy/recipes/`. Run `scripts/generate-recipes.ps1` after changing +the recipe matrix; it generates the 27 stone families and global recipes, then +retains the target-native smelting data, and ensures every recipe has a matching +unlock advancement with the same Forge +conditions. Unlocks use direct inventory ingredients instead of listening to +other recipe unlocks, which would recursively reveal an entire construction +tree. Polishing uses Minecraft 1.16.5's advancement requirements matrix to +require the matching source plus accepted sand; manually crafting a recipe is +the target-native fallback for Forge's delayed crafting-output inventory +trigger. + +Reliefs preserve the historical two-stage contract. Nine exact matching +polished blocks produce 16 blank reliefs; the blank relief is then the input to +the marked relief recipes. Two matching left reliefs shapelessly produce two +right reliefs. Do not substitute unrelated tags for these exact items. +Do not reintroduce a parallel Java crafting registry. + +## Backward Compatibility + +Keep the `mineralogy` mod ID, every registry name, tile ID, NBT field, asset +path, recipe identity, patch alias, Forge tag identity, and provider rule +stable. Production Java packages use `zone.moddev.mc.mineralogy`; implementation +package names are not saved-world identities. + +The legacy `GENERATE_*` flags can remove registrations on the next start. The +new issue-121 switches only change creative visibility and Mineralogy-owned +recipes, so existing content remains loadable. + +Forge 36 converts pre-flattening chunks lazily. The legacy chunk-loader hook +must establish historical block and rock-furnace identities before Mojang's +data fixer, then normalize old tile-entity IDs after data fixing but before +Forge constructs them. Forge 36 parses a tile ID as a `ResourceLocation` before +registry lookup, so an uppercase legacy vanilla ID such as `Chest` can otherwise +abort the complete chunk future. The hook also preserves already populated +chunks from cross-boundary feature writes. Its packaged runtime uses SRG method +names, so transformer matching relies on stable owners and descriptors and +fails startup if an insertion point cannot be found. Validate both previously +unloaded occupied furnaces and new chunks at an old-world boundary in the +reobfuscated jar; a development launch alone cannot prove this path. + +## Building + +The build uses ForgeGradle 7.0.34 and the Gradle 9.6.1 wrapper on Java 17, +while an exact Java 8 toolchain compiles production and test bytecode: + +```powershell +$env:JAVA_HOME='path-to-a-Java-17-jdk' +$env:GRADLE_USER_HOME='D:\MinecraftMineralogy\.gradle-verify-cache' +.\gradlew.bat clean check build javadoc verifyReleaseConfiguration verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums --no-daemon +.\gradlew.bat genEclipseRuns eclipse isolateEclipseProductionRuns verifyEclipseProductionClasspath --no-daemon +.\gradlew.bat assemble --no-daemon +``` + +Inspect complete client/server logs and test the reobfuscated jar with released +OreSpawn in a launcher-like Forge installation. The normal jar packages this +guide under `META-INF/mineralogy/docs/`. + +The complete release version is `Major.Minor.Bug.Target`; see +[Mineralogy Versioning](VERSIONS.md). This branch validates target `116051` +for Minecraft 1.16.5 Forge and does not append CI build numbers. diff --git a/docs/PLAYER_GUIDE.md b/docs/PLAYER_GUIDE.md new file mode 100644 index 000000000..5543319f0 --- /dev/null +++ b/docs/PLAYER_GUIDE.md @@ -0,0 +1,195 @@ +# Mineralogy Player Guide + +## Installing + +Mineralogy 6 needs Minecraft 1.16.5, Forge 36.2.34, and OreSpawn +4.0.9.116051. +Install matching Mineralogy and OreSpawn jars on both clients and servers. Do +not open a world containing Mineralogy blocks without Mineralogy installed. + +## Creating Or Upgrading A World + +Open **OreSpawn World Generation** while creating a world. **Recommended +Defaults** selects Mineralogy's Sky/geome Stable Layers profile. Use **Help & +Guide** for OreSpawn's explanation of geology, formations, geomes, ores, and +fluid deposits. Worldgen changes affect newly explored chunks only. + +OreSpawn detects worlds created by Mineralogy 3 and keeps them on the +Cyano/`LEGACY` engine with their established family order and layer settings. +It does not silently convert old terrain to Stable Layers. Back up an important +world before changing its profile or upgrading mods. + +On the first 1.16.5 start, Mineralogy recognizes the old saved registry and +protects existing Overworld chunks while Minecraft converts them to flattened +block states. Rock furnaces are converted when their chunk is first loaded; +their inventory and cooking progress are retained. Old vanilla tile IDs are +also normalized so a legacy chest or furnace cannot prevent its whole chunk +from loading. Let the game or server stop normally after the upgrade so +converted chunks can be saved. A complete copied world test is strongly +recommended before upgrading the original. + +## What Mineralogy Adds + +- Sedimentary, metamorphic, intrusive igneous, and volcanic igneous rocks. +- Matching slabs, stairs, walls, bricks, polished blocks, reliefs, and + furnaces when their historical content flags are enabled. +- Sulfur, phosphorous, and nitrate ores and dusts. +- Drywall, mineral fertilizer, rock salt lamps, and street lamps. +- Distinct `mineralogy:crude_oil` and `mineralogy:flowing_crude_oil` fluids, + plus a block and bucket. OreSpawn decides + where covered Ocean deposits form. + +Raw Mineralogy rocks work in broad stone recipes. With +`COBBLESTONE_EQUIVILENT=true`, they also join Forge's block and item +`cobblestone` tags for recipes such as levers, pistons, dispensers, and brewing stands. +Exact Mineralogy rocks still make their matching Mineralogy slabs, stairs, and +walls. + +Because raw rocks are cobblestone equivalents, eight raw Mineralogy rocks +around an empty crafting-grid centre make a normal Minecraft furnace. A +Mineralogy rock furnace is an upgrade recipe: surround an existing Minecraft +furnace with eight matching Mineralogy slabs. Brick, polished, and +polished-brick furnaces use the corresponding slab finish. + +## Configuration And Servers + +`config/mineralogy-common.toml` controls Mineralogy content and recipe compatibility. +OreSpawn's UI and JSON profile control terrain and deposits. Settings require a +restart. + +### Choosing Where Each Rock Is Most Common + +While creating a world, open **OreSpawn World Generation**, choose **Rocks & +Ores...**, select the appropriate rock-family tab, and then select the rock. +Its **Rock Settings** screen provides four altitude controls: + +- **Preferred Y** (`depth_peak`) is the level where that rock has its strongest + depth preference. It is a preference, not a hard placement level. +- **Depth Spread** (`depth_spread`) controls how gradually that preference + falls away above and below Preferred Y. A larger value makes the rock common + across a broader vertical range. +- **Minimum Y** (`min_y`) and **Maximum Y** (`max_y`) are inclusive hard limits. + The rock cannot replace terrain outside them. + +Minecraft 1.16.5 accepts Y `0` through `255`; Depth Spread accepts `1` through +`512`. The saved fields are independent of the rock's geological family, +overall weight, and geome weights, which also affect where it is selected. + +For defaults inherited by newly created worlds, the same fields can be edited +in `config/orespawn-worldgen.json`. For an established world, stop the game or +server and edit its authoritative +`/serverconfig/orespawn-worldgen.json` instead. Restart after changing +the profile. Changes affect only chunks generated afterward; OreSpawn does not +retro-generate different rock strata into existing chunks. + +### Choosing Which Terrain Blocks Mineralogy Replaces + +Mineralogy does not maintain a separate replacement blocklist. OreSpawn owns +terrain replacement through each dimension's `host_blocks` and `host_tags`. +The packaged Mineralogy profile initially uses `minecraft:stone` in the +Overworld. + +The terrain-host list is not exposed by OreSpawn's 1.16.5 graphical editor. Stop +Minecraft or the server before editing the JSON. For defaults inherited by +worlds created afterward, edit: + +```text +config/orespawn-worldgen.json +``` + +For a world that already exists, edit its authoritative saved profile instead: + +```text +/serverconfig/orespawn-worldgen.json +``` + +Find `terrain_dimensions`, retain `minecraft:stone`, and add the registry ID of +each natural terrain block that Mineralogy rock may replace: + +```json +"terrain_dimensions": { + "minecraft:overworld": { + "enabled": true, + "biome_ids": [], + "biome_namespaces": [], + "host_blocks": [ + "minecraft:stone", + "examplemod:custom_stone" + ], + "host_tags": [] + } +} +``` + +Use `host_tags` when an OreSpawn/pack-provided group is more appropriate; on +Minecraft 1.16.5 these resolve through target-native block tags. Exact +`host_blocks` entries are the clearest choice for one +modded stone. + +Minecraft 1.16.5 matches a `host_blocks` entry by flattened block registry +identity. Add only +natural base-terrain blocks, not machines, containers, or construction blocks. +Restart after editing. The change affects only chunks generated afterward; +OreSpawn never retro-generates Mineralogy rock strata into existing chunks. + +### Enabling Mineralogy Geology In Another Dimension + +OreSpawn can apply Mineralogy rocks to a stone-based mod dimension without a +separate Mineralogy dimension option. Minecraft 1.16.5 uses the dimension +type's registered ID. For example, use `examplemod:moon` when that is the ID +documented by the installed dimension mod. + +The 1.16.5 graphical editor does not expose terrain-dimension or rock-membership +fields. Stop Minecraft or the server and edit the appropriate OreSpawn JSON: +`config/orespawn-worldgen.json` for defaults inherited by future worlds, or +`/serverconfig/orespawn-worldgen.json` for an established world. + +First, add an enabled entry inside `terrain_dimensions`. This example allows +Mineralogy to replace vanilla stone throughout a custom moon dimension: + +```json +"examplemod:moon": { + "enabled": true, + "biome_ids": [], + "biome_namespaces": [], + "host_blocks": ["minecraft:stone"], + "host_tags": [] +} +``` + +Use the dimension's actual base-stone registry ID instead when it does not use +vanilla stone. Optional `biome_ids` or `biome_namespaces` can limit replacement +within the dimension. + +Second, add the dimension to every desired entry under `rocks`: + +```json +"dimensions": ["minecraft:overworld", "examplemod:moon"] +``` + +Keep `minecraft:overworld` in the list when that rule should continue to work +there. A rock entry with no `dimensions` field is Overworld-only, and OreSpawn +disables a custom terrain dimension if none of the configured rocks include it. +Different dimensions can therefore use different rock sets by assigning +different membership lists. + +For advanced packs, the same output block may have separate rules with unique +rule IDs, different altitude fields, and non-overlapping `dimensions` lists. +This allows, for example, basalt to use different Preferred Y or hard height +bounds in the Overworld and a planet dimension. Do not make both rules eligible +in the same dimension, because duplicate output states are rejected while that +dimension is baked. + +Restart after editing and inspect the OreSpawn startup log to confirm that the +custom dimension baked with eligible rocks and resolved host blocks. Only new +chunks receive the geology; existing terrain is not retro-generated. + +Each world stores its complete worldgen profile at: + +```text +/serverconfig/orespawn-worldgen.json +``` + +Copy the complete world, including that file, to a dedicated server and +install the same required mods. For advanced setup, read +`config/mineralogy-guide/` and `config/orespawn-guide/` after one start. diff --git a/docs/PROVIDER.md b/docs/PROVIDER.md new file mode 100644 index 000000000..e1f1244b5 --- /dev/null +++ b/docs/PROVIDER.md @@ -0,0 +1,104 @@ +# Mineralogy OreSpawn Provider + +Mineralogy packages its OreSpawn declaration at: + +```text +data/mineralogy/orespawn/provider.json +``` + +The exact bytes from the installed build are exported as +`config/mineralogy-guide/examples/mineralogy-provider.json`. + +## Current Contents + +- Provider schema 4, mod ID `mineralogy`, and provider revision 3. +- 32 enabled rock rules across the four geological families. +- Sulfur, phosphorous, and nitrate ore rules. +- Minecraft 1.16.5 heights `0` through `255` and Overworld-only terrain defaults. +- Minecraft blocks for granite, diorite, andesite, and basalt; Mineralogy tuff + because Minecraft 1.16.5 does not supply vanilla tuff. Worldgen aliases map + the four matching historical Mineralogy rock IDs to their vanilla outputs, + while all historical Mineralogy blocks remain registered for old worlds. +- Sky/geome Stable Layers defaults for fresh worlds plus Cyano defaults used + when OreSpawn migrates an established Mineralogy 3 world. +- The covered `mineralogy:fluid_deposit/crude_oil` rule at Y `0` through `48`, + frequency `0.08`, Ocean biomes, and sedimentary hosts. + +Mineralogy contains no separate terrain or ore generator. OreSpawn compiles +and runs this declaration. + +## Pack Override + +To replace the bundled declaration for a pack, provide one complete file at: + +```text +config/mineralogy-orespawn.json +``` + +The external file is authoritative when present. Validate it against +OreSpawn's provider schema before shipping; OreSpawn rejects a malformed +override instead of silently mixing it with packaged defaults. Mineralogy's +legacy ore migration never overwrites an existing override or established +`config/orespawn-worldgen.json`. + +Existing worlds use their own profile at +`/serverconfig/orespawn-worldgen.json`. Provider updates do not replace +established world choices. See `config/orespawn-guide/` for the complete schema, +field, template, dimension, API, and performance references. + +## Rock Altitude Defaults + +Each entry in `rocks` may set a soft altitude preference with `depth_peak` and +`depth_spread`, then constrain it with the inclusive hard bounds `min_y` and +`max_y`. A larger spread keeps more of the rock's weight farther above and +below its peak. These fields combine with the rule's overall `weight`, family, +and per-geome weights; they do not guarantee that one rock occupies every block +at its preferred level. + +Pack authors can establish different defaults in a complete +`config/mineralogy-orespawn.json` provider override. Players can use +OreSpawn's **Rocks & Ores...** editor while creating a world. Once a world has +been created, its saved `orespawn-worldgen.json` profile is authoritative and +provider changes do not rewrite it. + +## Dimension Membership + +Issue #30's dimension configuration is supplied by OreSpawn. Add the target to +`terrain_dimensions` with its eligible `host_blocks` or `host_tags`, then add +that same dimension ID to each desired rock rule's `dimensions` array. A rock +without `dimensions` is Overworld-only. A configured custom dimension is +disabled during baking when no valid rock rules include it. + +Minecraft 1.16.5 uses the registered dimension-type ID, such as +`examplemod:moon`; consult the dimension mod's documentation for its exact ID. +Rock membership makes different stone sets possible per dimension. To use +different altitude settings for the same output block, define unique rock rule +IDs with different `depth_peak`, `depth_spread`, `min_y`, or `max_y` values and +non-overlapping dimension lists. Duplicate output states within one dimension +are rejected. + +The 1.16.5 editor does not expose terrain-dimension or rock-membership fields, so +players edit the stopped world's saved profile and pack authors may provide +global defaults or a complete provider override. Changes affect newly generated +chunks only. + +## Terrain Replacement Hosts + +Issue #57's replacement blocklist is provided by OreSpawn rather than +`mineralogy-common.toml`. The packaged profile enables +`terrain_dimensions.minecraft:overworld` with `minecraft:stone` in +`host_blocks`. Pack authors may add installed natural-terrain registry IDs or +appropriate host tags to that dimension. + +Use `config/orespawn-worldgen.json` for installed-pack defaults applied to new +worlds. Once a world exists, its +`/serverconfig/orespawn-worldgen.json` snapshot is authoritative and +must be edited directly while the game or server is stopped. A complete +`config/mineralogy-orespawn.json` override is appropriate only when a pack +intends to replace the whole packaged Mineralogy provider; it is unnecessary +for an ordinary per-world host-list change and does not rewrite established +world profiles. + +On Minecraft 1.16.5, terrain hosts are baked as flattened block identities. +Changes affect only newly generated chunks because Mineralogy strata are never +retro-generated. diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 000000000..ab31a333b --- /dev/null +++ b/docs/README.md @@ -0,0 +1,23 @@ +# Mineralogy Guide + +Mineralogy 6 for Minecraft 1.16.5 supplies rock, mineral, construction, and +crude-oil content to OreSpawn 4. OreSpawn is the only terrain and deposit +engine. + +- [Player Guide](PLAYER_GUIDE.md): installation, world creation, content, and + server copying. +- [Content Configuration](CONTENT_CONFIG.md): every Mineralogy content and + compatibility option. +- [Developer Guide](DEVELOPER_GUIDE.md): ownership boundaries, Forge tag + integration, builds, and compatibility rules. +- [Provider Reference](PROVIDER.md): Mineralogy's packaged OreSpawn declaration + and pack override. +- [Versioning](VERSIONS.md): how functional releases and exact Minecraft/loader + targets form Mineralogy's four-component version. + +The exact provider shipped by this build is also exported as +`examples/mineralogy-provider.json`. + +For general worldgen controls, schemas, templates, dimensions, ore patterns, +performance constraints, or the Java API, use the OreSpawn guide exported to +`config/orespawn-guide/`. diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md new file mode 100644 index 000000000..091fd52ab --- /dev/null +++ b/docs/VERSIONS.md @@ -0,0 +1,176 @@ +# Mineralogy Versioning + +Mineralogy releases use a four-component version so the feature set and the +exact Minecraft/loader target are both visible in one number. + +## Version format + +```text +Major.Minor.Bug.Target +``` + +The first three components are the **functional version**. Mineralogy `6.0.1` +means major generation 6, minor release 0, and bug revision 1. + +The fourth component identifies the target build. The complete version for +this Minecraft 1.16.5 Forge release is therefore: + +```text +6.0.1.116051 +``` + +This expanded numeric form is compatible with Maven version ordering, but it +is not strict Semantic Versioning 2.0 because SemVer defines three numeric core +components. + +The release tag is exactly the complete four-component version, with no +redundant Minecraft-version prefix. For this branch the tag is therefore +`6.0.1.116051`, not `1.16.5-6.0.1.116051`. The Target already makes tags unique +across Minecraft versions and loaders. + +## Reading the target component + +The target is deterministic; it is not a CI run number or another feature +revision. + +To calculate it: + +1. Write the Minecraft version as `major.minor.patch`, using zero when the + patch component is omitted. +2. Concatenate the Minecraft major number without padding, the minor number as + two digits, the patch number as two digits, and the one-digit loader code. +3. Use loader code `1` for Forge and `2` for NeoForge. + +It can be decoded from right to left: one loader digit, two patch digits, two +minor digits, and all remaining digits for the Minecraft major version. + +| Minecraft | Loader | Target | Example complete version | +| --- | --- | ---: | --- | +| 1.10.2 | Forge | `110021` | `6.0.1.110021` | +| 1.12.2 | Forge | `112021` | `6.0.1.112021` | +| 1.14.4 | Forge | `114041` | `6.0.1.114041` | +| 1.15.2 | Forge | `115021` | `6.0.1.115021` | +| 1.16.5 | Forge | `116051` | `6.0.1.116051` | +| 1.18.2 | Forge | `118021` | `6.0.0.118021` | +| 1.20.6 | Forge | `120061` | `6.0.0.120061` | +| 1.21.11 | Forge | `121111` | `6.0.0.121111` | +| 26.2 | Forge | `2602001` | `6.0.0.2602001` | +| 26.2 | NeoForge | `2602002` | `6.0.0.2602002` | + +The 1.16.5 row records this branch's current release. The other rows illustrate +target encoding only; they do not claim that the 6.0.1 changes have already +been forward-ported. + +Historical Mineralogy releases may also have four numeric components that used +the last number as an ordinary build sequence. The target policy applies to +new releases and does not reinterpret an old file's version. + +## Major version + +The **Major** number changes for a fundamental or breaking new generation of +Mineralogy. + +Mineralogy 6 is the clearest example: Mineralogy now provides rocks, ores, +fluids, recipes, and an OreSpawn provider, while OreSpawn exclusively owns +terrain, strata, ore placement, deposits, profiles, and their user interface. +That is a larger architectural change than an ordinary feature or fix. + +Compatibility adaptations needed for another Minecraft or loader version do +not by themselves require a major increase when players and integrations +receive the same supported behaviour. + +## Minor version + +The **Minor** number changes for a substantial feature or behavioural change +that does not justify a new major generation. Examples include a significant +new family of player-usable content or a major overhaul of an existing system. + +When Major changes, Minor and Bug reset to zero. When Minor changes, Bug resets +to zero. The target for the actual build is then appended: + +```text +6.0.1.116051 -> 6.1.0.116051 +6.1.4.116051 -> 7.0.0.116051 +``` + +## Bug version + +The **Bug** number changes for a bug fix or very small feature. Examples +include fixing saved inventory loading, correcting a recipe or translation, +or making a small configuration or documentation improvement that warrants a +release. + +Other projects often call this the patch number. MMD uses **Bug** to describe +its purpose and **Target** for the Minecraft/loader qualifier. + +## Ports to other Minecraft versions + +A functionally equivalent port keeps the same `Major.Minor.Bug` version and +changes only its Target. For example, equivalent Mineralogy 6 releases could +be: + +```text +Minecraft 1.10.2 / Forge / Mineralogy 6.0.0.110021 +Minecraft 1.12.2 / Forge / Mineralogy 6.0.1.112021 +Minecraft 1.14.4 / Forge / Mineralogy 6.0.1.114041 +Minecraft 1.15.2 / Forge / Mineralogy 6.0.1.115021 +Minecraft 1.16.5 / Forge / Mineralogy 6.0.1.116051 +Minecraft 1.18.2 / Forge / Mineralogy 6.0.0.118021 +``` + +Minecraft and loader APIs may require different internal code without changing +the functional version. If a port also adds a player-visible feature or fix, +the Major, Minor, or Bug component must be assessed separately; the Target +still identifies the build's actual platform. + +## Branch-specific fixes and skipped numbers + +Functional versions are allocated across Mineralogy as a whole. One functional +number must not describe unrelated changes on different Minecraft branches. +The same number may be shared by branches only when the releases are intended +to provide the same functional change. + +If a fix applies only to one old branch, that branch may receive the next Bug +number while other branches remain unchanged. A later, unrelated fix on +another branch uses the next unused number even if that branch never needed +the earlier fix. Skipped Bug numbers are therefore valid. + +This means a higher version on another Minecraft branch does not necessarily +contain every lower-numbered platform-specific fix. Release notes remain the +authoritative description of included changes. + +## Dependencies and modpacks + +Dependency ranges normally describe compatible functional releases. For +example, `[6.0.0,7.0.0)` accepts target-qualified Mineralogy 6 releases while +excluding Mineralogy 7. Minecraft and loader metadata still decide whether a +particular jar can load on the current game. + +Mineralogy 6 also requires OreSpawn `[4.0.6,5.0.0)`. OreSpawn uses the same +target calculation, so the matching Minecraft 1.16.5 Forge release is +`4.0.9.116051`. The dependency range deliberately describes the supported +functional OreSpawn generation; Forge still prevents jars for another +Minecraft target from loading together. + +Pack maintainers should record the complete four-component versions in pack +manifests and support reports. Saying only “Mineralogy 6†identifies the +feature generation, not the exact jar. + +## Builds and release notes + +The Gradle build reads the complete version from `mod_version`, verifies that +it has four numeric components, and checks that its Target matches the declared +Minecraft version and Forge loader. CI build numbers are not appended. For this +branch, published metadata and artifacts therefore use `6.0.1.116051`. + +Every release note should state: + +- the Minecraft version and loader; +- the complete four-component version; +- the functional `Major.Minor.Bug` version; +- the features and fixes actually included; +- relevant migration, configuration, and compatibility information. + +The goal is a version that is useful to players, pack authors, mod developers, +release tooling, and support teams without pretending that all maintained +Minecraft branches contain identical implementation details. diff --git a/gradle.properties b/gradle.properties index 59076c5bd..26bebe54b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,30 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false +org.gradle.configuration-cache=false +org.gradle.caching=true +org.gradle.parallel=false +net.minecraftforge.gradle.merge-source-sets=false -mod_version=5.3.0 -mc_version=1.17.1 -forge_version=37.1.1 +mod_version=6.0.1.116051 +mod_group=zone.moddev.mc.mineralogy + +# Release metadata consumed by the generic dispatcher. +minecraft_version=1.16.5 +loader_name=forge +loader_code=1 +java_version=8 +java_toolchain_version=8.0.502+7 +gradle_java_version=17 +curseforge_project_id=240974 + +mc_version=1.16.5 +forge_version=36.2.34 +mcp_mappings_channel=snapshot +mcp_mappings_version=20210309-1.16.5 +mcp_version=20210115.111550 + +orespawn_version=4.0.9.116051 +orespawn_curse_project_id=245586 +orespawn_curse_file_id=8742102 +orespawn_sha256=6F5E61E89547BBF779C18EDFCF4D1D47BED8D6FA0FE9EDECE87B376F117D1147 diff --git a/gradle/stage-orespawn-release.sh b/gradle/stage-orespawn-release.sh new file mode 100644 index 000000000..c17c4a37e --- /dev/null +++ b/gradle/stage-orespawn-release.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +set -euo pipefail + +repository="${1:?Usage: stage-orespawn-release.sh }" +value() { sed -n "s/^$1=//p" gradle.properties; } + +project_id="$(value orespawn_curse_project_id)" +file_id="$(value orespawn_curse_file_id)" +expected_sha="$(value orespawn_sha256)" +for required in project_id file_id expected_sha; do + if [[ -z "${!required}" ]]; then + echo "Missing OreSpawn release metadata: $required" >&2 + exit 1 + fi +done + +artifact_dir="$repository/curse/maven/mmd-orespawn-$project_id/$file_id" +artifact="$artifact_dir/mmd-orespawn-$project_id-$file_id.jar" +pom="$artifact_dir/mmd-orespawn-$project_id-$file_id.pom" +mkdir -p "$artifact_dir" +curl --fail --location --silent --show-error \ + --retry 5 --retry-all-errors --retry-delay 5 \ + "https://www.curseforge.com/api/v1/mods/$project_id/files/$file_id/download" \ + --output "$artifact" + +actual_sha="$(sha256sum "$artifact" | awk '{print toupper($1)}')" +if [[ "$actual_sha" != "${expected_sha^^}" ]]; then + echo "OreSpawn file $file_id has SHA-256 $actual_sha, expected ${expected_sha^^}" >&2 + exit 1 +fi +printf '%s\n' \ + '' \ + '' \ + ' 4.0.0' \ + " curse.maven" \ + " mmd-orespawn-$project_id" \ + " $file_id" \ + '' > "$pom" +echo "Staged exact OreSpawn file $file_id in $repository" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0d4a9516871afd710a9d84d89e31ba77745607bd 100644 GIT binary patch literal 54413 zcmafaV|Zr4wq`oEZQHiZj%|LijZQlLf{tz5M#r{o+fI6V=G-$g=gzrzeyqLskF}nv zRZs0&c;EUi2L_G~0s;*U0szbL-0C3_3~ zRZ#mYf6f1oqJoH`jHHCB8l!^by~4z}yc`4LEP@;Z?bO6{g9`Hk+s@(L1jC5Tq{1Yf z4E;CQvrx0-gF+peRxFC*gF=&$zNYjO?K|gN=WqXMz`tYs@0o%B{dRD+{C_6(f9t^g zhmNJQv6-#;f2)f2uc{u-#*U8W&i{|ewYN^n_1~cv|1J!}zc&$eaBy{T{cEpa46s*q zHFkD2cV;xTHFj}{*3kBt*FgS4A5SI|$F%$gB@It9FlC}D3y`sbZG{2P6gGwC$U`6O zb_cId9AhQl#A<&=x>-xDD%=Ppt$;y71@Lwsl{x943#T@8*?cbR<~d`@@}4V${+r$jICUIOzgZJy_9I zu*eA(F)$~J07zX%tmQN}1^wj+RM|9bbwhQA=xrPE*{vB_P!pPYT5{Or^m*;Qz#@Bl zRywCG_RDyM6bf~=xn}FtiFAw|rrUxa1+z^H`j6e|GwKDuq}P)z&@J>MEhsVBvnF|O zOEm)dADU1wi8~mX(j_8`DwMT_OUAnjbWYer;P*^Uku_qMu3}qJU zTAkza-K9aj&wcsGuhQ>RQoD?gz~L8RwCHOZDzhBD$az*$TQ3!uygnx_rsXG`#_x5t zn*lb(%JI3%G^MpYp-Y(KI4@_!&kBRa3q z|Fzn&3R%ZsoMNEn4pN3-BSw2S_{IB8RzRv(eQ1X zyBQZHJ<(~PfUZ~EoI!Aj`9k<+Cy z2DtI<+9sXQu!6&-Sk4SW3oz}?Q~mFvy(urUy<)x!KQ>#7yIPC)(ORhKl7k)4eSy~} z7#H3KG<|lt68$tk^`=yjev%^usOfpQ#+Tqyx|b#dVA(>fPlGuS@9ydo z!Cs#hse9nUETfGX-7lg;F>9)+ml@M8OO^q|W~NiysX2N|2dH>qj%NM`=*d3GvES_# zyLEHw&1Fx<-dYxCQbk_wk^CI?W44%Q9!!9aJKZW-bGVhK?N;q`+Cgc*WqyXcxZ%U5QXKu!Xn)u_dxeQ z;uw9Vysk!3OFzUmVoe)qt3ifPin0h25TU zrG*03L~0|aaBg7^YPEW^Yq3>mSNQgk-o^CEH?wXZ^QiPiuH}jGk;75PUMNquJjm$3 zLcXN*uDRf$Jukqg3;046b;3s8zkxa_6yAlG{+7{81O3w96i_A$KcJhD&+oz1<>?lun#C3+X0q zO4JxN{qZ!e#FCl@e_3G?0I^$CX6e$cy7$BL#4<`AA)Lw+k`^15pmb-447~5lkSMZ` z>Ce|adKhb-F%yy!vx>yQbXFgHyl(an=x^zi(!-~|k;G1=E(e@JgqbAF{;nv`3i)oi zDeT*Q+Mp{+NkURoabYb9@#Bi5FMQnBFEU?H{~9c;g3K%m{+^hNe}(MdpPb?j9`?2l z#%AO!|2QxGq7-2Jn2|%atvGb(+?j&lmP509i5y87`9*BSY++<%%DXb)kaqG0(4Eft zj|2!Od~2TfVTi^0dazAIeVe&b#{J4DjN6;4W;M{yWj7#+oLhJyqeRaO;>?%mX>Ec{Mp~;`bo}p;`)@5dA8fNQ38FyMf;wUPOdZS{U*8SN6xa z-kq3>*Zos!2`FMA7qjhw-`^3ci%c91Lh`;h{qX1r;x1}eW2hYaE*3lTk4GwenoxQ1kHt1Lw!*N8Z%DdZSGg5~Bw}+L!1#d$u+S=Bzo7gi zqGsBV29i)Jw(vix>De)H&PC; z-t2OX_ak#~eSJ?Xq=q9A#0oaP*dO7*MqV;dJv|aUG00UX=cIhdaet|YEIhv6AUuyM zH1h7fK9-AV)k8sr#POIhl+?Z^r?wI^GE)ZI=H!WR<|UI(3_YUaD#TYV$Fxd015^mT zpy&#-IK>ahfBlJm-J(n(A%cKV;)8&Y{P!E|AHPtRHk=XqvYUX?+9po4B$0-6t74UUef${01V{QLEE8gzw* z5nFnvJ|T4dlRiW9;Ed_yB{R@)fC=zo4hCtD?TPW*WJmMXYxN_&@YQYg zBQ$XRHa&EE;YJrS{bn7q?}Y&DH*h;){5MmE(9A6aSU|W?{3Ox%5fHLFScv7O-txuRbPG1KQtI`Oay=IcEG=+hPhlnYC;`wSHeo|XGio0aTS6&W($E$ z?N&?TK*l8;Y^-xPl-WVZwrfdiQv10KdsAb9u-*1co*0-Z(h#H)k{Vc5CT!708cs%sExvPC+7-^UY~jTfFq=cj z!Dmy<+NtKp&}}$}rD{l?%MwHdpE(cPCd;-QFPk1`E5EVNY2i6E`;^aBlx4}h*l42z zpY#2cYzC1l6EDrOY*ccb%kP;k8LHE3tP>l3iK?XZ%FI<3666yPw1rM%>eCgnv^JS_ zK7c~;g7yXt9fz@(49}Dj7VO%+P!eEm& z;z8UXs%NsQ%@2S5nve)@;yT^61BpVlc}=+i6{ZZ9r7<({yUYqe==9*Z+HguP3`sA& z{`inI4G)eLieUQ*pH9M@)u7yVnWTQva;|xq&-B<>MoP(|xP(HqeCk1&h>DHNLT>Zi zQ$uH%s6GoPAi0~)sC;`;ngsk+StYL9NFzhFEoT&Hzfma1f|tEnL0 zMWdX4(@Y*?*tM2@H<#^_l}BC&;PYJl%~E#veQ61{wG6!~nyop<^e)scV5#VkGjYc2 z$u)AW-NmMm%T7WschOnQ!Hbbw&?`oMZrJ&%dVlN3VNra1d0TKfbOz{dHfrCmJ2Jj= zS#Gr}JQcVD?S9X!u|oQ7LZ+qcq{$40 ziG5=X^+WqeqxU00YuftU7o;db=K+Tq!y^daCZgQ)O=M} zK>j*<3oxs=Rcr&W2h%w?0Cn3);~vqG>JO_tTOzuom^g&^vzlEjkx>Sv!@NNX%_C!v zaMpB>%yVb}&ND9b*O>?HxQ$5-%@xMGe4XKjWh7X>CYoRI2^JIwi&3Q5UM)?G^k8;8 zmY$u;(KjZx>vb3fe2zgD7V;T2_|1KZQW$Yq%y5Ioxmna9#xktcgVitv7Sb3SlLd6D zfmBM9Vs4rt1s0M}c_&%iP5O{Dnyp|g1(cLYz^qLqTfN6`+o}59Zlu%~oR3Q3?{Bnr zkx+wTpeag^G12fb_%SghFcl|p2~<)Av?Agumf@v7y-)ecVs`US=q~=QG%(_RTsqQi z%B&JdbOBOmoywgDW|DKR5>l$1^FPhxsBrja<&}*pfvE|5dQ7j-wV|ur%QUCRCzBR3q*X`05O3U@?#$<>@e+Zh&Z&`KfuM!0XL& zI$gc@ZpM4o>d&5)mg7+-Mmp98K^b*28(|Ew8kW}XEV7k^vnX-$onm9OtaO@NU9a|as7iA%5Wrw9*%UtJYacltplA5}gx^YQM` zVkn`TIw~avq)mIQO0F0xg)w$c)=8~6Jl|gdqnO6<5XD)&e7z7ypd3HOIR+ss0ikSVrWar?548HFQ*+hC)NPCq*;cG#B$7 z!n?{e9`&Nh-y}v=nK&PR>PFdut*q&i81Id`Z<0vXUPEbbJ|<~_D!)DJMqSF~ly$tN zygoa)um~xdYT<7%%m!K8+V(&%83{758b0}`b&=`))Tuv_)OL6pf=XOdFk&Mfx9y{! z6nL>V?t=#eFfM$GgGT8DgbGRCF@0ZcWaNs_#yl+6&sK~(JFwJmN-aHX{#Xkpmg;!} zgNyYYrtZdLzW1tN#QZAh!z5>h|At3m+ryJ-DFl%V>w?cmVTxt^DsCi1ZwPaCe*D{) z?#AZV6Debz{*D#C2>44Czy^yT3y92AYDcIXtZrK{L-XacVl$4i=X2|K=Fy5vAzhk{ zu3qG=qSb_YYh^HirWf~n!_Hn;TwV8FU9H8+=BO)XVFV`nt)b>5yACVr!b98QlLOBDY=^KS<*m9@_h3;64VhBQzb_QI)gbM zSDto2i*iFrvxSmAIrePB3i`Ib>LdM8wXq8(R{-)P6DjUi{2;?}9S7l7bND4w%L2!; zUh~sJ(?Yp}o!q6)2CwG*mgUUWlZ;xJZo`U`tiqa)H4j>QVC_dE7ha0)nP5mWGB268 zn~MVG<#fP#R%F=Ic@(&Va4dMk$ysM$^Avr1&hS!p=-7F>UMzd(M^N9Ijb|364}qcj zcIIh7suk$fQE3?Z^W4XKIPh~|+3(@{8*dSo&+Kr(J4^VtC{z*_{2}ld<`+mDE2)S| zQ}G#Q0@ffZCw!%ZGc@kNoMIdQ?1db%N1O0{IPPesUHI;(h8I}ETudk5ESK#boZgln z(0kvE`&6z1xH!s&={%wQe;{^&5e@N0s7IqR?L*x%iXM_czI5R1aU?!bA7)#c4UN2u zc_LZU+@elD5iZ=4*X&8%7~mA;SA$SJ-8q^tL6y)d150iM)!-ry@TI<=cnS#$kJAS# zq%eK**T*Wi2OlJ#w+d_}4=VN^A%1O+{?`BK00wkm)g8;u?vM;RR+F1G?}({ENT3i= zQsjJkp-dmJ&3-jMNo)wrz0!g*1z!V7D(StmL(A}gr^H-CZ~G9u?*Uhcx|x7rb`v^X z9~QGx;wdF4VcxCmEBp$F#sms@MR?CF67)rlpMxvwhEZLgp2?wQq|ci#rLtrYRV~iR zN?UrkDDTu114&d~Utjcyh#tXE_1x%!dY?G>qb81pWWH)Ku@Kxbnq0=zL#x@sCB(gs zm}COI(!{6-XO5li0>1n}Wz?w7AT-Sp+=NQ1aV@fM$`PGZjs*L+H^EW&s!XafStI!S zzgdntht=*p#R*o8-ZiSb5zf6z?TZr$^BtmIfGAGK;cdg=EyEG)fc*E<*T=#a?l=R5 zv#J;6C(umoSfc)W*EODW4z6czg3tXIm?x8{+8i^b;$|w~k)KLhJQnNW7kWXcR^sol z1GYOp?)a+}9Dg*nJ4fy*_riThdkbHO37^csfZRGN;CvQOtRacu6uoh^gg%_oEZKDd z?X_k67s$`|Q&huidfEonytrq!wOg07H&z@`&BU6D114p!rtT2|iukF}>k?71-3Hk< zs6yvmsMRO%KBQ44X4_FEYW~$yx@Y9tKrQ|rC1%W$6w}-9!2%4Zk%NycTzCB=nb)r6*92_Dg+c0;a%l1 zsJ$X)iyYR2iSh|%pIzYV1OUWER&np{w1+RXb~ zMUMRymjAw*{M)UtbT)T!kq5ZAn%n=gq3ssk3mYViE^$paZ;c^7{vXDJ`)q<}QKd2?{r9`X3mpZ{AW^UaRe2^wWxIZ$tuyKzp#!X-hXkHwfD zj@2tA--vFi3o_6B?|I%uwD~emwn0a z+?2Lc1xs(`H{Xu>IHXpz=@-84uw%dNV;{|c&ub|nFz(=W-t4|MME(dE4tZQi?0CE|4_?O_dyZj1)r zBcqB8I^Lt*#)ABdw#yq{OtNgf240Jvjm8^zdSf40 z;H)cp*rj>WhGSy|RC5A@mwnmQ`y4{O*SJ&S@UFbvLWyPdh)QnM=(+m3p;0&$^ysbZ zJt!ZkNQ%3hOY*sF2_~-*`aP|3Jq7_<18PX*MEUH*)t{eIx%#ibC|d&^L5FwoBN}Oe z?!)9RS@Zz%X1mqpHgym75{_BM4g)k1!L{$r4(2kL<#Oh$Ei7koqoccI3(MN1+6cDJ zp=xQhmilz1?+ZjkX%kfn4{_6K_D{wb~rdbkh!!k!Z@cE z^&jz55*QtsuNSlGPrU=R?}{*_8?4L7(+?>?(^3Ss)f!ou&{6<9QgH>#2$?-HfmDPN z6oIJ$lRbDZb)h-fFEm^1-v?Slb8udG{7GhbaGD_JJ8a9f{6{TqQN;m@$&)t81k77A z?{{)61za|e2GEq2)-OqcEjP`fhIlUs_Es-dfgX-3{S08g`w=wGj2{?`k^GD8d$}6Z zBT0T1lNw~fuwjO5BurKM593NGYGWAK%UCYiq{$p^GoYz^Uq0$YQ$j5CBXyog8(p_E znTC+$D`*^PFNc3Ih3b!2Lu|OOH6@46D)bbvaZHy%-9=$cz}V^|VPBpmPB6Ivzlu&c zPq6s7(2c4=1M;xlr}bkSmo9P`DAF>?Y*K%VPsY`cVZ{mN&0I=jagJ?GA!I;R)i&@{ z0Gl^%TLf_N`)`WKs?zlWolWvEM_?{vVyo(!taG$`FH2bqB`(o50pA=W34kl-qI62lt z1~4LG_j%sR2tBFteI{&mOTRVU7AH>>-4ZCD_p6;-J<=qrod`YFBwJz(Siu(`S}&}1 z6&OVJS@(O!=HKr-Xyzuhi;swJYK*ums~y1ePdX#~*04=b9)UqHHg;*XJOxnS6XK#j zG|O$>^2eW2ZVczP8#$C`EpcWwPFX4^}$omn{;P(fL z>J~%-r5}*D3$Kii z34r@JmMW2XEa~UV{bYP=F;Y5=9miJ+Jw6tjkR+cUD5+5TuKI`mSnEaYE2=usXNBs9 zac}V13%|q&Yg6**?H9D620qj62dM+&&1&a{NjF}JqmIP1I1RGppZ|oIfR}l1>itC% zl>ed${{_}8^}m2^br*AIX$L!Vc?Sm@H^=|LnpJg`a7EC+B;)j#9#tx-o0_e4!F5-4 zF4gA;#>*qrpow9W%tBzQ89U6hZ9g=-$gQpCh6Nv_I0X7t=th2ajJ8dBbh{i)Ok4{I z`Gacpl?N$LjC$tp&}7Sm(?A;;Nb0>rAWPN~@3sZ~0_j5bR+dz;Qs|R|k%LdreS3Nn zp*36^t#&ASm=jT)PIjNqaSe4mTjAzlAFr*@nQ~F+Xdh$VjHWZMKaI+s#FF#zjx)BJ zufxkW_JQcPcHa9PviuAu$lhwPR{R{7CzMUi49=MaOA%ElpK;A)6Sgsl7lw)D$8FwE zi(O6g;m*86kcJQ{KIT-Rv&cbv_SY4 zpm1|lSL*o_1LGOlBK0KuU2?vWcEcQ6f4;&K=&?|f`~X+s8H)se?|~2HcJo{M?Ity) zE9U!EKGz2^NgB6Ud;?GcV*1xC^1RYIp&0fr;DrqWLi_Kts()-#&3|wz{wFQsKfnnsC||T?oIgUp z{O(?Df7&vW!i#_~*@naguLLjDAz+)~*_xV2iz2?(N|0y8DMneikrT*dG`mu6vdK`% z=&nX5{F-V!Reau}+w_V3)4?}h@A@O)6GCY7eXC{p-5~p8x{cH=hNR;Sb{*XloSZ_%0ZKYG=w<|!vy?spR4!6mF!sXMUB5S9o_lh^g0!=2m55hGR; z-&*BZ*&;YSo474=SAM!WzrvjmNtq17L`kxbrZ8RN419e=5CiQ-bP1j-C#@@-&5*(8 zRQdU~+e(teUf}I3tu%PB1@Tr{r=?@0KOi3+Dy8}+y#bvgeY(FdN!!`Kb>-nM;7u=6 z;0yBwOJ6OdWn0gnuM{0`*fd=C(f8ASnH5aNYJjpbY1apTAY$-%)uDi$%2)lpH=#)=HH z<9JaYwPKil@QbfGOWvJ?cN6RPBr`f+jBC|-dO|W@x_Vv~)bmY(U(!cs6cnhe0z31O z>yTtL4@KJ*ac85u9|=LFST22~!lb>n7IeHs)_(P_gU}|8G>{D_fJX)8BJ;Se? z67QTTlTzZykb^4!{xF!=C}VeFd@n!9E)JAK4|vWVwWop5vSWcD<;2!88v-lS&ve7C zuYRH^85#hGKX(Mrk};f$j_V&`Nb}MZy1mmfz(e`nnI4Vpq(R}26pZx?fq%^|(n~>* z5a5OFtFJJfrZmgjyHbj1`9||Yp?~`p2?4NCwu_!!*4w8K`&G7U_|np&g7oY*-i;sI zu)~kYH;FddS{7Ri#Z5)U&X3h1$Mj{{yk1Q6bh4!7!)r&rqO6K~{afz@bis?*a56i& zxi#(Ss6tkU5hDQJ0{4sKfM*ah0f$>WvuRL zunQ-eOqa3&(rv4kiQ(N4`FO6w+nko_HggKFWx@5aYr}<~8wuEbD(Icvyl~9QL^MBt zSvD)*C#{2}!Z55k1ukV$kcJLtW2d~%z$t0qMe(%2qG`iF9K_Gsae7OO%Tf8E>ooch ztAw01`WVv6?*14e1w%Wovtj7jz_)4bGAqqo zvTD|B4)Ls8x7-yr6%tYp)A7|A)x{WcI&|&DTQR&2ir(KGR7~_RhNOft)wS<+vQ*|sf;d>s zEfl&B^*ZJp$|N`w**cXOza8(ARhJT{O3np#OlfxP9Nnle4Sto)Fv{w6ifKIN^f1qO*m8+MOgA1^Du!=(@MAh8)@wU8t=Ymh!iuT_lzfm za~xEazL-0xwy9$48!+?^lBwMV{!Gx)N>}CDi?Jwax^YX@_bxl*+4itP;DrTswv~n{ zZ0P>@EB({J9ZJ(^|ptn4ks^Z2UI&87d~J_^z0&vD2yb%*H^AE!w= zm&FiH*c%vvm{v&i3S>_hacFH${|(2+q!`X~zn4$aJDAry>=n|{C7le(0a)nyV{kAD zlud4-6X>1@-XZd`3SKKHm*XNn_zCyKHmf*`C_O509$iy$Wj`Sm3y?nWLCDy>MUx1x zl-sz7^{m(&NUk*%_0(G^>wLDnXW90FzNi$Tu6* z<+{ePBD`%IByu977rI^x;gO5M)Tfa-l*A2mU-#IL2?+NXK-?np<&2rlF;5kaGGrx2 zy8Xrz`kHtTVlSSlC=nlV4_oCsbwyVHG4@Adb6RWzd|Otr!LU=% zEjM5sZ#Ib4#jF(l!)8Na%$5VK#tzS>=05GpV?&o* z3goH1co0YR=)98rPJ~PuHvkA59KUi#i(Mq_$rApn1o&n1mUuZfFLjx@3;h`0^|S##QiTP8rD`r8P+#D@gvDJh>amMIl065I)PxT6Hg(lJ?X7*|XF2Le zv36p8dWHCo)f#C&(|@i1RAag->5ch8TY!LJ3(+KBmLxyMA%8*X%_ARR*!$AL66nF= z=D}uH)D)dKGZ5AG)8N-;Il*-QJ&d8u30&$_Q0n1B58S0ykyDAyGa+BZ>FkiOHm1*& zNOVH;#>Hg5p?3f(7#q*dL74;$4!t?a#6cfy#}9H3IFGiCmevir5@zXQj6~)@zYrWZ zRl*e66rjwksx-)Flr|Kzd#Bg>We+a&E{h7bKSae9P~ z(g|zuXmZ zD?R*MlmoZ##+0c|cJ(O{*h(JtRdA#lChYhfsx25(Z`@AK?Q-S8_PQqk z>|Z@Ki1=wL1_c6giS%E4YVYD|Y-{^ZzFwB*yN8-4#+TxeQ`jhks7|SBu7X|g=!_XL z`mY=0^chZfXm%2DYHJ4z#soO7=NONxn^K3WX={dV>$CTWSZe@<81-8DVtJEw#Uhd3 zxZx+($6%4a&y_rD8a&E`4$pD6-_zZJ%LEE*1|!9uOm!kYXW< zOBXZAowsX-&$5C`xgWkC43GcnY)UQt2Qkib4!!8Mh-Q!_M%5{EC=Gim@_;0+lP%O^ zG~Q$QmatQk{Mu&l{q~#kOD;T-{b1P5u7)o-QPPnqi?7~5?7%IIFKdj{;3~Hu#iS|j z)Zoo2wjf%+rRj?vzWz(6JU`=7H}WxLF*|?WE)ci7aK?SCmd}pMW<{#1Z!_7BmVP{w zSrG>?t}yNyCR%ZFP?;}e8_ zRy67~&u11TN4UlopWGj6IokS{vB!v!n~TJYD6k?~XQkpiPMUGLG2j;lh>Eb5bLTkX zx>CZlXdoJsiPx=E48a4Fkla>8dZYB%^;Xkd(BZK$z3J&@({A`aspC6$qnK`BWL;*O z-nRF{XRS`3Y&b+}G&|pE1K-Ll_NpT!%4@7~l=-TtYRW0JJ!s2C-_UsRBQ=v@VQ+4> z*6jF0;R@5XLHO^&PFyaMDvyo?-lAD(@H61l-No#t@at@Le9xOgTFqkc%07KL^&iss z!S2Ghm)u#26D(e1Q7E;L`rxOy-N{kJ zTgfw}az9=9Su?NEMMtpRlYwDxUAUr8F+P=+9pkX4%iA4&&D<|=B|~s*-U+q6cq`y* zIE+;2rD7&D5X;VAv=5rC5&nP$E9Z3HKTqIFCEV%V;b)Y|dY?8ySn|FD?s3IO>VZ&&f)idp_7AGnwVd1Z znBUOBA}~wogNpEWTt^1Rm-(YLftB=SU|#o&pT7vTr`bQo;=ZqJHIj2MP{JuXQPV7% z0k$5Ha6##aGly<}u>d&d{Hkpu?ZQeL_*M%A8IaXq2SQl35yW9zs4^CZheVgHF`%r= zs(Z|N!gU5gj-B^5{*sF>;~fauKVTq-Ml2>t>E0xl9wywD&nVYZfs1F9Lq}(clpNLz z4O(gm_i}!k`wUoKr|H#j#@XOXQ<#eDGJ=eRJjhOUtiKOG;hym-1Hu)1JYj+Kl*To<8( za1Kf4_Y@Cy>eoC59HZ4o&xY@!G(2p^=wTCV>?rQE`Upo^pbhWdM$WP4HFdDy$HiZ~ zRUJFWTII{J$GLVWR?miDjowFk<1#foE3}C2AKTNFku+BhLUuT>?PATB?WVLzEYyu+ zM*x((pGdotzLJ{}R=OD*jUexKi`mb1MaN0Hr(Wk8-Uj0zA;^1w2rmxLI$qq68D>^$ zj@)~T1l@K|~@YJ6+@1vlWl zHg5g%F{@fW5K!u>4LX8W;ua(t6YCCO_oNu}IIvI6>Fo@MilYuwUR?9p)rKNzDmTAN zzN2d>=Za&?Z!rJFV*;mJ&-sBV80%<-HN1;ciLb*Jk^p?u<~T25%7jjFnorfr={+wm zzl5Q6O>tsN8q*?>uSU6#xG}FpAVEQ_++@}G$?;S7owlK~@trhc#C)TeIYj^N(R&a} zypm~c=fIs;M!YQrL}5{xl=tUU-Tfc0ZfhQuA-u5(*w5RXg!2kChQRd$Fa8xQ0CQIU zC`cZ*!!|O!*y1k1J^m8IIi|Sl3R}gm@CC&;4840^9_bb9%&IZTRk#=^H0w%`5pMDCUef5 zYt-KpWp2ijh+FM`!zZ35>+7eLN;s3*P!bp%-oSx34fdTZ14Tsf2v7ZrP+mitUx$rS zW(sOi^CFxe$g3$x45snQwPV5wpf}>5OB?}&Gh<~i(mU&ss#7;utaLZ!|KaTHniGO9 zVC9OTzuMKz)afey_{93x5S*Hfp$+r*W>O^$2ng|ik!<`U1pkxm3*)PH*d#>7md1y} zs7u^a8zW8bvl92iN;*hfOc-=P7{lJeJ|3=NfX{(XRXr;*W3j845SKG&%N zuBqCtDWj*>KooINK1 zFPCsCWr!-8G}G)X*QM~34R*k zmRmDGF*QE?jCeNfc?k{w<}@29e}W|qKJ1K|AX!htt2|B`nL=HkC4?1bEaHtGBg}V( zl(A`6z*tck_F$4;kz-TNF%7?=20iqQo&ohf@S{_!TTXnVh}FaW2jxAh(DI0f*SDG- z7tqf5X@p#l?7pUNI(BGi>n_phw=lDm>2OgHx-{`T>KP2YH9Gm5ma zb{>7>`tZ>0d5K$j|s2!{^sFWQo3+xDb~#=9-jp(1ydI3_&RXGB~rxWSMgDCGQG)oNoc#>)td zqE|X->35U?_M6{^lB4l(HSN|`TC2U*-`1jSQeiXPtvVXdN-?i1?d#;pw%RfQuKJ|e zjg75M+Q4F0p@8I3ECpBhGs^kK;^0;7O@MV=sX^EJLVJf>L;GmO z3}EbTcoom7QbI(N8ad!z(!6$!MzKaajSRb0c+ZDQ($kFT&&?GvXmu7+V3^_(VJx1z zP-1kW_AB&_A;cxm*g`$ z#Pl@Cg{siF0ST2-w)zJkzi@X)5i@)Z;7M5ewX+xcY36IaE0#flASPY2WmF8St0am{ zV|P|j9wqcMi%r-TaU>(l*=HxnrN?&qAyzimA@wtf;#^%{$G7i4nXu=Pp2#r@O~wi)zB>@25A*|axl zEclXBlXx1LP3x0yrSx@s-kVW4qlF+idF+{M7RG54CgA&soDU-3SfHW@-6_ z+*;{n_SixmGCeZjHmEE!IF}!#aswth_{zm5Qhj0z-@I}pR?cu=P)HJUBClC;U+9;$#@xia30o$% zDw%BgOl>%vRenxL#|M$s^9X}diJ9q7wI1-0n2#6>@q}rK@ng(4M68(t52H_Jc{f&M9NPxRr->vj-88hoI?pvpn}llcv_r0`;uN>wuE{ z&TOx_i4==o;)>V4vCqG)A!mW>dI^Ql8BmhOy$6^>OaUAnI3>mN!Zr#qo4A>BegYj` zNG_)2Nvy2Cqxs1SF9A5HHhL7sai#Umw%K@+riaF+q)7&MUJvA&;$`(w)+B@c6!kX@ zzuY;LGu6|Q2eu^06PzSLspV2v4E?IPf`?Su_g8CX!75l)PCvyWKi4YRoRThB!-BhG zubQ#<7oCvj@z`^y&mPhSlbMf0<;0D z?5&!I?nV-jh-j1g~&R(YL@c=KB_gNup$8abPzXZN`N|WLqxlN)ZJ+#k4UWq#WqvVD z^|j+8f5uxTJtgcUscKTqKcr?5g-Ih3nmbvWvvEk})u-O}h$=-p4WE^qq7Z|rLas0$ zh0j&lhm@Rk(6ZF0_6^>Rd?Ni-#u1y`;$9tS;~!ph8T7fLlYE{P=XtWfV0Ql z#z{_;A%p|8+LhbZT0D_1!b}}MBx9`R9uM|+*`4l3^O(>Mk%@ha>VDY=nZMMb2TnJ= zGlQ+#+pmE98zuFxwAQcVkH1M887y;Bz&EJ7chIQQe!pgWX>(2ruI(emhz@_6t@k8Z zqFEyJFX2PO`$gJ6p$=ku{7!vR#u+$qo|1r;orjtp9FP^o2`2_vV;W&OT)acRXLN^m zY8a;geAxg!nbVu|uS8>@Gvf@JoL&GP`2v4s$Y^5vE32&l;2)`S%e#AnFI-YY7_>d#IKJI!oL6e z_7W3e=-0iz{bmuB*HP+D{Nb;rn+RyimTFqNV9Bzpa0?l`pWmR0yQOu&9c0S*1EPr1 zdoHMYlr>BycjTm%WeVuFd|QF8I{NPT&`fm=dITj&3(M^q ze2J{_2zB;wDME%}SzVWSW6)>1QtiX)Iiy^p2eT}Ii$E9w$5m)kv(3wSCNWq=#DaKZ zs%P`#^b7F-J0DgQ1?~2M`5ClYtYN{AlU|v4pEg4z03=g6nqH`JjQuM{k`!6jaIL_F zC;sn?1x?~uMo_DFg#ypNeie{3udcm~M&bYJ1LI zE%y}P9oCX3I1Y9yhF(y9Ix_=8L(p)EYr&|XZWCOb$7f2qX|A4aJ9bl7pt40Xr zXUT#NMBB8I@xoIGSHAZkYdCj>eEd#>a;W-?v4k%CwBaR5N>e3IFLRbDQTH#m_H+4b zk2UHVymC`%IqwtHUmpS1!1p-uQB`CW1Y!+VD!N4TT}D8(V0IOL|&R&)Rwj@n8g@=`h&z9YTPDT+R9agnwPuM!JW~=_ya~% zIJ*>$Fl;y7_`B7G4*P!kcy=MnNmR`(WS5_sRsvHF42NJ;EaDram5HwQ4Aw*qbYn0j;#)bh1lyKLg#dYjN*BMlh+fxmCL~?zB;HBWho;20WA==ci0mAqMfyG>1!HW zO7rOga-I9bvut1Ke_1eFo9tbzsoPTXDW1Si4}w3fq^Z|5LGf&egnw%DV=b11$F=P~ z(aV+j8S}m=CkI*8=RcrT>GmuYifP%hCoKY22Z4 zmu}o08h3YhcXx-v-QC??8mDn<+}+*X{+gZH-I;G^|7=1fBveS?J$27H&wV5^V^P$! z84?{UeYSmZ3M!@>UFoIN?GJT@IroYr;X@H~ax*CQ>b5|Xi9FXt5j`AwUPBq`0sWEJ z3O|k+g^JKMl}L(wfCqyMdRj9yS8ncE7nI14Tv#&(?}Q7oZpti{Q{Hw&5rN-&i|=fWH`XTQSu~1jx(hqm$Ibv zRzFW9$xf@oZAxL~wpj<0ZJ3rdPAE=0B>G+495QJ7D>=A&v^zXC9)2$$EnxQJ<^WlV zYKCHb1ZzzB!mBEW2WE|QG@&k?VXarY?umPPQ|kziS4{EqlIxqYHP!HN!ncw6BKQzKjqk!M&IiOJ9M^wc~ZQ1xoaI z;4je%ern~?qi&J?eD!vTl__*kd*nFF0n6mGEwI7%dI9rzCe~8vU1=nE&n4d&8}pdL zaz`QAY?6K@{s2x%Sx%#(y+t6qLw==>2(gb>AksEebXv=@ht>NBpqw=mkJR(c?l7vo z&cV)hxNoYPGqUh9KAKT)kc(NqekzE6(wjjotP(ac?`DJF=Sb7^Xet-A3PRl%n&zKk zruT9cS~vV1{%p>OVm1-miuKr<@rotj*5gd$?K`oteNibI&K?D63RoBjw)SommJ5<4 zus$!C8aCP{JHiFn2>XpX&l&jI7E7DcTjzuLYvON2{rz<)#$HNu(;ie-5$G<%eLKnTK7QXfn(UR(n+vX%aeS6!q6kv z!3nzY76-pdJp339zsl_%EI|;ic_m56({wdc(0C5LvLULW=&tWc5PW-4;&n+hm1m`f zzQV0T>OPSTjw=Ox&UF^y< zarsYKY8}YZF+~k70=olu$b$zdLaozBE|QE@H{_R21QlD5BilYBTOyv$D5DQZ8b1r- zIpSKX!SbA0Pb5#cT)L5!KpxX+x+8DRy&`o-nj+nmgV6-Gm%Fe91R1ca3`nt*hRS|^ z<&we;TJcUuPDqkM7k0S~cR%t7a`YP#80{BI$e=E!pY}am)2v3-Iqk2qvuAa1YM>xj#bh+H2V z{b#St2<;Gg>$orQ)c2a4AwD5iPcgZ7o_}7xhO86(JSJ(q(EWKTJDl|iBjGEMbX8|P z4PQHi+n(wZ_5QrX0?X_J)e_yGcTM#E#R^u_n8pK@l5416`c9S=q-e!%0RjoPyTliO zkp{OC@Ep^#Ig-n!C)K0Cy%8~**Vci8F1U(viN{==KU0nAg2(+K+GD_Gu#Bx!{tmUm zCwTrT(tCr6X8j43_n96H9%>>?4akSGMvgd+krS4wRexwZ1JxrJy!Uhz#yt$-=aq?A z@?*)bRZxjG9OF~7d$J0cwE_^CLceRK=LvjfH-~{S><^D;6B2&p-02?cl?|$@>`Qt$ zP*iaOxg<+(rbk>34VQDQpNQ|a9*)wScu!}<{oXC87hRPqyrNWpo?#=;1%^D2n2+C* zKKQH;?rWn-@%Y9g%NHG&lHwK9pBfV1a`!TqeU_Fv8s6_(@=RHua7`VYO|!W&WL*x= zIWE9eQaPq3zMaXuf)D0$V`RIZ74f)0P73xpeyk4)-?8j;|K%pD$eq4j2%tL=;&+E91O(2p91K|85b)GQcbRe&u6Ilu@SnE={^{Ix1Eqgv8D z4=w65+&36|;5WhBm$!n*!)ACCwT9Sip#1_z&g~E1kB=AlEhO0lu`Ls@6gw*a)lzc# zKx!fFP%eSBBs)U>xIcQKF(r_$SWD3TD@^^2Ylm=kC*tR+I@X>&SoPZdJ2fT!ysjH% z-U%|SznY8Fhsq7Vau%{Ad^Pvbf3IqVk{M2oD+w>MWimJA@VSZC$QooAO3 zC=DplXdkyl>mSp^$zk7&2+eoGQ6VVh_^E#Z3>tX7Dmi<2aqlM&YBmK&U}m>a%8)LQ z8v+c}a0QtXmyd%Kc2QNGf8TK?_EK4wtRUQ*VDnf5jHa?VvH2K(FDZOjAqYufW8oIZ z31|o~MR~T;ZS!Lz%8M0*iVARJ>_G2BXEF8(}6Dmn_rFV~5NI`lJjp`Mi~g7~P%H zO`S&-)Fngo3VXDMo7ImlaZxY^s!>2|csKca6!|m7)l^M0SQT1_L~K29%x4KV8*xiu zwP=GlyIE9YPSTC0BV`6|#)30=hJ~^aYeq7d6TNfoYUkk-^k0!(3qp(7Mo-$|48d8Z2d zrsfsRM)y$5)0G`fNq!V?qQ+nh0xwFbcp{nhW%vZ?h);=LxvM(pWd9FG$Bg1;@Bv)mKDW>AP{ol zD(R~mLzdDrBv$OSi{E%OD`Ano=F^vwc)rNb*Bg3-o)bbAgYE=M7Gj2OHY{8#pM${_^ zwkU|tnTKawxUF7vqM9UfcQ`V49zg78V%W)$#5ssR}Rj7E&p(4_ib^?9luZPJ%iJTvW&-U$nFYky>KJwHpEHHx zVEC;!ETdkCnO|${Vj#CY>LLut_+c|(hpWk8HRgMGRY%E--%oKh@{KnbQ~0GZd}{b@ z`J2qHBcqqjfHk^q=uQL!>6HSSF3LXL*cCd%opM|k#=xTShX~qcxpHTW*BI!c3`)hQq{@!7^mdUaG7sFsFYnl1%blslM;?B8Q zuifKqUAmR=>33g~#>EMNfdye#rz@IHgpM$~Z7c5@bO@S>MyFE3_F}HVNLnG0TjtXU zJeRWH^j5w_qXb$IGs+E>daTa}XPtrUnnpTRO9NEx4g6uaFEfHP9gW;xZnJi{oqAH~ z5dHS(ch3^hbvkv@u3QPLuWa}ImaElDrmIc%5HN<^bwej}3+?g) z-ai7D&6Iq_P(}k`i^4l?hRLbCb>X9iq2UYMl=`9U9Rf=3Y!gnJbr?eJqy>Zpp)m>Ae zcQ4Qfs&AaE?UDTODcEj#$_n4KeERZHx-I+E5I~E#L_T3WI3cj$5EYR75H7hy%80a8Ej?Y6hv+fR6wHN%_0$-xL!eI}fdjOK7(GdFD%`f%-qY@-i@fTAS&ETI99jUVg8 zslPSl#d4zbOcrgvopvB2c2A6r^pEr&Sa5I5%@1~BpGq`Wo|x=&)WnnQjE+)$^U-wW zr2Kv?XJby(8fcn z8JgPn)2_#-OhZ+;72R6PspMfCVvtLxFHeb7d}fo(GRjm_+R(*?9QRBr+yPF(iPO~ zA4Tp1<0}#fa{v0CU6jz}q9;!3Pew>ikG1qh$5WPRTQZ~ExQH}b1hDuzRS1}65uydS z~Te*3@?o8fih=mZ`iI!hL5iv3?VUBLQv0X zLtu58MIE7Jbm?)NFUZuMN2_~eh_Sqq*56yIo!+d_zr@^c@UwR&*j!fati$W<=rGGN zD$X`$lI%8Qe+KzBU*y3O+;f-Csr4$?3_l+uJ=K@dxOfZ?3APc5_x2R=a^kLFoxt*_ z4)nvvP+(zwlT5WYi!4l7+HKqzmXKYyM9kL5wX$dTSFSN&)*-&8Q{Q$K-})rWMin8S zy*5G*tRYNqk7&+v;@+>~EIQgf_SB;VxRTQFcm5VtqtKZ)x=?-f+%OY(VLrXb^6*aP zP&0Nu@~l2L!aF8i2!N~fJiHyxRl?I1QNjB)`uP_DuaU?2W;{?0#RGKTr2qH5QqdhK zP__ojm4WV^PUgmrV)`~f>(769t3|13DrzdDeXxqN6XA|_GK*;zHU()a(20>X{y-x| z2P6Ahq;o=)Nge`l+!+xEwY`7Q(8V=93A9C+WS^W%p&yR)eiSX+lp)?*7&WSYSh4i> zJa6i5T9o;Cd5z%%?FhB?J{l+t_)c&_f86gZMU{HpOA=-KoU5lIL#*&CZ_66O5$3?# ztgjGLo`Y7bj&eYnK#5x1trB_6tpu4$EomotZLb*9l6P(JmqG`{z$?lNKgq?GAVhkA zvw!oFhLyX=$K=jTAMwDQ)E-8ZW5$X%P2$YB5aq!VAnhwGv$VR&;Ix#fu%xlG{|j_K zbEYL&bx%*YpXcaGZj<{Y{k@rsrFKh7(|saspt?OxQ~oj_6En(&!rTZPa7fLCEU~mA zB7tbVs=-;cnzv*#INgF_9f3OZhp8c5yk!Dy1+`uA7@eJfvd~g34~wKI1PW%h(y&nA zRwMni12AHEw36)C4Tr-pt6s82EJa^8N#bjy??F*rg4fS@?6^MbiY3;7x=gd~G|Hi& zwmG+pAn!aV>>nNfP7-Zn8BLbJm&7}&ZX+$|z5*5{{F}BRSxN=JKZTa#{ut$v0Z0Fs za@UjXo#3!wACv+p9k*^9^n+(0(YKIUFo`@ib@bjz?Mh8*+V$`c%`Q>mrc5bs4aEf4 zh0qtL1qNE|xQ9JrM}qE>X>Y@dQ?%` zBx(*|1FMzVY&~|dE^}gHJ37O9bjnk$d8vKipgcf+As(kt2cbxAR3^4d0?`}}hYO*O z{+L&>G>AYaauAxE8=#F&u#1YGv%`d*v+EyDcU2TnqvRE33l1r}p#Vmcl%n>NrYOqV z2Car_^^NsZ&K=a~bj%SZlfxzHAxX$>=Q|Zi;E0oyfhgGgqe1Sd5-E$8KV9=`!3jWZCb2crb;rvQ##iw}xm7Da za!H${ls5Ihwxkh^D)M<4Yy3bp<-0a+&KfV@CVd9X6Q?v)$R3*rfT@jsedSEhoV(vqv?R1E8oWV;_{l_+_6= zLjV^-bZU$D_ocfSpRxDGk*J>n4G6s-e>D8JK6-gA>aM^Hv8@)txvKMi7Pi#DS5Y?r zK0%+L;QJdrIPXS2 ztjWAxkSwt2xG$L)Zb7F??cjs!KCTF+D{mZ5e0^8bdu_NLgFHTnO*wx!_8#}NO^mu{FaYeCXGjnUgt_+B-Ru!2_Ue-0UPg2Y)K3phLmR<4 zqUCWYX!KDU!jYF6c?k;;vF@Qh^q(PWwp1ez#I+0>d7V(u_h|L+kX+MN1f5WqMLn!L z!c(pozt7tRQi&duH8n=t-|d)c^;%K~6Kpyz(o53IQ_J+aCapAif$Ek#i0F9U>i+94 zFb=OH5(fk-o`L(o|DyQ(hlozl*2cu#)Y(D*zgNMi1Z!DTex#w#)x(8A-T=S+eByJW z%-k&|XhdZOWjJ&(FTrZNWRm^pHEot_MRQ_?>tKQ&MB~g(&D_e>-)u|`Ot(4j=UT6? zQ&YMi2UnCKlBpwltP!}8a2NJ`LlfL=k8SQf69U)~=G;bq9<2GU&Q#cHwL|o4?ah1` z;fG)%t0wMC;DR?^!jCoKib_iiIjsxCSxRUgJDCE%0P;4JZhJCy)vR1%zRl>K?V6#) z2lDi*W3q9rA zo;yvMujs+)a&00~W<-MNj=dJ@4%tccwT<@+c$#CPR%#aE#Dra+-5eSDl^E>is2v^~ z8lgRwkpeU$|1LW4yFwA{PQ^A{5JY!N5PCZ=hog~|FyPPK0-i;fCl4a%1 z?&@&E-)b4cK)wjXGq|?Kqv0s7y~xqvSj-NpOImt{Riam*Z!wz-coZIMuQU>M%6ben z>P@#o^W;fizVd#?`eeEPs#Gz^ySqJn+~`Pq%-Ee6*X+E>!PJGU#rs6qu0z5{+?`-N zxf1#+JNk7e6AoJTdQwxs&GMTq?Djch_8^xL^A;9XggtGL>!@0|BRuIdE&j$tzvt7I zr@I@0<0io%lpF697s1|qNS|BsA>!>-9DVlgGgw2;;k;=7)3+&t!);W3ulPgR>#JiV zUerO;WxuJqr$ghj-veVGfKF?O7si#mzX@GVt+F&atsB@NmBoV4dK|!owGP005$7LN7AqCG(S+={YA- zn#I{UoP_$~Epc=j78{(!2NLN)3qSm-1&{F&1z4Dz&7Mj_+SdlR^Q5{J=r822d4A@?Rj~xATaWewHUOus{*C|KoH`G zHB8SUT06GpSt)}cFJ18!$Kp@r+V3tE_L^^J%9$&fcyd_AHB)WBghwqBEWW!oh@StV zDrC?ttu4#?Aun!PhC4_KF1s2#kvIh~zds!y9#PIrnk9BWkJpq}{Hlqi+xPOR&A1oP zB0~1tV$Zt1pQuHpJw1TAOS=3$Jl&n{n!a+&SgYVe%igUtvE>eHqKY0`e5lwAf}2x( zP>9Wz+9uirp7<7kK0m2&Y*mzArUx%$CkV661=AIAS=V=|xY{;$B7cS5q0)=oq0uXU z_roo90&gHSfM6@6kmB_FJZ)3y_tt0}7#PA&pWo@_qzdIMRa-;U*Dy>Oo#S_n61Fn! z%mrH%tRmvQvg%UqN_2(C#LSxgQ>m}FKLGG=uqJQuSkk=S@c~QLi4N+>lr}QcOuP&% zQCP^cRk&rk-@lpa0^Lcvdu`F*qE)-0$TnxJlwZf|dP~s8cjhL%>^+L~{umxl5Xr6@ z^7zVKiN1Xg;-h+kr4Yt2BzjZs-Mo54`pDbLc}fWq{34=6>U9@sBP~iWZE`+FhtU|x zTV}ajn*Hc}Y?3agQ+bV@oIRm=qAu%|zE;hBw7kCcDx{pm!_qCxfPX3sh5^B$k_2d` z6#rAeUZC;e-LuMZ-f?gHeZogOa*mE>ffs+waQ+fQl4YKoAyZii_!O0;h55EMzD{;) z8lSJvv((#UqgJ?SCQFqJ-UU?2(0V{;7zT3TW`u6GH6h4m3}SuAAj_K(raGBu>|S&Q zZGL?r9@caTbmRm7p=&Tv?Y1)60*9At38w)$(1c?4cpFY2RLyw9c<{OwQE{b@WI}FQ zTT<2HOF4222d%k70yL~x_d#6SNz`*%@4++8gYQ8?yq0T@w~bF@aOHL2)T4xj`AVps9k z?m;<2ClJh$B6~fOYTWIV*T9y1BpB1*C?dgE{%lVtIjw>4MK{wP6OKTb znbPWrkZjYCbr`GGa%Xo0h;iFPNJBI3fK5`wtJV?wq_G<_PZ<`eiKtvN$IKfyju*^t zXc}HNg>^PPZ16m6bfTpmaW5=qoSsj>3)HS}teRa~qj+Y}mGRE?cH!qMDBJ8 zJB!&-=MG8Tb;V4cZjI_#{>ca0VhG_P=j0kcXVX5)^Sdpk+LKNv#yhpwC$k@v^Am&! z_cz2^4Cc{_BC!K#zN!KEkPzviUFPJ^N_L-kHG6}(X#$>Q=9?!{$A(=B3)P?PkxG9gs#l! zo6TOHo$F|IvjTC3MW%XrDoc7;m-6wb9mL(^2(>PQXY53hE?%4FW$rTHtN`!VgH72U zRY)#?Y*pMA<)x3B-&fgWQ(TQ6S6nUeSY{9)XOo_k=j$<*mA=f+ghSALYwBw~!Egn!jtjubOh?6Cb-Zi3IYn*fYl()^3u zRiX0I{5QaNPJ9w{yh4(o#$geO7b5lSh<5ZaRg9_=aFdZjxjXv(_SCv^v-{ZKQFtAA}kw=GPC7l81GY zeP@0Da{aR#{6`lbI0ON0y#K=t|L*}MG_HSl$e{U;v=BSs{SU3(e*qa(l%rD;(zM^3 zrRgN3M#Sf(Cr9>v{FtB`8JBK?_zO+~{H_0$lLA!l{YOs9KQd4Zt<3*Ns7dVbT{1Ut z?N9{XkN(96?r(4BH~3qeiJ_CAt+h1}O_4IUF$S(5EyTyo=`{^16P z=VhDY!NxkDukQz>T`0*H=(D3G7Np*2P`s(6M*(*ZJa;?@JYj&_z`d5bap=KK37p3I zr5#`%aC)7fUo#;*X5k7g&gQjxlC9CF{0dz*m2&+mf$Sc1LnyXn9lpZ!!Bl!@hnsE5px};b-b-`qne0Kh;hziNC zXV|zH%+PE!2@-IrIq!HM2+ld;VyNUZiDc@Tjt|-1&kq}>muY;TA3#Oy zWdYGP3NOZWSWtx6?S6ES@>)_Yz%%nLG3P>Z7`SrhkZ?shTfrHkYI;2zAn8h65wV3r z^{4izW-c9!MTge3eN=~r5aTnz6*6l#sD68kJ7Nv2wMbL~Ojj0H;M`mAvk*`Q!`KI? z7nCYBqbu$@MSNd+O&_oWdX()8Eh|Z&v&dJPg*o-sOBb2hriny)< zd(o&&kZM^NDtV=hufp8L zCkKu7)k`+czHaAU567$?GPRGdkb4$37zlIuS&<&1pgArURzoWCbyTEl9OiXZBn4p<$48-Gekh7>e)v*?{9xBt z=|Rx!@Y3N@ffW5*5!bio$jhJ7&{!B&SkAaN`w+&3x|D^o@s{ZAuqNss8K;211tUWIi1B!%-ViYX+Ys6w)Q z^o1{V=hK#+tt&aC(g+^bt-J9zNRdv>ZYm9KV^L0y-yoY7QVZJ_ivBS02I|mGD2;9c zR%+KD&jdXjPiUv#t1VmFOM&=OUE2`SNm4jm&a<;ZH`cYqBZoAglCyixC?+I+}*ScG#;?SEAFob{v0ZKw{`zw*tX}<2k zoH(fNh!>b5w8SWSV}rQ*E24cO=_eQHWy8J!5;Y>Bh|p;|nWH|nK9+ol$k`A*u*Y^Uz^%|h4Owu}Cb$zhIxlVJ8XJ0xtrErT zcK;34CB;ohd|^NfmVIF=XlmB5raI}nXjFz;ObQ4Mpl_`$dUe7sj!P3_WIC~I`_Xy@ z>P5*QE{RSPpuV=3z4p3}dh>Dp0=We@fdaF{sJ|+_E*#jyaTrj-6Y!GfD@#y@DUa;& zu4Iqw5(5AamgF!2SI&WT$rvChhIB$RFFF|W6A>(L9XT{0%DM{L`knIQPC$4F`8FWb zGlem_>>JK-Fib;g*xd<-9^&_ue95grYH>5OvTiM;#uT^LVmNXM-n8chJBD2KeDV7t zbnv3CaiyN>w(HfGv86K5MEM{?f#BTR7**smpNZ}ftm+gafRSt=6fN$(&?#6m3hF!>e$X)hFyCF++Qvx(<~q3esTI zH#8Sv!WIl2<&~=B)#sz1x2=+KTHj=0v&}iAi8eD=M->H|a@Qm|CSSzH#eVIR3_Tvu zG8S**NFbz%*X?DbDuP(oNv2;Lo@#_y4k$W+r^#TtJ8NyL&&Rk;@Q}~24`BB)bgwcp z=a^r(K_NEukZ*|*7c2JKrm&h&NP)9<($f)eTN}3|Rt`$5uB0|!$Xr4Vn#i;muSljn zxG?zbRD(M6+8MzGhbOn%C`M#OcRK!&ZHihwl{F+OAnR>cyg~No44>vliu$8^T!>>*vYQJCJg=EF^lJ*3M^=nGCw`Yg@hCmP(Gq^=eCEE1!t-2>%Al{w@*c% zUK{maww*>K$tu;~I@ERb9*uU@LsIJ|&@qcb!&b zsWIvDo4#9Qbvc#IS%sV1_4>^`newSxEcE08c9?rHY2%TRJfK2}-I=Fq-C)jc`gzV( zCn?^noD(9pAf2MP$>ur0;da`>Hr>o>N@8M;X@&mkf;%2A*2CmQBXirsJLY zlX21ma}mKH_LgYUM-->;tt;6F?E5=fUWDwQhp*drQ%hH0<5t2m)rFP%=6aPIC0j$R znGI0hcV~}vk?^&G`v~YCKc7#DrdMM3TcPBmxx#XUC_JVEt@k=%3-+7<3*fTcQ>f~?TdLjv96nb66xj=wVQfpuCD(?kzs~dUV<}P+Fpd)BOTO^<*E#H zeE80(b~h<*Qgez(iFFOkl!G!6#9NZAnsxghe$L=Twi^(Q&48 zD0ohTj)kGLD){xu%pm|}f#ZaFPYpHtg!HB30>F1c=cP)RqzK2co`01O5qwAP zUJm0jS0#mci>|Nu4#MF@u-%-4t>oUTnn_#3K09Hrwnw13HO@9L;wFJ*Z@=gCgpA@p zMswqk;)PTXWuMC-^MQxyNu8_G-i3W9!MLd2>;cM+;Hf&w| zLv{p*hArp9+h2wsMqT5WVqkkc0>1uokMox{AgAvDG^YJebD-czexMB!lJKWllLoBI zetW2;;FKI1xNtA(ZWys!_un~+834+6y|uV&Lo%dKwhcoDzRADYM*peh{o`-tHvwWIBIXW`PKwS3|M>CW37Z2dr!uJWNFS5UwY4;I zNIy1^sr+@8Fob%DHRNa&G{lm?KWU7sV2x9(Ft5?QKsLXi!v6@n&Iyaz5&U*|hCz+d z9vu60IG<v6+^ZmBs_aN!}p|{f(ikVl&LcB+UY;PPz* zj84Tm>g5~-X=GF_4JrVmtEtm=3mMEL1#z+pc~t^Iify^ft~cE=R0TymXu*iQL+XLX zdSK$~5pglr3f@Lrcp`>==b5Z6r7c=p=@A5nXNacsPfr(5m;~ks@*Wu7A z%WyY$Pt*RAKHz_7cghHuQqdU>hq$vD?plol_1EU(Fkgyo&Q2&2e?FT3;H%!|bhU~D z>VX4-6}JLQz8g3%Bq}n^NhfJur~v5H0dbB^$~+7lY{f3ES}E?|JnoLsAG%l^%eu_PM zEl0W(sbMRB3rFeYG&tR~(i2J0)RjngE`N_Jvxx!UAA1mc7J>9)`c=`}4bVbm8&{A` z3sMPU-!r-8de=P(C@7-{GgB<5I%)x{WfzJwEvG#hn3ict8@mexdoTz*(XX!C&~}L* z^%3eYQ8{Smsmq(GIM4d5ilDUk{t@2@*-aevxhy7yk(wH?8yFz%gOAXRbCYzm)=AsM z?~+vo2;{-jkA%Pqwq&co;|m{=y}y2lN$QPK>G_+jP`&?U&Ubq~T`BzAj1TlC`%8+$ zzdwNf<3suPnbh&`AI7RAYuQ<#!sD|A=ky2?hca{uHsB|0VqShI1G3lG5g}9~WSvy4 zX3p~Us^f5AfXlBZ0hA;mR6aj~Q8yb^QDaS*LFQwg!!<|W!%WX9Yu}HThc7>oC9##H zEW`}UQ%JQ38UdsxEUBrA@=6R-v1P6IoIw8$8fw6F{OSC7`cOr*u?p_0*Jvj|S)1cd z-9T);F8F-Y_*+h-Yt9cQQq{E|y^b@r&6=Cd9j0EZL}Pj*RdyxgJentY49AyC@PM<< zl&*aq_ubX%*pqUkQ^Zsi@DqhIeR&Ad)slJ2g zmeo&+(g!tg$z1ao1a#Qq1J022mH4}y?AvWboI4H028;trScqDQrB36t!gs|uZS9}KG0}DD$ zf2xF}M*@VJSzEJ5>ucf+L_AtN-Ht=34g&C?oPP>W^bwoigIncKUyf61!ce!2zpcNT zj&;rPGI~q2!Sy>Q7_lRX*DoIs-1Cei=Cd=+Xv4=%bn#Yqo@C=V`|QwlF0Y- zONtrwpHQ##4}VCL-1ol(e<~KU9-ja^kryz!g!})y-2S5z2^gE$Isj8l{%tF=Rzy`r z^RcP7vu`jHgHLKUE957n3j+BeE(bf;f)Zw($XaU6rZ26Upl#Yv28=8Y`hew{MbH>* z-sGI6dnb5D&dUCUBS`NLAIBP!Vi!2+~=AU+)^X^IpOEAn#+ab=`7c z%7B|mZ>wU+L;^&abXKan&N)O;=XI#dTV|9OMYxYqLbtT#GY8PP$45Rm2~of+J>>HIKIVn(uQf-rp09_MwOVIp@6!8bKV(C#(KxcW z;Pesq(wSafCc>iJNV8sg&`!g&G55<06{_1pIoL`2<7hPvAzR1+>H6Rx0Ra%4j7H-<-fnivydlm{TBr06;J-Bq8GdE^Amo)ptV>kS!Kyp*`wUx=K@{3cGZnz53`+C zLco1jxLkLNgbEdU)pRKB#Pq(#(Jt>)Yh8M?j^w&RPUueC)X(6`@@2R~PV@G(8xPwO z^B8^+`qZnQr$8AJ7<06J**+T8xIs)XCV6E_3W+al18!ycMqCfV>=rW0KBRjC* zuJkvrv;t&xBpl?OB3+Li(vQsS(-TPZ)Pw2>s8(3eF3=n*i0uqv@RM^T#Ql7(Em{(~%f2Fw|Reg@eSCey~P zBQlW)_DioA*yxxDcER@_=C1MC{UswPMLr5BQ~T6AcRyt0W44ffJG#T~Fk}wU^aYoF zYTayu-s?)<`2H(w+1(6X&I4?m3&8sok^jpXBB<|ZENso#?v@R1^DdVvKoD?}3%@{}}_E7;wt9USgrfR3(wabPRhJ{#1es81yP!o4)n~CGsh2_Yj2F^z|t zk((i&%nDLA%4KFdG96pQR26W>R2^?C1X4+a*hIzL$L=n4M7r$NOTQEo+k|2~SUI{XL{ynLSCPe%gWMMPFLO{&VN2pom zBUCQ(30qj=YtD_6H0-ZrJ46~YY*A;?tmaGvHvS^H&FXUG4)%-a1K~ly6LYaIn+4lG zt=wuGLw!%h=Pyz?TP=?6O-K-sT4W%_|Nl~;k~YA^_`gqfe{Xw=PWn#9f1mNz)sFuL zJbrevo(DPgpirvGMb6ByuEPd=Rgn}fYXqeUKyM+!n(cKeo|IY%p!#va6`D8?A*{u3 zEeWw0*oylJ1X!L#OCKktX2|>-z3#>`9xr~azOH+2dXHRwdfnpri9|xmK^Q~AuY!Fg z`9Xx?hxkJge~)NVkPQ(VaW(Ce2pXEtgY*cL8i4E)mM(iz_vdm|f@%cSb*Lw{WbShh41VGuplex9E^VvW}irx|;_{VK=N_WF39^ zH4<*peWzgc)0UQi4fBk2{FEzldDh5+KlRd!$_*@eYRMMRb1gU~9lSO_>Vh-~q|NTD zL}X*~hgMj$*Gp5AEs~>Bbjjq7G>}>ki1VxA>@kIhLe+(EQS0mjNEP&eXs5)I;7m1a zmK0Ly*!d~Dk4uxRIO%iZ!1-ztZxOG#W!Q_$M7_DKND0OwI+uC;PQCbQ#k#Y=^zQve zTZVepdX>5{JSJb;DX3%3g42Wz2D@%rhIhLBaFmx#ZV8mhya}jo1u{t^tzoiQy=jJp zjY2b7D2f$ZzJx)8fknqdD6fd5-iF8e(V}(@xe)N=fvS%{X$BRvW!N3TS8jn=P%;5j zShSbzsLs3uqycFi3=iSvqH~}bQn1WQGOL4?trj(kl?+q2R23I42!ipQ&`I*&?G#i9 zWvNh8xoGKDt>%@i0+}j?Ykw&_2C4!aYEW0^7)h2Hi7$;qgF3;Go?bs=v)kHmvd|`R z%(n94LdfxxZ)zh$ET8dH1F&J#O5&IcPH3=8o;%>OIT6w$P1Yz4S!}kJHNhMQ1(prc zM-jSA-7Iq=PiqxKSWb+YbLB-)lSkD6=!`4VL~`ExISOh2ud=TI&SKfR4J08Bad&rj zcXxMpcNgOB?w$~L7l^wPcXxw$0=$oV?)`I44)}b#ChS`_lBQhvb6ks?HDr3tFgkg&td19?b8=!sETXtp=&+3T$cCwZe z0nAET-7561gsbBws$TVjP7QxY(NuBYXVn9~9%vyN-B#&tJhWgtL1B<%BTS*-2$xB` zO)cMDHoWsm%JACZF--Pa7oP;f!n%p`*trlpvZ!HKoB={l+-(8O;;eYv2A=ra z3U7rSMCkP_6wAy`l|Se(&5|AefXvV1E#XA(LT!% zjj4|~xlZ-kPLNeQLFyXb%$K}YEfCBvHA-Znw#dZSI6V%3YD{Wj2@utT5Hieyofp6Qi+lz!u)htnI1GWzvQsA)baEuw9|+&(E@p8M+#&fsX@Kf`_YQ>VM+40YLv`3-(!Z7HKYg@+l00WGr779i-%t`kid%e zDtbh8UfBVT3|=8FrNian@aR3*DTUy&u&05x%(Lm3yNoBZXMHWS7OjdqHp>cD>g!wK z#~R{1`%v$IP;rBoP0B0P><;dxN9Xr+fp*s_EK3{EZ94{AV0#Mtv?;$1YaAdEiq5)g zYME;XN9cZs$;*2p63Q9^x&>PaA1p^5m7|W?hrXp2^m;B@xg0bD?J;wIbm6O~Nq^^K z2AYQs@7k)L#tgUkTOUHsh&*6b*EjYmwngU}qesKYPWxU-z_D> zDWr|K)XLf_3#k_9Rd;(@=P^S^?Wqlwert#9(A$*Y$s-Hy)BA0U0+Y58zs~h=YtDKxY0~BO^0&9{?6Nny;3=l59(6ec9j(79M?P1cE zex!T%$Ta-KhjFZLHjmPl_D=NhJULC}i$}9Qt?nm6K6-i8&X_P+i(c*LI3mtl3 z*B+F+7pnAZ5}UU_eImDj(et;Khf-z^4uHwrA7dwAm-e4 zwP1$Ov3NP5ts+e(SvM)u!3aZMuFQq@KE-W;K6 zag=H~vzsua&4Sb$4ja>&cSJ)jjVebuj+?ivYqrwp3!5>ul`B*4hJGrF;!`FaE+wKo z#};5)euvxC1zX0-G;AV@R(ZMl=q_~u8mQ5OYl;@BAkt)~#PynFX#c1K zUQ1^_N8g+IZwUl*n0Bb-vvliVtM=zuMGU-4a8|_8f|2GEd(2zSV?aSHUN9X^GDA8M zgTZW06m*iAy@7l>F3!7+_Y3mj^vjBsAux3$%U#d$BT^fTf-7{Y z_W0l=7$ro5IDt7jp;^cWh^Zl3Ga1qFNrprdu#g=n9=KH!CjLF#ucU5gy6*uASO~|b z7gcqm90K@rqe({P>;ww_q%4}@bq`ST8!0{V08YXY)5&V!>Td)?j7#K}HVaN4FU4DZ z%|7OppQq-h`HJ;rw-BAfH* z1H$ufM~W{%+b@9NK?RAp-$(P0N=b<(;wFbBN0{u5vc+>aoZ|3&^a866X@el7E8!E7 z=9V(Ma**m_{DKZit2k;ZOINI~E$|wO99by=HO{GNc1t?nl8soP@gxk8)WfxhIoxTP zoO`RA0VCaq)&iRDN9yh_@|zqF+f07Esbhe!e-j$^PS57%mq2p=+C%0KiwV#t^%_hH zoO?{^_yk5x~S)haR6akK6d|#2TN& zfWcN zc7QAWl)E9`!KlY>7^DNw$=yYmmRto>w0L(~fe?|n6k2TBsyG@sI)goigj=mn)E)I* z4_AGyEL7?(_+2z=1N@D}9$7FYdTu;%MFGP_mEJXc2OuXEcY1-$fpt8m_r2B|<~Xfs zX@3RQi`E-1}^9N{$(|YS@#{ZWuCxo)91{k>ESD54g_LYhm~vlOK_CAJHeYFfuIVB^%cqCfvpy#sU8Do8u}# z>>%PLKOZ^+$H54o@brtL-hHorSKcsjk_ZibBKBgyHt~L z=T6?e0oLX|h!Z3lbkPMO27MM?xn|uZAJwvmX?Yvp#lE3sQFY)xqet>`S2Y@1t)Z*& z;*I3;Ha8DFhk=YBt~{zp=%%*fEC}_8?9=(-k7HfFeN^GrhNw4e?vx*#oMztnO*&zY zmRT9dGI@O)t^=Wj&Og1R3b%(m*kb&yc;i`^-tqY9(0t!eyOkH<$@~1lXmm!SJllE_ zr~{a&w|8*LI>Z^h!m%YLgKv06Js7j7RaoX}ZJGYirR<#4Mghd{#;38j3|V+&=ZUq#1$ zgZb-7kV)WJUko?{R`hpSrC;w2{qa`(Z4gM5*ZL`|#8szO=PV^vpSI-^K_*OQji^J2 zZ_1142N}zG$1E0fI%uqHOhV+7%Tp{9$bAR=kRRs4{0a`r%o%$;vu!_Xgv;go)3!B#;hC5qD-bcUrKR&Sc%Zb1Y($r78T z=eG`X#IpBzmXm(o6NVmZdCQf6wzqawqI63v@e%3TKuF!cQ#NQbZ^?6K-3`_b=?ztW zA>^?F#dvVH=H-r3;;5%6hTN_KVZ=ps4^YtRk>P1i>uLZ)Ii2G7V5vy;OJ0}0!g>j^ z&TY&E2!|BDIf1}U(+4G5L~X6sQ_e7In0qJmWYpn!5j|2V{1zhjZt9cdKm!we6|Pp$ z07E+C8=tOwF<<}11VgVMzV8tCg+cD_z?u+$sBjwPXl^(Ge7y8-=c=fgNg@FxI1i5Y-HYQMEH z_($je;nw`Otdhd1G{Vn*w*u@j8&T=xnL;X?H6;{=WaFY+NJfB2(xN`G)LW?4u39;x z6?eSh3Wc@LR&yA2tJj;0{+h6rxF zKyHo}N}@004HA(adG~0solJ(7>?LoXKoH0~bm+xItnZ;3)VJt!?ue|~2C=ylHbPP7 zv2{DH()FXXS_ho-sbto)gk|2V#;BThoE}b1EkNYGT8U#0ItdHG>vOZx8JYN*5jUh5Fdr9#12^ zsEyffqFEQD(u&76zA^9Jklbiz#S|o1EET$ujLJAVDYF znX&4%;vPm-rT<8fDutDIPC@L=zskw49`G%}q#l$1G3atT(w70lgCyfYkg7-=+r7$%E`G?1NjiH)MvnKMWo-ivPSQHbk&_l5tedNp|3NbU^wk0SSXF9ohtM zUqXiOg*8ERKx{wO%BimK)=g^?w=pxB1Vu_x<9jKOcU7N;(!o3~UxyO+*ZCw|jy2}V*Z22~KhmvxoTszc+#EMWXTM6QF*ks% zW47#2B~?wS)6>_ciKe1Fu!@Tc6oN7e+6nriSU;qT7}f@DJiDF@P2jXUv|o|Wh1QPf zLG31d>@CpThA+Ex#y)ny8wkC4x-ELYCXGm1rFI=1C4`I5qboYgDf322B_Nk@#eMZ% znluCKW2GZ{r9HR@VY`>sNgy~s+D_GkqFyz6jgXKD)U|*eKBkJRRIz{gm3tUd*yXmR z(O4&#ZA*us6!^O*TzpKAZ#}B5@}?f=vdnqnRmG}xyt=)2o%<9jj>-4wLP1X-bI{(n zD9#|rN#J;G%LJ&$+Gl2eTRPx6BQC6Uc~YK?nMmktvy^E8#Y*6ZJVZ>Y(cgsVnd!tV z!%twMNznd)?}YCWyy1-#P|2Fu%~}hcTGoy>_uawRTVl=(xo5!%F#A38L109wyh@wm zdy+S8E_&$Gjm=7va-b7@Hv=*sNo0{i8B7=n4ex-mfg`$!n#)v@xxyQCr3m&O1Jxg! z+FXX^jtlw=utuQ+>Yj$`9!E<5-c!|FX(~q`mvt6i*K!L(MHaqZBTtuSA9V~V9Q$G? zC8wAV|#XY=;TQD#H;;dcHVb9I7Vu2nI0hHo)!_{qIa@|2}9d ztpC*Q{4Py~2;~6URN^4FBCBip`QDf|O_Y%iZyA0R`^MQf$ce0JuaV(_=YA`knEMXw zP6TbjYSGXi#B4eX=QiWqb3bEw-N*a;Yg?dsVPpeYFS*&AsqtW1j2D$h$*ZOdEb$8n0 zGET4Igs^cMTXWG{2#A7w_usx=KMmNfi4oAk8!MA8Y=Rh9^*r>jEV(-{I0=rc);`Y) zm+6KHz-;MIy|@2todN&F+Yv1e&b&ZvycbTHpDoZ>FIiUn+M-=%A2C(I*^Yx@VKf(Z zxJOny&WoWcyKodkeN^5))aV|-UBFw{?AGo?;NNFFcKzk+6|gYfA#FR=y@?;3IoQ zUMI=7lwo9gV9fRvYi}Nd)&gQw7(K3=a0#p27u6Q)7JlP#A)piUUF8B3Li&38Xk$@| z9OR+tU~qgd3T3322E))eV)hAAHYIj$TmhH#R+C-&E-}5Qd{3B}gD{MXnsrS;{Erv1 z6IyQ=S2qD>Weqqj#Pd65rDSdK54%boN+a?=CkR|agnIP6;INm0A*4gF;G4PlA^3%b zN{H%#wYu|!3fl*UL1~f+Iu|;cqDax?DBkZWSUQodSDL4Es@u6zA>sIm>^Aq-&X#X8 zI=#-ucD|iAodfOIY4AaBL$cFO@s(xJ#&_@ZbtU+jjSAW^g;_w`FK%aH_hAY=!MTjI zwh_OEJ_25zTQv$#9&u0A11x_cGd92E74AbOrD`~f6Ir9ENNQAV2_J2Ig~mHWhaO5a zc>fYG$zke^S+fBupw+klDkiljJAha z6DnTemhkf>hv`8J*W_#wBj-2w(cVtXbkWWtE(3j@!A-IfF?`r$MhVknTs3D1N`rYN zKth9jZtX#>v#%U@^DVN!;ni#n1)U&H_uB{6pcq7$TqXJX!Q0P7U*JUZyclb~)l*DS zOLpoQfW_3;a0S$#V0SOwVeeqE$Hd^L`$;l_~2giLYd?7!gUYIpOs!jqSL~pI)4`YuB_692~A z^T#YYQ_W3Rakk}$SL&{`H8mc{>j+3eKprw6BK`$vSSIn;s31M~YlJLApJ)+Gi1{^- zw96WnT9M0Vr_D=e=a}${raR{(35Q!g+8`}vOFj1e&Or(_wp2U2aVQP0_jP57 z2(R4E(E$n!xl<}Zx38wO;27wuQ`P#_j!}L2 z2qr;As4D4n2X$-Jd_-!fsbu_D(64i;c4cJnP576x_>Q4WNushFwkBV!kVd(AYFXe{ zaqO5`Qfr!#ETmE(B;u_&FITotv~W}QYFCI!&ENKIb1p4fg*Yv1)EDMb==EjHHWM#{ zGMpqb2-LXdHB@D~pE3|+B392Gh4q)y9jBd$a^&cJM60VEUnLtHQD5i-X6PVF>9m_k zDvG3P(?CzdaIrC8s4cu~N9MEb!Tt(g*GK~gIp1Gyeaw3b7#YPx_1T6i zRi#pAMr~PJKe9P~I+ARa$a!K~)t(4LaVbjva1yd;b1Yz2$7MMc`aLmMl(a^DgN(u? zq2o9&Gif@Tq~Yq+qDfx^F*nCnpuPv%hRFc$I!p74*quLt^M}D_rwl10uMTr!)(*=7 zSC5ea@#;l(h87k4T4x)(o^#l76P-GYJA(pOa&F9YT=fS<*O{4agzba^dIrh0hjls<~APlIz9{ zgRY{OMv2s|`;VCoYVj?InYoq^QWuA&*VDyOn@pPvK8l~g#1~~MGVVvtLDt}>id_Z` zn(ihfL?Y}Y4YX335m*Xx(y+bbukchHrM zycIGp#1*K3$!(tgTsMD2VyUSg^yvCwB8*V~sACE(yq2!MS6f+gsxv^GR|Q7R_euYx z&X+@@H?_oQddGxJYS&ZG-9O(X+l{wcw;W7srpYjZZvanY(>Q1utSiyuuonkjh5J0q zGz6`&meSuxixIPt{UoHVupUbFKIA+3V5(?ijn}(C(v>=v?L*lJF8|yRjl-m#^|krg zLVbFV6+VkoEGNz6he;EkP!Z6|a@n8?yCzX9>FEzLnp21JpU0x!Qee}lwVKA})LZJq zlI|C??|;gZ8#fC3`gzDU%7R87KZyd)H__0c^T^$zo@TBKTP*i{)Gp3E0TZ}s3mKSY zix@atp^j#QnSc5K&LsU38#{lUdwj%xF zcx&l^?95uq9on1m*0gp$ruu||5MQo)XaN>|ngV5Jb#^wWH^5AdYcn_1>H~XtNwJd3 zd9&?orMSSuj=lhO?6)Ay7;gdU#E}pTBa5wFu`nejq##Xd71BHzH2XqLA5 zeLEo;9$}~u0pEu@(?hXB_l;{jQ=7m?~mwj-ME~Tw-OHPrR7K2Xq9eCNwQO$hR z3_A?=`FJctNXA#yQEorVoh{RWxJbdQga zU%K##XEPgy?E|K(=o#IPgnbk7E&5%J=VHube|2%!Qp}@LznjE%VQhJ?L(XJOmFVY~ zo-az+^5!Ck7Lo<7b~XC6JFk>17*_dY;=z!<0eSdFD2L?CSp_XB+?;N+(5;@=_Ss3& zXse>@sA7hpq;IAeIp3hTe9^$DVYf&?)={zc9*hZAV)|UgKoD!1w{UVo8D)Htwi8*P z%#NAn+8sd@b{h=O)dy9EGKbpyDtl@NBZw0}+Wd=@65JyQ2QgU}q2ii;ot1OsAj zUI&+Pz+NvuRv#8ugesT<<@l4L$zso0AQMh{we$tkeG*mpLmOTiy8|dNYhsqhp+q*yfZA`Z)UC*(oxTNPfOFk3RXkbzAEPofVUy zZ3A%mO?WyTRh@WdXz+zD!ogo}gbUMV!YtTNhr zrt@3PcP%5F;_SQ>Ui`Gq-lUe&taU4*h2)6RDh@8G1$o!){k~3)DT87%tQeHYdO?B` zAmoJvG6wWS?=0(Cj?Aqj59`p(SIEvYyPGJ^reI z`Hr?3#U2zI7k0=UmqMD35l`>3xMcWlDv$oo6;b`dZq3d!~)W z=4Qk)lE8&>#HV>?kRLOHZYz83{u7?^KoXmM^pazj8`7OwQ=5I!==; zA!uN`Q#n=Drmzg}@^nG!mJp9ml3ukWk96^6*us*;&>s+7hWfLXtl?a}(|-#=P12>A zon1}yqh^?9!;on?tRd6Fk0knQSLl4vBGb87A_kJNDGyrnpmn48lz_%P{* z_G*3D#IR<2SS54L5^h*%=)4D9NPpji7DZ5&lHD|99W86QN_(|aJ<5C~PX%YB`Qt_W z>jF_Os@kI6R!ub4n-!orS(G6~mKL7()1g=Lf~{D!LR7#wRHfLxTjYr{*c{neyhz#U zbm@WBKozE+kTd+h-mgF+ELWqTKin57P;0b){ zii5=(B%S(N!Z=rAFGnM6iePtvpxB_Q9-oq_xH!URn2_d-H~i;lro8r{-g!k-Ydb6_w5K@FOV?zPF_hi z%rlxBv$lQi%bjsu^7KT~@u#*c$2-;AkuP)hVEN?W5MO8C9snj*EC&|M!aK6o12q3+ z8e?+dH17E!A$tRlbJW~GtMDkMPT=m1g-v67q{sznnWOI$`g(8E!Pf!#KpO?FETxLK z2b^8^@mE#AR1z(DT~R3!nnvq}LG2zDGoE1URR=A2SA z%lN$#V@#E&ip_KZL}Q6mvm(dsS?oHoRf8TWL~1)4^5<3JvvVbEsQqSa3(lF*_mA$g zv`LWarC79G)zR0J+#=6kB`SgjQZ2460W zN%lZt%M@=EN>Wz4I;eH>C0VnDyFe)DBS_2{h6=0ZJ*w%s)QFxLq+%L%e~UQ0mM9ud zm&|r){_<*Om%vlT(K9>dE(3AHjSYro5Y1I?ZjMqWyHzuCE0nyCn`6eq%MEt(aY=M2rIzHeMds)4^Aub^iTIT|%*izG4YH;sT`D9MR(eND-SB+e66LZT z2VX)RJsn${O{D48aUBl|(>ocol$1@glsxisc#GE*=DXHXA?|hJT#{;X{i$XibrA}X zFHJa+ssa2$F_UC(o2k2Z0vwx%Wb(<6_bdDO#=a$0gK2NoscCr;vyx?#cF)JjM%;a| z$^GIlIzvz%Hx3WVU481}_e4~aWcyC|j&BZ@uWW1`bH1y9EWXOxd~f-VE5DpueNofN zv7vZeV<*!A^|36hUE;`#x%MHhL(~?eZ5fhA9Ql3KHTWoAeO-^7&|2)$IcD1r5X#-u zN~N0$6pHPhop@t1_d`dO3#TC0>y5jm>8;$F5_A2& zt#=^IDfYv?JjPPTPNx2TL-Lrl82VClQSLWW_$3=XPbH}xM34)cyW5@lnxy=&h%eRq zv29&h^fMoxjsDnmua(>~OnX{Cq!7vM0M4Mr@_18|YuSKPBKUTV$s^So zc}JlAW&bVz|JY#Eyup6Ny{|P_s0Pq;5*tinH+>5Xa--{ z2;?2PBs((S4{g=G`S?B3Ien`o#5DmUVwzpGuABthYG~OKIY`2ms;33SN9u^I8i_H5`BQ%yOfW+N3r|ufHS_;U;TWT5z;b14n1gX%Pn`uuO z6#>Vl)L0*8yl|#mICWQUtgzeFp9$puHl~m&O+vj3Ox#SxQUa?fY*uK?A;00RiFg(G zK?g=7b5~U4QIK`C*um%=Sw=OJ1eeaV@WZ%hh-3<=lR#(Xesk%?)l4p(EpTwPvN99V@TT)!A8SeFTV+frN=r|5l?K#odjijx2nFgc3kI zC$hVs1S-!z9>xn9MZcRk0YXdYlf~8*LfH$IHKD59H&gLz%6 z#mAYSRJufbRi~LRadwM*G!O2>&U<^d`@<)otXZJJxT@G}4kTx0zPDVhVXwiU)$}5Y z`0iV`8EEh&GlUk&VY9m0Mqr*U&|^Bc?FB`<%{x-o0ATntwIA%(YDcxWs$C)%a%d_@ z?fx!Co+@3p7ha$|pWYD}p6#(PG%_h8K7sQjT_P~|3ZEH0DRxa3~bP&&lPMj3C~!H2QD zq>(f^RUFSqf6K3BMBFy$jiuoSE+DhEq$xLDb7{57 z0B|1pSjYJ5F@cHG%qDZ{ogL$P!BK&sR%zD`gbK#9gRZX17EtAJxN% zys^gb2=X9=7HP}N(iRqt(tot2yyeE%s;L}AcMh;~-W~s_eAe!gIUYdQz5j~T)0trh z>#1U$uOyyl%!Pi(gD&)uHe9Q^27_kHyFCC}n^-KL(=OxHqUfex1YS__RJh0m-S>eM zqAk`aSev*z1lI&-?CycgDm=bdQCp}RqS0_d-4Mf&>u2KyGFxKe8JM1N{GNWw0n$FL z1UDp(h0(1I2Jh9I`?IS}h4R~n zRwRz>8?$fFMB2{UPe^$Ifl;Oc>}@Q9`|8DCeR{?LUQLPfaMsxs8ps=D_aAXORZH~< zdcIOca-F;+D3~M+)Vi4h)I4O3<)$65yI)goQ_vk#fb;Uim>UI4Dv9#2b1;N_Wg>-F zNwKeMKY+su#~NL0uE%_$mw1%ddX2Qs2P!ncM+>wnz}OCQX1!q~oS?OqYU;&ESAAwP z452QWL0&u^mraF#=j_ZeBWhm&F|d!QjwRl^7=Bl7@(43=BkN=3{BRv#QHIk>Umc_w zvP>q|q{lJ=zs|W9%a@8%W>C@MYN1D5{(=Af31+pR#kB`cd0-YlQQTg}+ zL|_h=F9JQ|Gux5c0ehaffHNYLf8VwF+qnM6IjBEI_eceee;o;FY@#~FFVsZjBSp!j z8V*Bgmn{RK!!zqGc;jy)z@Zjo>5{%m1?K}fLEL$l6Dl4f=ye0wNI#)2L=^K(&18Gb zJoj8@WBB;P^T#V)I0`aDSy?$rJU{+-5472NyFp>;Vw43j@3Z=;D2eSfyw5*0Q+&ML zsV&&*3c3$pa`qcaGbEB0*CA~Wp3%PkF?B87FV&rWNb|@GU$LB;l|;YutU*k za1hjUL_BX%G^s;BuzRi4Hl?eqC2z&ZrKh1tZDwnufG$g$LX(j!h%F5(n8D@in3lnX z(*8+3ZT6TVYRcSpM1eMeCps=Fz8q%gyM&B=a7(Vf`4k3dN$IM+`BO^_7HZq4BR|7w z+5kOJ;9_$X%-~arA@qmXSzD|+NMh--%5-9u6t(M=f%&z$<_V#Y_lzn{E$MZZG)+A> zu2E`_Y(MBJ2l*AqvCUmU;yBT}#oQ{V=((mC-QGJwsCOH*a;{1JRTKv7DBNG+M!XL7(^jbv&Qy-o9HNFrmN)-`D3WFtXs>1vBOJpI(=x; zKhJlFdfMf^G#oU(w1+ucMKYPZaDp>$kt=wiYsBCjUY-uz<4JziB>6fXDSLH*2Y z&Px5y`#3!fF=c4>fCMdg-tX582pemU@ZxyFbznL8-=TTo1Sybg9>7h*J^9^~XxXJO z`k9v~=4amxl<;FCV9h2k%?^-ZUzQy^#{JleyH23o1S{r<+t#z6jKS<9rbAM96^1iY zi6{IjauB)UwBhC-_L(MzGCxhhv`?ryc zja_Uwi7$8l!}*vjJppGyp#Wz=*?;jC*xQ&J894rql5A$2giJRtV&DWQh#(+Vs3-5_ z69_tj(>8%z1VtVp>a74r5}j2rG%&;uaTQ|fr&r%ew-HO}76i8`&ki%#)~}q4Y|d$_ zfNp9uc#$#OEca>>MaY6rF`dB|5#S)bghf>>TmmE&S~IFw;PF0UztO6+R-0!TSC?QP z{b(RA_;q3QAPW^XN?qQqu{h<}Vfiv}Rr!lA$C79^1=U>+ng9Dh>v{`?AOZt>CrQ=o zI}=mSnR))8fJpO->rcX?H);oqSQUZ?sR!fH2SoFdcPm5*2y<_u;4h;BqcF*XbwWSv zcJN%!g|L(22Xp!^1?c;T&qm%rpkP&2EQC3JF+SENm$+@7#e!UKD1uQ{TDw43?!b!3 zUooS_rt=xJfa&h?c^hfV>YwQXre3qosz_^c#)FO~d!<)2o}Oxz5HWtr<)1Yw012v4 zhv0w(RfJspDnA^-6Jmr;GkWt%{mAYOm6yPb&Vl&rv@D^K&;#?=X{kaK5FhScNJ_3> z#5u(Saisq2(~pVlrfG#@kLM#Ot~5rZZc%B&h1=gen?R+#t^1bYKf zVvtefX=D$*)39e^2@!~A_}9c${Gf0?1;dk=!Itp#s%0>Io%k`9(bDeI-udd&E6Zfu zcaiv(h`DM3W3Mfda)fYwhB=8RAPkotVt5-z21Ij~Ot9A^SK-1u*zFVK&mF?q1;|wy zrF+XWs^5Q-%Z6I62gTwrRe#F>riVM#fv_TihxSJ6to1X7NVszgivoTa!fPfBBYj94 zuc2m zL_k-<1FoORng1aL{Zx(P7JmUiH zlmTHdzkn75=mS{V=o$V;gzhEaunoJzJ3uq>0_w~77eID^U*w+v0po_N8=sS-DL~!V z%-~rL<0V7PCEWPCpNgpfsein`Fr)+8=N}mUn2x=K`z%efnhSs#23&N1fjdO`M>s%z zP3(;v93%lLq>ZfqBi#QI-aCXAP8-may8x5s`G)KA;{HSYe2szWINWf^b*fc{jl0KecD zRTle?)%_YzJJcVb>;VJ>P?3Lu2S)vCJZlF>Jxj~~X2U5-NNNy(H?8%XD~yFUxNKs&hwWx^)iF@ zGmEv<|7Q7hGrY_+`iz+d_=^9c(_c}UCzq2#%A0|5WjzCXjZUOxOX zU&-^smw$iwKPe;r`&{rP{L35^&+wk6f2-Sn;D2Ww@sjAJj{Gwbp4H!o{#5_}qALFq z{-q%LGklZvKf%A4D!+t%sRRBDi(>mvuz&V4yu^GdD*KFy?fg%ef5ZU%w=d&M`POGt zNSEJ0{qJI~FRTAjlJc1-+x>Tm{%D?m3sk-&cq#w)OpxI98wCF#2KbWcrAXK_(}M4B zF#VQf*h|irx=+uXZUMi+`A;fPFR5M%Wjs^Wh5rWCKgedhWO^w|@XS;b^&3oom;>K0 zB??|ry^IBarYem6Z7RU`#rDs-ZZAn*hSollv?csD$sh0QpTtI9vb>Dpd}e7*`fZj! zM|8d{~YM@vfW-r0z8vJ z<^6B6Ur(}L?ms_c9@hO0^Iy&J_uc51^?d33e#Y!-``?)VG)BGjCq5$&0G8A*r!2qk zUHscGc;VxE=1KqbH=dW%&Ogl({>L!>((m$2W8M9KQ@a1=h51jN|KoG{v(x0K&*iy% e1c3cF4~(n?C}6GmGu)3JNC)6=LGAhZ*Z%`+-T+_# literal 59536 zcma&NbC71ylI~qywr$(CZQJHswz}-9F59+k+g;UV+cs{`J?GrGXYR~=-ydruB3JCa zB64N^cILAcWk5iofq)<(fq;O7{th4@;QxID0)qN`mJ?GIqLY#rX8-|G{5M0pdVW5^ zzXk$-2kQTAC?_N@B`&6-N-rmVFE=$QD?>*=4<|!MJu@}isLc4AW#{m2if&A5T5g&~ ziuMQeS*U5sL6J698wOd)K@oK@1{peP5&Esut<#VH^u)gp`9H4)`uE!2$>RTctN+^u z=ASkePDZA-X8)rp%D;p*~P?*a_=*Kwc<^>QSH|^<0>o37lt^+Mj1;4YvJ(JR-Y+?%Nu}JAYj5 z_Qc5%Ao#F?q32i?ZaN2OSNhWL;2oDEw_({7ZbgUjna!Fqn3NzLM@-EWFPZVmc>(fZ z0&bF-Ch#p9C{YJT9Rcr3+Y_uR^At1^BxZ#eo>$PLJF3=;t_$2|t+_6gg5(j{TmjYU zK12c&lE?Eh+2u2&6Gf*IdKS&6?rYbSEKBN!rv{YCm|Rt=UlPcW9j`0o6{66#y5t9C zruFA2iKd=H%jHf%ypOkxLnO8#H}#Zt{8p!oi6)7#NqoF({t6|J^?1e*oxqng9Q2Cc zg%5Vu!em)}Yuj?kaP!D?b?(C*w!1;>R=j90+RTkyEXz+9CufZ$C^umX^+4|JYaO<5 zmIM3#dv`DGM;@F6;(t!WngZSYzHx?9&$xEF70D1BvfVj<%+b#)vz)2iLCrTeYzUcL z(OBnNoG6Le%M+@2oo)&jdOg=iCszzv59e zDRCeaX8l1hC=8LbBt|k5?CXgep=3r9BXx1uR8!p%Z|0+4Xro=xi0G!e{c4U~1j6!) zH6adq0}#l{%*1U(Cb%4AJ}VLWKBPi0MoKFaQH6x?^hQ!6em@993xdtS%_dmevzeNl z(o?YlOI=jl(`L9^ z0O+H9k$_@`6L13eTT8ci-V0ljDMD|0ifUw|Q-Hep$xYj0hTO@0%IS^TD4b4n6EKDG z??uM;MEx`s98KYN(K0>c!C3HZdZ{+_53DO%9k5W%pr6yJusQAv_;IA}925Y%;+!tY z%2k!YQmLLOr{rF~!s<3-WEUs)`ix_mSU|cNRBIWxOox_Yb7Z=~Q45ZNe*u|m^|)d* zog=i>`=bTe!|;8F+#H>EjIMcgWcG2ORD`w0WD;YZAy5#s{65~qfI6o$+Ty&-hyMyJ z3Ra~t>R!p=5ZpxA;QkDAoPi4sYOP6>LT+}{xp}tk+<0k^CKCFdNYG(Es>p0gqD)jP zWOeX5G;9(m@?GOG7g;e74i_|SmE?`B2i;sLYwRWKLy0RLW!Hx`=!LH3&k=FuCsM=9M4|GqzA)anEHfxkB z?2iK-u(DC_T1};KaUT@3nP~LEcENT^UgPvp!QC@Dw&PVAhaEYrPey{nkcn(ro|r7XUz z%#(=$7D8uP_uU-oPHhd>>^adbCSQetgSG`e$U|7mr!`|bU0aHl_cmL)na-5x1#OsVE#m*+k84Y^+UMeSAa zbrVZHU=mFwXEaGHtXQq`2ZtjfS!B2H{5A<3(nb-6ARVV8kEmOkx6D2x7~-6hl;*-*}2Xz;J#a8Wn;_B5=m zl3dY;%krf?i-Ok^Pal-}4F`{F@TYPTwTEhxpZK5WCpfD^UmM_iYPe}wpE!Djai6_{ z*pGO=WB47#Xjb7!n2Ma)s^yeR*1rTxp`Mt4sfA+`HwZf%!7ZqGosPkw69`Ix5Ku6G z@Pa;pjzV&dn{M=QDx89t?p?d9gna*}jBly*#1!6}5K<*xDPJ{wv4& zM$17DFd~L*Te3A%yD;Dp9UGWTjRxAvMu!j^Tbc}2v~q^59d4bz zvu#!IJCy(BcWTc`;v$9tH;J%oiSJ_i7s;2`JXZF+qd4C)vY!hyCtl)sJIC{ebI*0> z@x>;EzyBv>AI-~{D6l6{ST=em*U( z(r$nuXY-#CCi^8Z2#v#UXOt`dbYN1z5jzNF2 z411?w)whZrfA20;nl&C1Gi+gk<`JSm+{|*2o<< zqM#@z_D`Cn|0H^9$|Tah)0M_X4c37|KQ*PmoT@%xHc3L1ZY6(p(sNXHa&49Frzto& zR`c~ClHpE~4Z=uKa5S(-?M8EJ$zt0&fJk~p$M#fGN1-y$7!37hld`Uw>Urri(DxLa;=#rK0g4J)pXMC zxzraOVw1+kNWpi#P=6(qxf`zSdUC?D$i`8ZI@F>k6k zz21?d+dw7b&i*>Kv5L(LH-?J%@WnqT7j#qZ9B>|Zl+=> z^U-pV@1y_ptHo4hl^cPRWewbLQ#g6XYQ@EkiP z;(=SU!yhjHp%1&MsU`FV1Z_#K1&(|5n(7IHbx&gG28HNT)*~-BQi372@|->2Aw5It z0CBpUcMA*QvsPy)#lr!lIdCi@1k4V2m!NH)%Px(vu-r(Q)HYc!p zJ^$|)j^E#q#QOgcb^pd74^JUi7fUmMiNP_o*lvx*q%_odv49Dsv$NV;6J z9GOXKomA{2Pb{w}&+yHtH?IkJJu~}Z?{Uk++2mB8zyvh*xhHKE``99>y#TdD z&(MH^^JHf;g(Tbb^&8P*;_i*2&fS$7${3WJtV7K&&(MBV2~)2KB3%cWg#1!VE~k#C z!;A;?p$s{ihyojEZz+$I1)L}&G~ml=udD9qh>Tu(ylv)?YcJT3ihapi!zgPtWb*CP zlLLJSRCj-^w?@;RU9aL2zDZY1`I3d<&OMuW=c3$o0#STpv_p3b9Wtbql>w^bBi~u4 z3D8KyF?YE?=HcKk!xcp@Cigvzy=lnFgc^9c%(^F22BWYNAYRSho@~*~S)4%AhEttv zvq>7X!!EWKG?mOd9&n>vvH1p4VzE?HCuxT-u+F&mnsfDI^}*-d00-KAauEaXqg3k@ zy#)MGX!X;&3&0s}F3q40ZmVM$(H3CLfpdL?hB6nVqMxX)q=1b}o_PG%r~hZ4gUfSp zOH4qlEOW4OMUc)_m)fMR_rl^pCfXc{$fQbI*E&mV77}kRF z&{<06AJyJ!e863o-V>FA1a9Eemx6>^F$~9ppt()ZbPGfg_NdRXBWoZnDy2;#ODgf! zgl?iOcF7Meo|{AF>KDwTgYrJLb$L2%%BEtO>T$C?|9bAB&}s;gI?lY#^tttY&hfr# zKhC+&b-rpg_?~uVK%S@mQleU#_xCsvIPK*<`E0fHE1&!J7!xD#IB|SSPW6-PyuqGn3^M^Rz%WT{e?OI^svARX&SAdU77V(C~ zM$H{Kg59op{<|8ry9ecfP%=kFm(-!W&?U0@<%z*+!*<e0XesMxRFu9QnGqun6R_%T+B%&9Dtk?*d$Q zb~>84jEAPi@&F@3wAa^Lzc(AJz5gsfZ7J53;@D<;Klpl?sK&u@gie`~vTsbOE~Cd4 z%kr56mI|#b(Jk&;p6plVwmNB0H@0SmgdmjIn5Ne@)}7Vty(yb2t3ev@22AE^s!KaN zyQ>j+F3w=wnx7w@FVCRe+`vUH)3gW%_72fxzqX!S&!dchdkRiHbXW1FMrIIBwjsai8`CB2r4mAbwp%rrO>3B$Zw;9=%fXI9B{d(UzVap7u z6piC-FQ)>}VOEuPpuqznpY`hN4dGa_1Xz9rVg(;H$5Te^F0dDv*gz9JS<|>>U0J^# z6)(4ICh+N_Q`Ft0hF|3fSHs*?a=XC;e`sJaU9&d>X4l?1W=|fr!5ShD|nv$GK;j46@BV6+{oRbWfqOBRb!ir88XD*SbC(LF}I1h#6@dvK%Toe%@ zhDyG$93H8Eu&gCYddP58iF3oQH*zLbNI;rN@E{T9%A8!=v#JLxKyUe}e}BJpB{~uN zqgxRgo0*-@-iaHPV8bTOH(rS(huwK1Xg0u+e!`(Irzu@Bld&s5&bWgVc@m7;JgELd zimVs`>vQ}B_1(2#rv#N9O`fJpVfPc7V2nv34PC);Dzbb;p!6pqHzvy?2pD&1NE)?A zt(t-ucqy@wn9`^MN5apa7K|L=9>ISC>xoc#>{@e}m#YAAa1*8-RUMKwbm|;5p>T`Z zNf*ph@tnF{gmDa3uwwN(g=`Rh)4!&)^oOy@VJaK4lMT&5#YbXkl`q?<*XtsqD z9PRK6bqb)fJw0g-^a@nu`^?71k|m3RPRjt;pIkCo1{*pdqbVs-Yl>4E>3fZx3Sv44grW=*qdSoiZ9?X0wWyO4`yDHh2E!9I!ZFi zVL8|VtW38}BOJHW(Ax#KL_KQzarbuE{(%TA)AY)@tY4%A%P%SqIU~8~-Lp3qY;U-} z`h_Gel7;K1h}7$_5ZZT0&%$Lxxr-<89V&&TCsu}LL#!xpQ1O31jaa{U34~^le*Y%L za?7$>Jk^k^pS^_M&cDs}NgXlR>16AHkSK-4TRaJSh#h&p!-!vQY%f+bmn6x`4fwTp z$727L^y`~!exvmE^W&#@uY!NxJi`g!i#(++!)?iJ(1)2Wk;RN zFK&O4eTkP$Xn~4bB|q8y(btx$R#D`O@epi4ofcETrx!IM(kWNEe42Qh(8*KqfP(c0 zouBl6>Fc_zM+V;F3znbo{x#%!?mH3`_ANJ?y7ppxS@glg#S9^MXu|FM&ynpz3o&Qh z2ujAHLF3($pH}0jXQsa#?t--TnF1P73b?4`KeJ9^qK-USHE)4!IYgMn-7z|=ALF5SNGkrtPG@Y~niUQV2?g$vzJN3nZ{7;HZHzWAeQ;5P|@Tl3YHpyznGG4-f4=XflwSJY+58-+wf?~Fg@1p1wkzuu-RF3j2JX37SQUc? zQ4v%`V8z9ZVZVqS8h|@@RpD?n0W<=hk=3Cf8R?d^9YK&e9ZybFY%jdnA)PeHvtBe- zhMLD+SSteHBq*q)d6x{)s1UrsO!byyLS$58WK;sqip$Mk{l)Y(_6hEIBsIjCr5t>( z7CdKUrJTrW%qZ#1z^n*Lb8#VdfzPw~OIL76aC+Rhr<~;4Tl!sw?Rj6hXj4XWa#6Tp z@)kJ~qOV)^Rh*-?aG>ic2*NlC2M7&LUzc9RT6WM%Cpe78`iAowe!>(T0jo&ivn8-7 zs{Qa@cGy$rE-3AY0V(l8wjI^uB8Lchj@?L}fYal^>T9z;8juH@?rG&g-t+R2dVDBe zq!K%{e-rT5jX19`(bP23LUN4+_zh2KD~EAYzhpEO3MUG8@}uBHH@4J zd`>_(K4q&>*k82(dDuC)X6JuPrBBubOg7qZ{?x!r@{%0);*`h*^F|%o?&1wX?Wr4b z1~&cy#PUuES{C#xJ84!z<1tp9sfrR(i%Tu^jnXy;4`Xk;AQCdFC@?V%|; zySdC7qS|uQRcH}EFZH%mMB~7gi}a0utE}ZE_}8PQH8f;H%PN41Cb9R%w5Oi5el^fd z$n{3SqLCnrF##x?4sa^r!O$7NX!}&}V;0ZGQ&K&i%6$3C_dR%I7%gdQ;KT6YZiQrW zk%q<74oVBV>@}CvJ4Wj!d^?#Zwq(b$E1ze4$99DuNg?6t9H}k_|D7KWD7i0-g*EO7 z;5{hSIYE4DMOK3H%|f5Edx+S0VI0Yw!tsaRS2&Il2)ea^8R5TG72BrJue|f_{2UHa z@w;^c|K3da#$TB0P3;MPlF7RuQeXT$ zS<<|C0OF(k)>fr&wOB=gP8!Qm>F41u;3esv7_0l%QHt(~+n; zf!G6%hp;Gfa9L9=AceiZs~tK+Tf*Wof=4!u{nIO90jH@iS0l+#%8=~%ASzFv7zqSB^?!@N7)kp0t&tCGLmzXSRMRyxCmCYUD2!B`? zhs$4%KO~m=VFk3Buv9osha{v+mAEq=ik3RdK@;WWTV_g&-$U4IM{1IhGX{pAu%Z&H zFfwCpUsX%RKg);B@7OUzZ{Hn{q6Vv!3#8fAg!P$IEx<0vAx;GU%}0{VIsmFBPq_mb zpe^BChDK>sc-WLKl<6 zwbW|e&d&dv9Wu0goueyu>(JyPx1mz0v4E?cJjFuKF71Q1)AL8jHO$!fYT3(;U3Re* zPPOe%*O+@JYt1bW`!W_1!mN&=w3G9ru1XsmwfS~BJ))PhD(+_J_^N6j)sx5VwbWK| zwRyC?W<`pOCY)b#AS?rluxuuGf-AJ=D!M36l{ua?@SJ5>e!IBr3CXIxWw5xUZ@Xrw z_R@%?{>d%Ld4p}nEsiA@v*nc6Ah!MUs?GA7e5Q5lPpp0@`%5xY$C;{%rz24$;vR#* zBP=a{)K#CwIY%p} zXVdxTQ^HS@O&~eIftU+Qt^~(DGxrdi3k}DdT^I7Iy5SMOp$QuD8s;+93YQ!OY{eB24%xY7ml@|M7I(Nb@K_-?F;2?et|CKkuZK_>+>Lvg!>JE~wN`BI|_h6$qi!P)+K-1Hh(1;a`os z55)4Q{oJiA(lQM#;w#Ta%T0jDNXIPM_bgESMCDEg6rM33anEr}=|Fn6)|jBP6Y}u{ zv9@%7*#RI9;fv;Yii5CI+KrRdr0DKh=L>)eO4q$1zmcSmglsV`*N(x=&Wx`*v!!hn6X-l0 zP_m;X??O(skcj+oS$cIdKhfT%ABAzz3w^la-Ucw?yBPEC+=Pe_vU8nd-HV5YX6X8r zZih&j^eLU=%*;VzhUyoLF;#8QsEfmByk+Y~caBqSvQaaWf2a{JKB9B>V&r?l^rXaC z8)6AdR@Qy_BxQrE2Fk?ewD!SwLuMj@&d_n5RZFf7=>O>hzVE*seW3U?_p|R^CfoY`?|#x9)-*yjv#lo&zP=uI`M?J zbzC<^3x7GfXA4{FZ72{PE*-mNHyy59Q;kYG@BB~NhTd6pm2Oj=_ zizmD?MKVRkT^KmXuhsk?eRQllPo2Ubk=uCKiZ&u3Xjj~<(!M94c)Tez@9M1Gfs5JV z->@II)CDJOXTtPrQudNjE}Eltbjq>6KiwAwqvAKd^|g!exgLG3;wP+#mZYr`cy3#39e653d=jrR-ulW|h#ddHu(m9mFoW~2yE zz5?dB%6vF}+`-&-W8vy^OCxm3_{02royjvmwjlp+eQDzFVEUiyO#gLv%QdDSI#3W* z?3!lL8clTaNo-DVJw@ynq?q!%6hTQi35&^>P85G$TqNt78%9_sSJt2RThO|JzM$iL zg|wjxdMC2|Icc5rX*qPL(coL!u>-xxz-rFiC!6hD1IR%|HSRsV3>Kq~&vJ=s3M5y8SG%YBQ|{^l#LGlg!D?E>2yR*eV%9m$_J6VGQ~AIh&P$_aFbh zULr0Z$QE!QpkP=aAeR4ny<#3Fwyw@rZf4?Ewq`;mCVv}xaz+3ni+}a=k~P+yaWt^L z@w67!DqVf7D%7XtXX5xBW;Co|HvQ8WR1k?r2cZD%U;2$bsM%u8{JUJ5Z0k= zZJARv^vFkmWx15CB=rb=D4${+#DVqy5$C%bf`!T0+epLJLnh1jwCdb*zuCL}eEFvE z{rO1%gxg>1!W(I!owu*mJZ0@6FM(?C+d*CeceZRW_4id*D9p5nzMY&{mWqrJomjIZ z97ZNnZ3_%Hx8dn;H>p8m7F#^2;T%yZ3H;a&N7tm=Lvs&lgJLW{V1@h&6Vy~!+Ffbb zv(n3+v)_D$}dqd!2>Y2B)#<+o}LH#%ogGi2-?xRIH)1!SD)u-L65B&bsJTC=LiaF+YOCif2dUX6uAA|#+vNR z>U+KQekVGon)Yi<93(d!(yw1h3&X0N(PxN2{%vn}cnV?rYw z$N^}_o!XUB!mckL`yO1rnUaI4wrOeQ(+&k?2mi47hzxSD`N#-byqd1IhEoh!PGq>t z_MRy{5B0eKY>;Ao3z$RUU7U+i?iX^&r739F)itdrTpAi-NN0=?^m%?{A9Ly2pVv>Lqs6moTP?T2-AHqFD-o_ znVr|7OAS#AEH}h8SRPQ@NGG47dO}l=t07__+iK8nHw^(AHx&Wb<%jPc$$jl6_p(b$ z)!pi(0fQodCHfM)KMEMUR&UID>}m^(!{C^U7sBDOA)$VThRCI0_+2=( zV8mMq0R(#z;C|7$m>$>`tX+T|xGt(+Y48@ZYu#z;0pCgYgmMVbFb!$?%yhZqP_nhn zy4<#3P1oQ#2b51NU1mGnHP$cf0j-YOgAA}A$QoL6JVLcmExs(kU{4z;PBHJD%_=0F z>+sQV`mzijSIT7xn%PiDKHOujX;n|M&qr1T@rOxTdxtZ!&u&3HHFLYD5$RLQ=heur zb>+AFokUVQeJy-#LP*^)spt{mb@Mqe=A~-4p0b+Bt|pZ+@CY+%x}9f}izU5;4&QFE zO1bhg&A4uC1)Zb67kuowWY4xbo&J=%yoXlFB)&$d*-}kjBu|w!^zbD1YPc0-#XTJr z)pm2RDy%J3jlqSMq|o%xGS$bPwn4AqitC6&e?pqWcjWPt{3I{>CBy;hg0Umh#c;hU3RhCUX=8aR>rmd` z7Orw(5tcM{|-^J?ZAA9KP|)X6n9$-kvr#j5YDecTM6n z&07(nD^qb8hpF0B^z^pQ*%5ePYkv&FabrlI61ntiVp!!C8y^}|<2xgAd#FY=8b*y( zuQOuvy2`Ii^`VBNJB&R!0{hABYX55ooCAJSSevl4RPqEGb)iy_0H}v@vFwFzD%>#I>)3PsouQ+_Kkbqy*kKdHdfkN7NBcq%V{x^fSxgXpg7$bF& zj!6AQbDY(1u#1_A#1UO9AxiZaCVN2F0wGXdY*g@x$ByvUA?ePdide0dmr#}udE%K| z3*k}Vv2Ew2u1FXBaVA6aerI36R&rzEZeDDCl5!t0J=ug6kuNZzH>3i_VN`%BsaVB3 zQYw|Xub_SGf{)F{$ZX5`Jc!X!;eybjP+o$I{Z^Hsj@D=E{MnnL+TbC@HEU2DjG{3-LDGIbq()U87x4eS;JXnSh;lRlJ z>EL3D>wHt-+wTjQF$fGyDO$>d+(fq@bPpLBS~xA~R=3JPbS{tzN(u~m#Po!?H;IYv zE;?8%^vle|%#oux(Lj!YzBKv+Fd}*Ur-dCBoX*t{KeNM*n~ZPYJ4NNKkI^MFbz9!v z4(Bvm*Kc!-$%VFEewYJKz-CQN{`2}KX4*CeJEs+Q(!kI%hN1!1P6iOq?ovz}X0IOi z)YfWpwW@pK08^69#wSyCZkX9?uZD?C^@rw^Y?gLS_xmFKkooyx$*^5#cPqntNTtSG zlP>XLMj2!VF^0k#ole7`-c~*~+_T5ls?x4)ah(j8vo_ zwb%S8qoaZqY0-$ZI+ViIA_1~~rAH7K_+yFS{0rT@eQtTAdz#8E5VpwnW!zJ_^{Utv zlW5Iar3V5t&H4D6A=>?mq;G92;1cg9a2sf;gY9pJDVKn$DYdQlvfXq}zz8#LyPGq@ z+`YUMD;^-6w&r-82JL7mA8&M~Pj@aK!m{0+^v<|t%APYf7`}jGEhdYLqsHW-Le9TL z_hZZ1gbrz7$f9^fAzVIP30^KIz!!#+DRLL+qMszvI_BpOSmjtl$hh;&UeM{ER@INV zcI}VbiVTPoN|iSna@=7XkP&-4#06C};8ajbxJ4Gcq8(vWv4*&X8bM^T$mBk75Q92j z1v&%a;OSKc8EIrodmIiw$lOES2hzGDcjjB`kEDfJe{r}yE6`eZL zEB`9u>Cl0IsQ+t}`-cx}{6jqcANucqIB>Qmga_&<+80E2Q|VHHQ$YlAt{6`Qu`HA3 z03s0-sSlwbvgi&_R8s={6<~M^pGvBNjKOa>tWenzS8s zR>L7R5aZ=mSU{f?ib4Grx$AeFvtO5N|D>9#)ChH#Fny2maHWHOf2G=#<9Myot#+4u zWVa6d^Vseq_0=#AYS(-m$Lp;*8nC_6jXIjEM`omUmtH@QDs3|G)i4j*#_?#UYVZvJ z?YjT-?!4Q{BNun;dKBWLEw2C-VeAz`%?A>p;)PL}TAZn5j~HK>v1W&anteARlE+~+ zj>c(F;?qO3pXBb|#OZdQnm<4xWmn~;DR5SDMxt0UK_F^&eD|KZ=O;tO3vy4@4h^;2 zUL~-z`-P1aOe?|ZC1BgVsL)2^J-&vIFI%q@40w0{jjEfeVl)i9(~bt2z#2Vm)p`V_ z1;6$Ae7=YXk#=Qkd24Y23t&GvRxaOoad~NbJ+6pxqzJ>FY#Td7@`N5xp!n(c!=RE& z&<<@^a$_Ys8jqz4|5Nk#FY$~|FPC0`*a5HH!|Gssa9=~66&xG9)|=pOOJ2KE5|YrR zw!w6K2aC=J$t?L-;}5hn6mHd%hC;p8P|Dgh6D>hGnXPgi;6r+eA=?f72y9(Cf_ho{ zH6#)uD&R=73^$$NE;5piWX2bzR67fQ)`b=85o0eOLGI4c-Tb@-KNi2pz=Ke@SDcPn za$AxXib84`!Sf;Z3B@TSo`Dz7GM5Kf(@PR>Ghzi=BBxK8wRp>YQoXm+iL>H*Jo9M3 z6w&E?BC8AFTFT&Tv8zf+m9<&S&%dIaZ)Aoqkak_$r-2{$d~0g2oLETx9Y`eOAf14QXEQw3tJne;fdzl@wV#TFXSLXM2428F-Q}t+n2g%vPRMUzYPvzQ9f# zu(liiJem9P*?0%V@RwA7F53r~|I!Ty)<*AsMX3J{_4&}{6pT%Tpw>)^|DJ)>gpS~1rNEh z0$D?uO8mG?H;2BwM5a*26^7YO$XjUm40XmBsb63MoR;bJh63J;OngS5sSI+o2HA;W zdZV#8pDpC9Oez&L8loZO)MClRz!_!WD&QRtQxnazhT%Vj6Wl4G11nUk8*vSeVab@N#oJ}`KyJv+8Mo@T1-pqZ1t|?cnaVOd;1(h9 z!$DrN=jcGsVYE-0-n?oCJ^4x)F}E;UaD-LZUIzcD?W^ficqJWM%QLy6QikrM1aKZC zi{?;oKwq^Vsr|&`i{jIphA8S6G4)$KGvpULjH%9u(Dq247;R#l&I0{IhcC|oBF*Al zvLo7Xte=C{aIt*otJD}BUq)|_pdR>{zBMT< z(^1RpZv*l*m*OV^8>9&asGBo8h*_4q*)-eCv*|Pq=XNGrZE)^(SF7^{QE_~4VDB(o zVcPA_!G+2CAtLbl+`=Q~9iW`4ZRLku!uB?;tWqVjB0lEOf}2RD7dJ=BExy=<9wkb- z9&7{XFA%n#JsHYN8t5d~=T~5DcW4$B%3M+nNvC2`0!#@sckqlzo5;hhGi(D9=*A4` z5ynobawSPRtWn&CDLEs3Xf`(8^zDP=NdF~F^s&={l7(aw&EG}KWpMjtmz7j_VLO;@ zM2NVLDxZ@GIv7*gzl1 zjq78tv*8#WSY`}Su0&C;2F$Ze(q>F(@Wm^Gw!)(j;dk9Ad{STaxn)IV9FZhm*n+U} zi;4y*3v%A`_c7a__DJ8D1b@dl0Std3F||4Wtvi)fCcBRh!X9$1x!_VzUh>*S5s!oq z;qd{J_r79EL2wIeiGAqFstWtkfIJpjVh%zFo*=55B9Zq~y0=^iqHWfQl@O!Ak;(o*m!pZqe9 z%U2oDOhR)BvW8&F70L;2TpkzIutIvNQaTjjs5V#8mV4!NQ}zN=i`i@WI1z0eN-iCS z;vL-Wxc^Vc_qK<5RPh(}*8dLT{~GzE{w2o$2kMFaEl&q zP{V=>&3kW7tWaK-Exy{~`v4J0U#OZBk{a9{&)&QG18L@6=bsZ1zC_d{{pKZ-Ey>I> z;8H0t4bwyQqgu4hmO`3|4K{R*5>qnQ&gOfdy?z`XD%e5+pTDzUt3`k^u~SaL&XMe= z9*h#kT(*Q9jO#w2Hd|Mr-%DV8i_1{J1MU~XJ3!WUplhXDYBpJH><0OU`**nIvPIof z|N8@I=wA)sf45SAvx||f?Z5uB$kz1qL3Ky_{%RPdP5iN-D2!p5scq}buuC00C@jom zhfGKm3|f?Z0iQ|K$Z~!`8{nmAS1r+fp6r#YDOS8V*;K&Gs7Lc&f^$RC66O|)28oh`NHy&vq zJh+hAw8+ybTB0@VhWN^0iiTnLsCWbS_y`^gs!LX!Lw{yE``!UVzrV24tP8o;I6-65 z1MUiHw^{bB15tmrVT*7-#sj6cs~z`wk52YQJ*TG{SE;KTm#Hf#a~|<(|ImHH17nNM z`Ub{+J3dMD!)mzC8b(2tZtokKW5pAwHa?NFiso~# z1*iaNh4lQ4TS)|@G)H4dZV@l*Vd;Rw;-;odDhW2&lJ%m@jz+Panv7LQm~2Js6rOW3 z0_&2cW^b^MYW3)@o;neZ<{B4c#m48dAl$GCc=$>ErDe|?y@z`$uq3xd(%aAsX)D%l z>y*SQ%My`yDP*zof|3@_w#cjaW_YW4BdA;#Glg1RQcJGY*CJ9`H{@|D+*e~*457kd z73p<%fB^PV!Ybw@)Dr%(ZJbX}xmCStCYv#K3O32ej{$9IzM^I{6FJ8!(=azt7RWf4 z7ib0UOPqN40X!wOnFOoddd8`!_IN~9O)#HRTyjfc#&MCZ zZAMzOVB=;qwt8gV?{Y2?b=iSZG~RF~uyx18K)IDFLl})G1v@$(s{O4@RJ%OTJyF+Cpcx4jmy|F3euCnMK!P2WTDu5j z{{gD$=M*pH!GGzL%P)V2*ROm>!$Y=z|D`!_yY6e7SU$~a5q8?hZGgaYqaiLnkK%?0 zs#oI%;zOxF@g*@(V4p!$7dS1rOr6GVs6uYCTt2h)eB4?(&w8{#o)s#%gN@BBosRUe z)@P@8_Zm89pr~)b>e{tbPC~&_MR--iB{=)y;INU5#)@Gix-YpgP<-c2Ms{9zuCX|3 z!p(?VaXww&(w&uBHzoT%!A2=3HAP>SDxcljrego7rY|%hxy3XlODWffO_%g|l+7Y_ zqV(xbu)s4lV=l7M;f>vJl{`6qBm>#ZeMA}kXb97Z)?R97EkoI?x6Lp0yu1Z>PS?2{ z0QQ(8D)|lc9CO3B~e(pQM&5(1y&y=e>C^X$`)_&XuaI!IgDTVqt31wX#n+@!a_A0ZQkA zCJ2@M_4Gb5MfCrm5UPggeyh)8 zO9?`B0J#rkoCx(R0I!ko_2?iO@|oRf1;3r+i)w-2&j?=;NVIdPFsB)`|IC0zk6r9c zRrkfxWsiJ(#8QndNJj@{@WP2Ackr|r1VxV{7S&rSU(^)-M8gV>@UzOLXu9K<{6e{T zXJ6b92r$!|lwjhmgqkdswY&}c)KW4A)-ac%sU;2^fvq7gfUW4Bw$b!i@duy1CAxSn z(pyh$^Z=&O-q<{bZUP+$U}=*#M9uVc>CQVgDs4swy5&8RAHZ~$)hrTF4W zPsSa~qYv_0mJnF89RnnJTH`3}w4?~epFl=D(35$ zWa07ON$`OMBOHgCmfO(9RFc<)?$x)N}Jd2A(<*Ll7+4jrRt9w zwGxExUXd9VB#I|DwfxvJ;HZ8Q{37^wDhaZ%O!oO(HpcqfLH%#a#!~;Jl7F5>EX_=8 z{()l2NqPz>La3qJR;_v+wlK>GsHl;uRA8%j`A|yH@k5r%55S9{*Cp%uw6t`qc1!*T za2OeqtQj7sAp#Q~=5Fs&aCR9v>5V+s&RdNvo&H~6FJOjvaj--2sYYBvMq;55%z8^o z|BJDA4vzfow#DO#ZQHh;Oq_{r+qP{R9ox2TOgwQiv7Ow!zjN+A@BN;0tA2lUb#+zO z(^b89eV)D7UVE+h{mcNc6&GtpOqDn_?VAQ)Vob$hlFwW%xh>D#wml{t&Ofmm_d_+; zKDxzdr}`n2Rw`DtyIjrG)eD0vut$}dJAZ0AohZ+ZQdWXn_Z@dI_y=7t3q8x#pDI-K z2VVc&EGq445Rq-j0=U=Zx`oBaBjsefY;%)Co>J3v4l8V(T8H?49_@;K6q#r~Wwppc z4XW0(4k}cP=5ex>-Xt3oATZ~bBWKv)aw|I|Lx=9C1s~&b77idz({&q3T(Y(KbWO?+ zmcZ6?WeUsGk6>km*~234YC+2e6Zxdl~<_g2J|IE`GH%n<%PRv-50; zH{tnVts*S5*_RxFT9eM0z-pksIb^drUq4>QSww=u;UFCv2AhOuXE*V4z?MM`|ABOC4P;OfhS(M{1|c%QZ=!%rQTDFx`+}?Kdx$&FU?Y<$x;j7z=(;Lyz+?EE>ov!8vvMtSzG!nMie zsBa9t8as#2nH}n8xzN%W%U$#MHNXmDUVr@GX{?(=yI=4vks|V)!-W5jHsU|h_&+kY zS_8^kd3jlYqOoiI`ZqBVY!(UfnAGny!FowZWY_@YR0z!nG7m{{)4OS$q&YDyw6vC$ zm4!$h>*|!2LbMbxS+VM6&DIrL*X4DeMO!@#EzMVfr)e4Tagn~AQHIU8?e61TuhcKD zr!F4(kEebk(Wdk-?4oXM(rJwanS>Jc%<>R(siF+>+5*CqJLecP_we33iTFTXr6W^G z7M?LPC-qFHK;E!fxCP)`8rkxZyFk{EV;G-|kwf4b$c1k0atD?85+|4V%YATWMG|?K zLyLrws36p%Qz6{}>7b>)$pe>mR+=IWuGrX{3ZPZXF3plvuv5Huax86}KX*lbPVr}L z{C#lDjdDeHr~?l|)Vp_}T|%$qF&q#U;ClHEPVuS+Jg~NjC1RP=17=aQKGOcJ6B3mp z8?4*-fAD~}sX*=E6!}^u8)+m2j<&FSW%pYr_d|p_{28DZ#Cz0@NF=gC-o$MY?8Ca8 zr5Y8DSR^*urS~rhpX^05r30Ik#2>*dIOGxRm0#0YX@YQ%Mg5b6dXlS!4{7O_kdaW8PFSdj1=ryI-=5$fiieGK{LZ+SX(1b=MNL!q#lN zv98?fqqTUH8r8C7v(cx#BQ5P9W>- zmW93;eH6T`vuJ~rqtIBg%A6>q>gnWb3X!r0wh_q;211+Om&?nvYzL1hhtjB zK_7G3!n7PL>d!kj){HQE zE8(%J%dWLh1_k%gVXTZt zEdT09XSKAx27Ncaq|(vzL3gm83q>6CAw<$fTnMU05*xAe&rDfCiu`u^1)CD<>sx0i z*hr^N_TeN89G(nunZoLBf^81#pmM}>JgD@Nn1l*lN#a=B=9pN%tmvYFjFIoKe_(GF z-26x{(KXdfsQL7Uv6UtDuYwV`;8V3w>oT_I<`Ccz3QqK9tYT5ZQzbop{=I=!pMOCb zCU68`n?^DT%^&m>A%+-~#lvF!7`L7a{z<3JqIlk1$<||_J}vW1U9Y&eX<}l8##6i( zZcTT@2`9(Mecptm@{3A_Y(X`w9K0EwtPq~O!16bq{7c0f7#(3wn-^)h zxV&M~iiF!{-6A@>o;$RzQ5A50kxXYj!tcgme=Qjrbje~;5X2xryU;vH|6bE(8z^<7 zQ>BG7_c*JG8~K7Oe68i#0~C$v?-t@~@r3t2inUnLT(c=URpA9kA8uq9PKU(Ps(LVH zqgcqW>Gm?6oV#AldDPKVRcEyQIdTT`Qa1j~vS{<;SwyTdr&3*t?J)y=M7q*CzucZ&B0M=joT zBbj@*SY;o2^_h*>R0e({!QHF0=)0hOj^B^d*m>SnRrwq>MolNSgl^~r8GR#mDWGYEIJA8B<|{{j?-7p zVnV$zancW3&JVDtVpIlI|5djKq0(w$KxEFzEiiL=h5Jw~4Le23@s(mYyXWL9SX6Ot zmb)sZaly_P%BeX_9 zw&{yBef8tFm+%=--m*J|o~+Xg3N+$IH)t)=fqD+|fEk4AAZ&!wcN5=mi~Vvo^i`}> z#_3ahR}Ju)(Px7kev#JGcSwPXJ2id9%Qd2A#Uc@t8~egZ8;iC{e! z%=CGJOD1}j!HW_sgbi_8suYnn4#Ou}%9u)dXd3huFIb!ytlX>Denx@pCS-Nj$`VO&j@(z!kKSP0hE4;YIP#w9ta=3DO$7f*x zc9M4&NK%IrVmZAe=r@skWD`AEWH=g+r|*13Ss$+{c_R!b?>?UaGXlw*8qDmY#xlR= z<0XFbs2t?8i^G~m?b|!Hal^ZjRjt<@a? z%({Gn14b4-a|#uY^=@iiKH+k?~~wTj5K1A&hU z2^9-HTC)7zpoWK|$JXaBL6C z#qSNYtY>65T@Zs&-0cHeu|RX(Pxz6vTITdzJdYippF zC-EB+n4}#lM7`2Ry~SO>FxhKboIAF#Z{1wqxaCb{#yEFhLuX;Rx(Lz%T`Xo1+a2M}7D+@wol2)OJs$TwtRNJ={( zD@#zTUEE}#Fz#&(EoD|SV#bayvr&E0vzmb%H?o~46|FAcx?r4$N z&67W3mdip-T1RIxwSm_&(%U|+WvtGBj*}t69XVd&ebn>KOuL(7Y8cV?THd-(+9>G7*Nt%T zcH;`p={`SOjaf7hNd(=37Lz3-51;58JffzIPgGs_7xIOsB5p2t&@v1mKS$2D$*GQ6 zM(IR*j4{nri7NMK9xlDy-hJW6sW|ZiDRaFiayj%;(%51DN!ZCCCXz+0Vm#};70nOx zJ#yA0P3p^1DED;jGdPbQWo0WATN=&2(QybbVdhd=Vq*liDk`c7iZ?*AKEYC#SY&2g z&Q(Ci)MJ{mEat$ZdSwTjf6h~roanYh2?9j$CF@4hjj_f35kTKuGHvIs9}Re@iKMxS-OI*`0S z6s)fOtz}O$T?PLFVSeOjSO26$@u`e<>k(OSP!&YstH3ANh>)mzmKGNOwOawq-MPXe zy4xbeUAl6tamnx))-`Gi2uV5>9n(73yS)Ukma4*7fI8PaEwa)dWHs6QA6>$}7?(L8 ztN8M}?{Tf!Zu22J5?2@95&rQ|F7=FK-hihT-vDp!5JCcWrVogEnp;CHenAZ)+E+K5 z$Cffk5sNwD_?4+ymgcHR(5xgt20Z8M`2*;MzOM#>yhk{r3x=EyM226wb&!+j`W<%* zSc&|`8!>dn9D@!pYow~(DsY_naSx7(Z4i>cu#hA5=;IuI88}7f%)bRkuY2B;+9Uep zpXcvFWkJ!mQai63BgNXG26$5kyhZ2&*3Q_tk)Ii4M>@p~_~q_cE!|^A;_MHB;7s#9 zKzMzK{lIxotjc};k67^Xsl-gS!^*m*m6kn|sbdun`O?dUkJ{0cmI0-_2y=lTAfn*Y zKg*A-2sJq)CCJgY0LF-VQvl&6HIXZyxo2#!O&6fOhbHXC?%1cMc6y^*dOS{f$=137Ds1m01qs`>iUQ49JijsaQ( zksqV9@&?il$|4Ua%4!O15>Zy&%gBY&wgqB>XA3!EldQ%1CRSM(pp#k~-pkcCg4LAT zXE=puHbgsw)!xtc@P4r~Z}nTF=D2~j(6D%gTBw$(`Fc=OOQ0kiW$_RDd=hcO0t97h zb86S5r=>(@VGy1&#S$Kg_H@7G^;8Ue)X5Y+IWUi`o;mpvoV)`fcVk4FpcT|;EG!;? zHG^zrVVZOm>1KFaHlaogcWj(v!S)O(Aa|Vo?S|P z5|6b{qkH(USa*Z7-y_Uvty_Z1|B{rTS^qmEMLEYUSk03_Fg&!O3BMo{b^*`3SHvl0 zhnLTe^_vVIdcSHe)SQE}r~2dq)VZJ!aSKR?RS<(9lzkYo&dQ?mubnWmgMM37Nudwo z3Vz@R{=m2gENUE3V4NbIzAA$H1z0pagz94-PTJyX{b$yndsdKptmlKQKaaHj@3=ED zc7L?p@%ui|RegVYutK$64q4pe9+5sv34QUpo)u{1ci?)_7gXQd{PL>b0l(LI#rJmN zGuO+%GO`xneFOOr4EU(Wg}_%bhzUf;d@TU+V*2#}!2OLwg~%D;1FAu=Un>OgjPb3S z7l(riiCwgghC=Lm5hWGf5NdGp#01xQ59`HJcLXbUR3&n%P(+W2q$h2Qd z*6+-QXJ*&Kvk9ht0f0*rO_|FMBALen{j7T1l%=Q>gf#kma zQlg#I9+HB+z*5BMxdesMND`_W;q5|FaEURFk|~&{@qY32N$G$2B=&Po{=!)x5b!#n zxLzblkq{yj05#O7(GRuT39(06FJlalyv<#K4m}+vs>9@q-&31@1(QBv82{}Zkns~K ze{eHC_RDX0#^A*JQTwF`a=IkE6Ze@j#-8Q`tTT?k9`^ZhA~3eCZJ-Jr{~7Cx;H4A3 zcZ+Zj{mzFZbVvQ6U~n>$U2ZotGsERZ@}VKrgGh0xM;Jzt29%TX6_&CWzg+YYMozrM z`nutuS)_0dCM8UVaKRj804J4i%z2BA_8A4OJRQ$N(P9Mfn-gF;4#q788C@9XR0O3< zsoS4wIoyt046d+LnSCJOy@B@Uz*#GGd#+Ln1ek5Dv>(ZtD@tgZlPnZZJGBLr^JK+!$$?A_fA3LOrkoDRH&l7 zcMcD$Hsjko3`-{bn)jPL6E9Ds{WskMrivsUu5apD z?grQO@W7i5+%X&E&p|RBaEZ(sGLR@~(y^BI@lDMot^Ll?!`90KT!JXUhYS`ZgX3jnu@Ja^seA*M5R@f`=`ynQV4rc$uT1mvE?@tz)TN<=&H1%Z?5yjxcpO+6y_R z6EPuPKM5uxKpmZfT(WKjRRNHs@ib)F5WAP7QCADvmCSD#hPz$V10wiD&{NXyEwx5S z6NE`3z!IS^$s7m}PCwQutVQ#~w+V z=+~->DI*bR2j0^@dMr9`p>q^Ny~NrAVxrJtX2DUveic5vM%#N*XO|?YAWwNI$Q)_) zvE|L(L1jP@F%gOGtnlXtIv2&1i8q<)Xfz8O3G^Ea~e*HJsQgBxWL(yuLY+jqUK zRE~`-zklrGog(X}$9@ZVUw!8*=l`6mzYLtsg`AvBYz(cxmAhr^j0~(rzXdiOEeu_p zE$sf2(w(BPAvO5DlaN&uQ$4@p-b?fRs}d7&2UQ4Fh?1Hzu*YVjcndqJLw0#q@fR4u zJCJ}>_7-|QbvOfylj+e^_L`5Ep9gqd>XI3-O?Wp z-gt*P29f$Tx(mtS`0d05nHH=gm~Po_^OxxUwV294BDKT>PHVlC5bndncxGR!n(OOm znsNt@Q&N{TLrmsoKFw0&_M9$&+C24`sIXGWgQaz=kY;S{?w`z^Q0JXXBKFLj0w0U6P*+jPKyZHX9F#b0D1$&(- zrm8PJd?+SrVf^JlfTM^qGDK&-p2Kdfg?f>^%>1n8bu&byH(huaocL>l@f%c*QkX2i znl}VZ4R1en4S&Bcqw?$=Zi7ohqB$Jw9x`aM#>pHc0x z0$!q7iFu zZ`tryM70qBI6JWWTF9EjgG@>6SRzsd}3h+4D8d~@CR07P$LJ}MFsYi-*O%XVvD@yT|rJ+Mk zDllJ7$n0V&A!0flbOf)HE6P_afPWZmbhpliqJuw=-h+r;WGk|ntkWN(8tKlYpq5Ow z(@%s>IN8nHRaYb*^d;M(D$zGCv5C|uqmsDjwy4g=Lz>*OhO3z=)VD}C<65;`89Ye} zSCxrv#ILzIpEx1KdLPlM&%Cctf@FqTKvNPXC&`*H9=l=D3r!GLM?UV zOxa(8ZsB`&+76S-_xuj?G#wXBfDY@Z_tMpXJS7^mp z@YX&u0jYw2A+Z+bD#6sgVK5ZgdPSJV3>{K^4~%HV?rn~4D)*2H!67Y>0aOmzup`{D zzDp3c9yEbGCY$U<8biJ_gB*`jluz1ShUd!QUIQJ$*1;MXCMApJ^m*Fiv88RZ zFopLViw}{$Tyhh_{MLGIE2~sZ)t0VvoW%=8qKZ>h=adTe3QM$&$PO2lfqH@brt!9j ziePM8$!CgE9iz6B<6_wyTQj?qYa;eC^{x_0wuwV~W+^fZmFco-o%wsKSnjXFEx02V zF5C2t)T6Gw$Kf^_c;Ei3G~uC8SM-xyycmXyC2hAVi-IfXqhu$$-C=*|X?R0~hu z8`J6TdgflslhrmDZq1f?GXF7*ALeMmOEpRDg(s*H`4>_NAr`2uqF;k;JQ+8>A|_6ZNsNLECC%NNEb1Y1dP zbIEmNpK)#XagtL4R6BC{C5T(+=yA-(Z|Ap}U-AfZM#gwVpus3(gPn}Q$CExObJ5AC z)ff9Yk?wZ}dZ-^)?cbb9Fw#EjqQ8jxF4G3=L?Ra zg_)0QDMV1y^A^>HRI$x?Op@t;oj&H@1xt4SZ9(kifQ zb59B*`M99Td7@aZ3UWvj1rD0sE)d=BsBuW*KwkCds7ay(7*01_+L}b~7)VHI>F_!{ zyxg-&nCO?v#KOUec0{OOKy+sjWA;8rTE|Lv6I9H?CI?H(mUm8VXGwU$49LGpz&{nQp2}dinE1@lZ1iox6{ghN&v^GZv9J${7WaXj)<0S4g_uiJ&JCZ zr8-hsu`U%N;+9N^@&Q0^kVPB3)wY(rr}p7{p0qFHb3NUUHJb672+wRZs`gd1UjKPX z4o6zljKKA+Kkj?H>Ew63o%QjyBk&1!P22;MkD>sM0=z_s-G{mTixJCT9@_|*(p^bz zJ8?ZZ&;pzV+7#6Mn`_U-)k8Pjg?a;|Oe^us^PoPY$Va~yi8|?+&=y$f+lABT<*pZr zP}D{~Pq1Qyni+@|aP;ixO~mbEW9#c0OU#YbDZIaw=_&$K%Ep2f%hO^&P67hApZe`x zv8b`Mz@?M_7-)b!lkQKk)JXXUuT|B8kJlvqRmRpxtQDgvrHMXC1B$M@Y%Me!BSx3P z#2Eawl$HleZhhTS6Txm>lN_+I`>eV$&v9fOg)%zVn3O5mI*lAl>QcHuW6!Kixmq`X zBCZ*Ck6OYtDiK!N47>jxI&O2a9x7M|i^IagRr-fmrmikEQGgw%J7bO|)*$2FW95O4 zeBs>KR)izRG1gRVL;F*sr8A}aRHO0gc$$j&ds8CIO1=Gwq1%_~E)CWNn9pCtBE}+`Jelk4{>S)M)`Ll=!~gnn1yq^EX(+y*ik@3Ou0qU`IgYi3*doM+5&dU!cho$pZ zn%lhKeZkS72P?Cf68<#kll_6OAO26bIbueZx**j6o;I0cS^XiL`y+>{cD}gd%lux} z)3N>MaE24WBZ}s0ApfdM;5J_Ny}rfUyxfkC``Awo2#sgLnGPewK};dORuT?@I6(5~ z?kE)Qh$L&fwJXzK){iYx!l5$Tt|^D~MkGZPA}(o6f7w~O2G6Vvzdo*a;iXzk$B66$ zwF#;wM7A+(;uFG4+UAY(2`*3XXx|V$K8AYu#ECJYSl@S=uZW$ksfC$~qrrbQj4??z-)uz0QL}>k^?fPnJTPw% zGz)~?B4}u0CzOf@l^um}HZzbaIwPmb<)< zi_3@E9lc)Qe2_`*Z^HH;1CXOceL=CHpHS{HySy3T%<^NrWQ}G0i4e1xm_K3(+~oi$ zoHl9wzb?Z4j#90DtURtjtgvi7uw8DzHYmtPb;?%8vb9n@bszT=1qr)V_>R%s!92_` zfnHQPANx z<#hIjIMm#*(v*!OXtF+w8kLu`o?VZ5k7{`vw{Yc^qYclpUGIM_PBN1+c{#Vxv&E*@ zxg=W2W~JuV{IuRYw3>LSI1)a!thID@R=bU+cU@DbR^_SXY`MC7HOsCN z!dO4OKV7(E_Z8T#8MA1H`99?Z!r0)qKW_#|29X3#Jb+5+>qUidbeP1NJ@)(qi2S-X zao|f0_tl(O+$R|Qwd$H{_ig|~I1fbp_$NkI!0E;Y z6JrnU{1Ra6^on{9gUUB0mwzP3S%B#h0fjo>JvV~#+X0P~JV=IG=yHG$O+p5O3NUgG zEQ}z6BTp^Fie)Sg<){Z&I8NwPR(=mO4joTLHkJ>|Tnk23E(Bo`FSbPc05lF2-+)X? z6vV3*m~IBHTy*^E!<0nA(tCOJW2G4DsH7)BxLV8kICn5lu6@U*R`w)o9;Ro$i8=Q^V%uH8n3q=+Yf;SFRZu z!+F&PKcH#8cG?aSK_Tl@K9P#8o+jry@gdexz&d(Q=47<7nw@e@FFfIRNL9^)1i@;A z28+$Z#rjv-wj#heI|<&J_DiJ*s}xd-f!{J8jfqOHE`TiHHZVIA8CjkNQ_u;Ery^^t zl1I75&u^`1_q)crO+JT4rx|z2ToSC>)Or@-D zy3S>jW*sNIZR-EBsfyaJ+Jq4BQE4?SePtD2+jY8*%FsSLZ9MY>+wk?}}}AFAw)vr{ml)8LUG-y9>^t!{~|sgpxYc0Gnkg`&~R z-pilJZjr@y5$>B=VMdZ73svct%##v%wdX~9fz6i3Q-zOKJ9wso+h?VME7}SjL=!NUG{J?M&i!>ma`eoEa@IX`5G>B1(7;%}M*%-# zfhJ(W{y;>MRz!Ic8=S}VaBKqh;~7KdnGEHxcL$kA-6E~=!hrN*zw9N+_=odt<$_H_8dbo;0=42wcAETPCVGUr~v(`Uai zb{=D!Qc!dOEU6v)2eHSZq%5iqK?B(JlCq%T6av$Cb4Rko6onlG&?CqaX7Y_C_cOC3 zYZ;_oI(}=>_07}Oep&Ws7x7-R)cc8zfe!SYxJYP``pi$FDS)4Fvw5HH=FiU6xfVqIM!hJ;Rx8c0cB7~aPtNH(Nmm5Vh{ibAoU#J6 zImRCr?(iyu_4W_6AWo3*vxTPUw@vPwy@E0`(>1Qi=%>5eSIrp^`` zK*Y?fK_6F1W>-7UsB)RPC4>>Ps9)f+^MqM}8AUm@tZ->j%&h1M8s*s!LX5&WxQcAh z8mciQej@RPm?660%>{_D+7er>%zX_{s|$Z+;G7_sfNfBgY(zLB4Ey}J9F>zX#K0f6 z?dVNIeEh?EIShmP6>M+d|0wMM85Sa4diw1hrg|ITJ}JDg@o8y>(rF9mXk5M z2@D|NA)-7>wD&wF;S_$KS=eE84`BGw3g0?6wGxu8ys4rwI?9U=*^VF22t3%mbGeOh z`!O-OpF7#Vceu~F`${bW0nYVU9ecmk31V{tF%iv&5hWofC>I~cqAt@u6|R+|HLMMX zVxuSlMFOK_EQ86#E8&KwxIr8S9tj_goWtLv4f@!&h8;Ov41{J~496vp9vX=(LK#j! zAwi*21RAV-LD>9Cw3bV_9X(X3)Kr0-UaB*7Y>t82EQ%!)(&(XuAYtTsYy-dz+w=$ir)VJpe!_$ z6SGpX^i(af3{o=VlFPC);|J8#(=_8#vdxDe|Cok+ANhYwbE*FO`Su2m1~w+&9<_9~ z-|tTU_ACGN`~CNW5WYYBn^B#SwZ(t4%3aPp z;o)|L6Rk569KGxFLUPx@!6OOa+5OjQLK5w&nAmwxkC5rZ|m&HT8G%GVZxB_@ME z>>{rnXUqyiJrT(8GMj_ap#yN_!9-lO5e8mR3cJiK3NE{_UM&=*vIU`YkiL$1%kf+1 z4=jk@7EEj`u(jy$HnzE33ZVW_J4bj}K;vT?T91YlO(|Y0FU4r+VdbmQ97%(J5 zkK*Bed8+C}FcZ@HIgdCMioV%A<*4pw_n}l*{Cr4}a(lq|injK#O?$tyvyE`S%(1`H z_wwRvk#13ElkZvij2MFGOj`fhy?nC^8`Zyo%yVcUAfEr8x&J#A{|moUBAV_^f$hpaUuyQeY3da^ zS9iRgf87YBwfe}>BO+T&Fl%rfpZh#+AM?Dq-k$Bq`vG6G_b4z%Kbd&v>qFjow*mBl z-OylnqOpLg}or7_VNwRg2za3VBK6FUfFX{|TD z`Wt0Vm2H$vdlRWYQJqDmM?JUbVqL*ZQY|5&sY*?!&%P8qhA~5+Af<{MaGo(dl&C5t zE%t!J0 zh6jqANt4ABdPxSTrVV}fLsRQal*)l&_*rFq(Ez}ClEH6LHv{J#v?+H-BZ2)Wy{K@9 z+ovXHq~DiDvm>O~r$LJo!cOuwL+Oa--6;UFE2q@g3N8Qkw5E>ytz^(&($!O47+i~$ zKM+tkAd-RbmP{s_rh+ugTD;lriL~`Xwkad#;_aM?nQ7L_muEFI}U_4$phjvYgleK~`Fo`;GiC07&Hq1F<%p;9Q;tv5b?*QnR%8DYJH3P>Svmv47Y>*LPZJy8_{9H`g6kQpyZU{oJ`m%&p~D=K#KpfoJ@ zn-3cqmHsdtN!f?~w+(t+I`*7GQA#EQC^lUA9(i6=i1PqSAc|ha91I%X&nXzjYaM{8$s&wEx@aVkQ6M{E2 zfzId#&r(XwUNtPcq4Ngze^+XaJA1EK-%&C9j>^9(secqe{}z>hR5CFNveMsVA)m#S zk)_%SidkY-XmMWlVnQ(mNJ>)ooszQ#vaK;!rPmGKXV7am^_F!Lz>;~{VrIO$;!#30XRhE1QqO_~#+Ux;B_D{Nk=grn z8Y0oR^4RqtcYM)7a%@B(XdbZCOqnX#fD{BQTeLvRHd(irHKq=4*jq34`6@VAQR8WG z^%)@5CXnD_T#f%@-l${>y$tfb>2LPmc{~5A82|16mH)R?&r#KKLs7xpN-D`=&Cm^R zvMA6#Ahr<3X>Q7|-qfTY)}32HkAz$_mibYV!I)u>bmjK`qwBe(>za^0Kt*HnFbSdO z1>+ryKCNxmm^)*$XfiDOF2|{-v3KKB?&!(S_Y=Ht@|ir^hLd978xuI&N{k>?(*f8H z=ClxVJK_%_z1TH0eUwm2J+2To7FK4o+n_na)&#VLn1m;!+CX+~WC+qg1?PA~KdOlC zW)C@pw75_xoe=w7i|r9KGIvQ$+3K?L{7TGHwrQM{dCp=Z*D}3kX7E-@sZnup!BImw z*T#a=+WcTwL78exTgBn|iNE3#EsOorO z*kt)gDzHiPt07fmisA2LWN?AymkdqTgr?=loT7z@d`wnlr6oN}@o|&JX!yPzC*Y8d zu6kWlTzE1)ckyBn+0Y^HMN+GA$wUO_LN6W>mxCo!0?oiQvT`z$jbSEu&{UHRU0E8# z%B^wOc@S!yhMT49Y)ww(Xta^8pmPCe@eI5C*ed96)AX9<>))nKx0(sci8gwob_1}4 z0DIL&vsJ1_s%<@y%U*-eX z5rN&(zef-5G~?@r79oZGW1d!WaTqQn0F6RIOa9tJ=0(kdd{d1{<*tHT#cCvl*i>YY zH+L7jq8xZNcTUBqj(S)ztTU!TM!RQ}In*n&Gn<>(60G7}4%WQL!o>hbJqNDSGwl#H z`4k+twp0cj%PsS+NKaxslAEu9!#U3xT1|_KB6`h=PI0SW`P9GTa7caD1}vKEglV8# zjKZR`pluCW19c2fM&ZG)c3T3Um;ir3y(tSCJ7Agl6|b524dy5El{^EQBG?E61H0XY z`bqg!;zhGhyMFl&(o=JWEJ8n~z)xI}A@C0d2hQGvw7nGv)?POU@(kS1m=%`|+^ika zXl8zjS?xqW$WlO?Ewa;vF~XbybHBor$f<%I&*t$F5fynwZlTGj|IjZtVfGa7l&tK} zW>I<69w(cZLu)QIVG|M2xzW@S+70NinQzk&Y0+3WT*cC)rx~04O-^<{JohU_&HL5XdUKW!uFy|i$FB|EMu0eUyW;gsf`XfIc!Z0V zeK&*hPL}f_cX=@iv>K%S5kL;cl_$v?n(Q9f_cChk8Lq$glT|=e+T*8O4H2n<=NGmn z+2*h+v;kBvF>}&0RDS>)B{1!_*XuE8A$Y=G8w^qGMtfudDBsD5>T5SB;Qo}fSkkiV ze^K^M(UthkwrD!&*tTsu>Dacdj_q`~V%r_twr$(Ct&_dKeeXE?fA&4&yASJWJ*}~- zel=@W)tusynfC_YqH4ll>4Eg`Xjs5F7Tj>tTLz<0N3)X<1px_d2yUY>X~y>>93*$) z5PuNMQLf9Bu?AAGO~a_|J2akO1M*@VYN^VxvP0F$2>;Zb9;d5Yfd8P%oFCCoZE$ z4#N$^J8rxYjUE_6{T%Y>MmWfHgScpuGv59#4u6fpTF%~KB^Ae`t1TD_^Ud#DhL+Dm zbY^VAM#MrAmFj{3-BpVSWph2b_Y6gCnCAombVa|1S@DU)2r9W<> zT5L8BB^er3zxKt1v(y&OYk!^aoQisqU zH(g@_o)D~BufUXcPt!Ydom)e|aW{XiMnes2z&rE?og>7|G+tp7&^;q?Qz5S5^yd$i z8lWr4g5nctBHtigX%0%XzIAB8U|T6&JsC4&^hZBw^*aIcuNO47de?|pGXJ4t}BB`L^d8tD`H`i zqrP8?#J@8T#;{^B!KO6J=@OWKhAerih(phML`(Rg7N1XWf1TN>=Z3Do{l_!d~DND&)O)D>ta20}@Lt77qSnVsA7>)uZAaT9bsB>u&aUQl+7GiY2|dAEg@%Al3i316y;&IhQL^8fw_nwS>f60M_-m+!5)S_6EPM7Y)(Nq^8gL7(3 zOiot`6Wy6%vw~a_H?1hLVzIT^i1;HedHgW9-P#)}Y6vF%C=P70X0Tk^z9Te@kPILI z_(gk!k+0%CG)%!WnBjjw*kAKs_lf#=5HXC00s-}oM-Q1aXYLj)(1d!_a7 z*Gg4Fe6F$*ujVjI|79Z5+Pr`us%zW@ln++2l+0hsngv<{mJ%?OfSo_3HJXOCys{Ug z00*YR-(fv<=&%Q!j%b-_ppA$JsTm^_L4x`$k{VpfLI(FMCap%LFAyq;#ns5bR7V+x zO!o;c5y~DyBPqdVQX)8G^G&jWkBy2|oWTw>)?5u}SAsI$RjT#)lTV&Rf8;>u*qXnb z8F%Xb=7#$m)83z%`E;49)t3fHInhtc#kx4wSLLms!*~Z$V?bTyUGiS&m>1P(952(H zuHdv=;o*{;5#X-uAyon`hP}d#U{uDlV?W?_5UjJvf%11hKwe&(&9_~{W)*y1nR5f_ z!N(R74nNK`y8>B!0Bt_Vr!;nc3W>~RiKtGSBkNlsR#-t^&;$W#)f9tTlZz>n*+Fjz z3zXZ;jf(sTM(oDzJt4FJS*8c&;PLTW(IQDFs_5QPy+7yhi1syPCarvqrHFcf&yTy)^O<1EBx;Ir`5W{TIM>{8w&PB>ro4;YD<5LF^TjTb0!zAP|QijA+1Vg>{Afv^% zmrkc4o6rvBI;Q8rj4*=AZacy*n8B{&G3VJc)so4$XUoie0)vr;qzPZVbb<#Fc=j+8CGBWe$n|3K& z_@%?{l|TzKSlUEO{U{{%Fz_pVDxs7i9H#bnbCw7@4DR=}r_qV!Zo~CvD4ZI*+j3kO zW6_=|S`)(*gM0Z;;}nj`73OigF4p6_NPZQ-Od~e$c_);;4-7sR>+2u$6m$Gf%T{aq zle>e3(*Rt(TPD}03n5)!Ca8Pu!V}m6v0o1;5<1h$*|7z|^(3$Y&;KHKTT}hV056wuF0Xo@mK-52~r=6^SI1NC%c~CC?n>yX6wPTgiWYVz!Sx^atLby9YNn1Rk{g?|pJaxD4|9cUf|V1_I*w zzxK)hRh9%zOl=*$?XUjly5z8?jPMy%vEN)f%T*|WO|bp5NWv@B(K3D6LMl!-6dQg0 zXNE&O>Oyf%K@`ngCvbGPR>HRg5!1IV$_}m@3dWB7x3t&KFyOJn9pxRXCAzFr&%37wXG;z^xaO$ekR=LJG ztIHpY8F5xBP{mtQidqNRoz= z@){+N3(VO5bD+VrmS^YjG@+JO{EOIW)9=F4v_$Ed8rZtHvjpiEp{r^c4F6Ic#ChlC zJX^DtSK+v(YdCW)^EFcs=XP7S>Y!4=xgmv>{S$~@h=xW-G4FF9?I@zYN$e5oF9g$# zb!eVU#J+NjLyX;yb)%SY)xJdvGhsnE*JEkuOVo^k5PyS=o#vq!KD46UTW_%R=Y&0G zFj6bV{`Y6)YoKgqnir2&+sl+i6foAn-**Zd1{_;Zb7Ki=u394C5J{l^H@XN`_6XTKY%X1AgQM6KycJ+= zYO=&t#5oSKB^pYhNdzPgH~aEGW2=ec1O#s-KG z71}LOg@4UEFtp3GY1PBemXpNs6UK-ax*)#$J^pC_me;Z$Je(OqLoh|ZrW*mAMBFn< zHttjwC&fkVfMnQeen8`Rvy^$pNRFVaiEN4Pih*Y3@jo!T0nsClN)pdrr9AYLcZxZ| zJ5Wlj+4q~($hbtuY zVQ7hl>4-+@6g1i`1a)rvtp-;b0>^`Dloy(#{z~ytgv=j4q^Kl}wD>K_Y!l~ zp(_&7sh`vfO(1*MO!B%<6E_bx1)&s+Ae`O)a|X=J9y~XDa@UB`m)`tSG4AUhoM=5& znWoHlA-(z@3n0=l{E)R-p8sB9XkV zZ#D8wietfHL?J5X0%&fGg@MH~(rNS2`GHS4xTo7L$>TPme+Is~!|79=^}QbPF>m%J zFMkGzSndiPO|E~hrhCeo@&Ea{M(ieIgRWMf)E}qeTxT8Q#g-!Lu*x$v8W^M^>?-g= zwMJ$dThI|~M06rG$Sv@C@tWR>_YgaG&!BAbkGggVQa#KdtDB)lMLNVLN|51C@F^y8 zCRvMB^{GO@j=cHfmy}_pCGbP%xb{pNN>? z?7tBz$1^zVaP|uaatYaIN+#xEN4jBzwZ|YI_)p(4CUAz1ZEbDk>J~Y|63SZaak~#0 zoYKruYsWHoOlC1(MhTnsdUOwQfz5p6-D0}4;DO$B;7#M{3lSE^jnTT;ns`>!G%i*F?@pR1JO{QTuD0U+~SlZxcc8~>IB{)@8p`P&+nDxNj`*gh|u?yrv$phpQcW)Us)bi`kT%qLj(fi{dWRZ%Es2!=3mI~UxiW0$-v3vUl?#g{p6eF zMEUAqo5-L0Ar(s{VlR9g=j7+lt!gP!UN2ICMokAZ5(Agd>})#gkA2w|5+<%-CuEP# zqgcM}u@3(QIC^Gx<2dbLj?cFSws_f3e%f4jeR?4M^M3cx1f+Qr6ydQ>n)kz1s##2w zk}UyQc+Z5G-d-1}{WzjkLXgS-2P7auWSJ%pSnD|Uivj5u!xk0 z_^-N9r9o;(rFDt~q1PvE#iJZ_f>J3gcP$)SOqhE~pD2|$=GvpL^d!r z6u=sp-CrMoF7;)}Zd7XO4XihC4ji?>V&(t^?@3Q&t9Mx=qex6C9d%{FE6dvU6%d94 zIE;hJ1J)cCqjv?F``7I*6bc#X)JW2b4f$L^>j{*$R`%5VHFi*+Q$2;nyieduE}qdS{L8y8F08yLs?w}{>8>$3236T-VMh@B zq-nujsb_1aUv_7g#)*rf9h%sFj*^mIcImRV*k~Vmw;%;YH(&ylYpy!&UjUVqqtfG` zox3esju?`unJJA_zKXRJP)rA3nXc$m^{S&-p|v|-0x9LHJm;XIww7C#R$?00l&Yyj z=e}gKUOpsImwW?N)+E(awoF@HyP^EhL+GlNB#k?R<2>95hz!h9sF@U20DHSB3~WMa zk90+858r@-+vWwkawJ)8ougd(i#1m3GLN{iSTylYz$brAsP%=&m$mQQrH$g%3-^VR zE%B`Vi&m8f3T~&myTEK28BDWCVzfWir1I?03;pX))|kY5ClO^+bae z*7E?g=3g7EiisYOrE+lA)2?Ln6q2*HLNpZEWMB|O-JI_oaHZB%CvYB(%=tU= zE*OY%QY58fW#RG5=gm0NR#iMB=EuNF@)%oZJ}nmm=tsJ?eGjia{e{yuU0l3{d^D@)kVDt=1PE)&tf_hHC%0MB znL|CRCPC}SeuVTdf>-QV70`0(EHizc21s^sU>y%hW0t!0&y<7}Wi-wGy>m%(-jsDj zP?mF|>p_K>liZ6ZP(w5(|9Ga%>tLgb$|doDDfkdW>Z z`)>V2XC?NJT26mL^@ zf+IKr27TfM!UbZ@?zRddC7#6ss1sw%CXJ4FWC+t3lHZupzM77m^=9 z&(a?-LxIq}*nvv)y?27lZ{j zifdl9hyJudyP2LpU$-kXctshbJDKS{WfulP5Dk~xU4Le4c#h^(YjJit4#R8_khheS z|8(>2ibaHES4+J|DBM7I#QF5u-*EdN{n=Kt@4Zt?@Tv{JZA{`4 zU#kYOv{#A&gGPwT+$Ud}AXlK3K7hYzo$(fBSFjrP{QQ zeaKg--L&jh$9N}`pu{Bs>?eDFPaWY4|9|foN%}i;3%;@4{dc+iw>m}{3rELqH21G! z`8@;w-zsJ1H(N3%|1B@#ioLOjib)j`EiJqPQVSbPSPVHCj6t5J&(NcWzBrzCiDt{4 zdlPAUKldz%6x5II1H_+jv)(xVL+a;P+-1hv_pM>gMRr%04@k;DTokASSKKhU1Qms| zrWh3a!b(J3n0>-tipg{a?UaKsP7?+|@A+1WPDiQIW1Sf@qDU~M_P65_s}7(gjTn0X zucyEm)o;f8UyshMy&>^SC3I|C6jR*R_GFwGranWZe*I>K+0k}pBuET&M~ z;Odo*ZcT?ZpduHyrf8E%IBFtv;JQ!N_m>!sV6ly$_1D{(&nO~w)G~Y`7sD3#hQk%^ zp}ucDF_$!6DAz*PM8yE(&~;%|=+h(Rn-=1Wykas_-@d&z#=S}rDf`4w(rVlcF&lF! z=1)M3YVz7orwk^BXhslJ8jR);sh^knJW(Qmm(QdSgIAIdlN4Te5KJisifjr?eB{FjAX1a0AB>d?qY4Wx>BZ8&}5K0fA+d{l8 z?^s&l8#j7pR&ijD?0b%;lL9l$P_mi2^*_OL+b}4kuLR$GAf85sOo02?Y#90}CCDiS zZ%rbCw>=H~CBO=C_JVV=xgDe%b4FaEFtuS7Q1##y686r%F6I)s-~2(}PWK|Z8M+Gu zl$y~5@#0Ka%$M<&Cv%L`a8X^@tY&T7<0|(6dNT=EsRe0%kp1Qyq!^43VAKYnr*A5~ zsI%lK1ewqO;0TpLrT9v}!@vJK{QoVa_+N4FYT#h?Y8rS1S&-G+m$FNMP?(8N`MZP zels(*?kK{{^g9DOzkuZXJ2;SrOQsp9T$hwRB1(phw1c7`!Q!by?Q#YsSM#I12RhU{$Q+{xj83axHcftEc$mNJ8_T7A-BQc*k(sZ+~NsO~xAA zxnbb%dam_fZlHvW7fKXrB~F&jS<4FD2FqY?VG?ix*r~MDXCE^WQ|W|WM;gsIA4lQP zJ2hAK@CF*3*VqPr2eeg6GzWFlICi8S>nO>5HvWzyZTE)hlkdC_>pBej*>o0EOHR|) z$?};&I4+_?wvL*g#PJ9)!bc#9BJu1(*RdNEn>#Oxta(VWeM40ola<0aOe2kSS~{^P zDJBd}0L-P#O-CzX*%+$#v;(x%<*SPgAje=F{Zh-@ucd2DA(yC|N_|ocs*|-!H%wEw z@Q!>siv2W;C^^j^59OAX03&}&D*W4EjCvfi(ygcL#~t8XGa#|NPO+*M@Y-)ctFA@I z-p7npT1#5zOLo>7q?aZpCZ=iecn3QYklP;gF0bq@>oyBq94f6C=;Csw3PkZ|5q=(c zfs`aw?II0e(h=|7o&T+hq&m$; zBrE09Twxd9BJ2P+QPN}*OdZ-JZV7%av@OM7v!!NL8R;%WFq*?{9T3{ct@2EKgc8h) zMxoM$SaF#p<`65BwIDfmXG6+OiK0e)`I=!A3E`+K@61f}0e z!2a*FOaDrOe>U`q%K!QN`&=&0C~)CaL3R4VY(NDt{Xz(Xpqru5=r#uQN1L$Je1*dkdqQ*=lofQaN%lO!<5z9ZlHgxt|`THd>2 zsWfU$9=p;yLyJyM^t zS2w9w?Bpto`@H^xJpZDKR1@~^30Il6oFGfk5%g6w*C+VM)+%R@gfIwNprOV5{F^M2 zO?n3DEzpT+EoSV-%OdvZvNF+pDd-ZVZ&d8 zKeIyrrfPN=EcFRCPEDCVflX#3-)Ik_HCkL(ejmY8vzcf-MTA{oHk!R2*36`O68$7J zf}zJC+bbQk--9Xm!u#lgLvx8TXx2J258E5^*IZ(FXMpq$2LUUvhWQPs((z1+2{Op% z?J}9k5^N=z;7ja~zi8a_-exIqWUBJwohe#4QJ`|FF*$C{lM18z^#hX6!5B8KAkLUX ziP=oti-gpV(BsLD{0(3*dw}4JxK23Y7M{BeFPucw!sHpY&l%Ws4pSm`+~V7;bZ%Dx zeI)MK=4vC&5#;2MT7fS?^ch9?2;%<8Jlu-IB&N~gg8t;6S-#C@!NU{`p7M8@2iGc& zg|JPg%@gCoCQ&s6JvDU&`X2S<57f(k8nJ1wvBu{8r?;q3_kpZZ${?|( z+^)UvR33sjSd)aT!UPkA;ylO6{aE3MQa{g%Mcf$1KONcjO@&g5zPHWtzM1rYC{_K> zgQNcs<{&X{OA=cEWw5JGqpr0O>x*Tfak2PE9?FuWtz^DDNI}rwAaT0(bdo-<+SJ6A z&}S%boGMWIS0L}=S>|-#kRX;e^sUsotry(MjE|3_9duvfc|nwF#NHuM-w7ZU!5ei8 z6Mkf>2)WunY2eU@C-Uj-A zG(z0Tz2YoBk>zCz_9-)4a>T46$(~kF+Y{#sA9MWH%5z#zNoz)sdXq7ZR_+`RZ%0(q zC7&GyS_|BGHNFl8Xa%@>iWh%Gr?=J5<(!OEjauj5jyrA-QXBjn0OAhJJ9+v=!LK`` z@g(`^*84Q4jcDL`OA&ZV60djgwG`|bcD*i50O}Q{9_noRg|~?dj%VtKOnyRs$Uzqg z191aWoR^rDX#@iSq0n z?9Sg$WSRPqSeI<}&n1T3!6%Wj@5iw5`*`Btni~G=&;J+4`7g#OQTa>u`{4ZZ(c@s$ zK0y;ySOGD-UTjREKbru{QaS>HjN<2)R%Nn-TZiQ(Twe4p@-saNa3~p{?^V9Nixz@a zykPv~<@lu6-Ng9i$Lrk(xi2Tri3q=RW`BJYOPC;S0Yly%77c727Yj-d1vF!Fuk{Xh z)lMbA69y7*5ufET>P*gXQrxsW+ zz)*MbHZv*eJPEXYE<6g6_M7N%#%mR{#awV3i^PafNv(zyI)&bH?F}2s8_rR(6%!V4SOWlup`TKAb@ee>!9JKPM=&8g#BeYRH9FpFybxBXQI2|g}FGJfJ+ zY-*2hB?o{TVL;Wt_ek;AP5PBqfDR4@Z->_182W z{P@Mc27j6jE*9xG{R$>6_;i=y{qf(c`5w9fa*`rEzX6t!KJ(p1H|>J1pC-2zqWENF zmm=Z5B4u{cY2XYl(PfrInB*~WGWik3@1oRhiMOS|D;acnf-Bs(QCm#wR;@Vf!hOPJ zgjhDCfDj$HcyVLJ=AaTbQ{@vIv14LWWF$=i-BDoC11}V;2V8A`S>_x)vIq44-VB-v z*w-d}$G+Ql?En8j!~ZkCpQ$|cA0|+rrY>tiCeWxkRGPoarxlGU2?7%k#F693RHT24 z-?JsiXlT2PTqZqNb&sSc>$d;O4V@|b6VKSWQb~bUaWn1Cf0+K%`Q&Wc<>mQ>*iEGB zbZ;aYOotBZ{vH3y<0A*L0QVM|#rf*LIsGx(O*-7)r@yyBIzJnBFSKBUSl1e|8lxU* zzFL+YDVVkIuzFWeJ8AbgN&w(4-7zbiaMn{5!JQXu)SELk*CNL+Fro|2v|YO)1l15t zs(0^&EB6DPMyaqvY>=KL>)tEpsn;N5Q#yJj<9}ImL((SqErWN3Q=;tBO~ExTCs9hB z2E$7eN#5wX4<3m^5pdjm#5o>s#eS_Q^P)tm$@SawTqF*1dj_i#)3};JslbLKHXl_N z)Fxzf>FN)EK&Rz&*|6&%Hs-^f{V|+_vL1S;-1K-l$5xiC@}%uDuwHYhmsV?YcOUlk zOYkG5v2+`+UWqpn0aaaqrD3lYdh0*!L`3FAsNKu=Q!vJu?Yc8n|CoYyDo_`r0mPoo z8>XCo$W4>l(==h?2~PoRR*kEe)&IH{1sM41mO#-36`02m#nTX{r*r`Q5rZ2-sE|nA zhnn5T#s#v`52T5|?GNS`%HgS2;R(*|^egNPDzzH_z^W)-Q98~$#YAe)cEZ%vge965AS_am#DK#pjPRr-!^za8>`kksCAUj(Xr*1NW5~e zpypt_eJpD&4_bl_y?G%>^L}=>xAaV>KR6;^aBytqpiHe%!j;&MzI_>Sx7O%F%D*8s zSN}cS^<{iiK)=Ji`FpO#^zY!_|D)qeRNAtgmH)m;qC|mq^j(|hL`7uBz+ULUj37gj zksdbnU+LSVo35riSX_4z{UX=%n&}7s0{WuZYoSfwAP`8aKN9P@%e=~1`~1ASL-z%# zw>DO&ixr}c9%4InGc*_y42bdEk)ZdG7-mTu0bD@_vGAr*NcFoMW;@r?@LUhRI zCUJgHb`O?M3!w)|CPu~ej%fddw20lod?Ufp8Dmt0PbnA0J%KE^2~AIcnKP()025V> zG>noSM3$5Btmc$GZoyP^v1@Poz0FD(6YSTH@aD0}BXva?LphAiSz9f&Y(aDAzBnUh z?d2m``~{z;{}kZJ>a^wYI?ry(V9hIoh;|EFc0*-#*`$T0DRQ1;WsqInG;YPS+I4{g zJGpKk%%Sdc5xBa$Q^_I~(F97eqDO7AN3EN0u)PNBAb+n+ zWBTxQx^;O9o0`=g+Zrt_{lP!sgWZHW?8bLYS$;1a@&7w9rD9|Ge;Gb?sEjFoF9-6v z#!2)t{DMHZ2@0W*fCx;62d#;jouz`R5Y(t{BT=$N4yr^^o$ON8d{PQ=!O zX17^CrdM~7D-;ZrC!||<+FEOxI_WI3CA<35va%4v>gc zEX-@h8esj=a4szW7x{0g$hwoWRQG$yK{@3mqd-jYiVofJE!Wok1* znV7Gm&Ssq#hFuvj1sRyHg(6PFA5U*Q8Rx>-blOs=lb`qa{zFy&n4xY;sd$fE+<3EI z##W$P9M{B3c3Si9gw^jlPU-JqD~Cye;wr=XkV7BSv#6}DrsXWFJ3eUNrc%7{=^sP> zrp)BWKA9<}^R9g!0q7yWlh;gr_TEOD|#BmGq<@IV;ueg+D2}cjpp+dPf&Q(36sFU&K8}hA85U61faW&{ zlB`9HUl-WWCG|<1XANN3JVAkRYvr5U4q6;!G*MTdSUt*Mi=z_y3B1A9j-@aK{lNvx zK%p23>M&=KTCgR!Ee8c?DAO2_R?B zkaqr6^BSP!8dHXxj%N1l+V$_%vzHjqvu7p@%Nl6;>y*S}M!B=pz=aqUV#`;h%M0rU zHfcog>kv3UZAEB*g7Er@t6CF8kHDmKTjO@rejA^ULqn!`LwrEwOVmHx^;g|5PHm#B zZ+jjWgjJ!043F+&#_;D*mz%Q60=L9Ove|$gU&~As5^uz@2-BfQ!bW)Khn}G+Wyjw- z19qI#oB(RSNydn0t~;tAmK!P-d{b-@@E5|cdgOS#!>%#Rj6ynkMvaW@37E>@hJP^8 z2zk8VXx|>#R^JCcWdBCy{0nPmYFOxN55#^-rlqobe0#L6)bi?E?SPymF*a5oDDeSd zO0gx?#KMoOd&G(2O@*W)HgX6y_aa6iMCl^~`{@UR`nMQE`>n_{_aY5nA}vqU8mt8H z`oa=g0SyiLd~BxAj2~l$zRSDHxvDs;I4>+M$W`HbJ|g&P+$!U7-PHX4RAcR0szJ*( ze-417=bO2q{492SWrqDK+L3#ChUHtz*@MP)e^%@>_&#Yk^1|tv@j4%3T)diEX zATx4K*hcO`sY$jk#jN5WD<=C3nvuVsRh||qDHnc~;Kf59zr0;c7VkVSUPD%NnnJC_ zl3F^#f_rDu8l}l8qcAz0FFa)EAt32IUy_JLIhU_J^l~FRH&6-ivSpG2PRqzDdMWft>Zc(c)#tb%wgmWN%>IOPm zZi-noqS!^Ftb81pRcQi`X#UhWK70hy4tGW1mz|+vI8c*h@ zfFGJtW3r>qV>1Z0r|L>7I3un^gcep$AAWfZHRvB|E*kktY$qQP_$YG60C@X~tTQjB3%@`uz!qxtxF+LE!+=nrS^07hn` zEgAp!h|r03h7B!$#OZW#ACD+M;-5J!W+{h|6I;5cNnE(Y863%1(oH}_FTW})8zYb$7czP zg~Szk1+_NTm6SJ0MS_|oSz%e(S~P-&SFp;!k?uFayytV$8HPwuyELSXOs^27XvK-D zOx-Dl!P|28DK6iX>p#Yb%3`A&CG0X2S43FjN%IB}q(!hC$fG}yl1y9W&W&I@KTg6@ zK^kpH8=yFuP+vI^+59|3%Zqnb5lTDAykf z9S#X`3N(X^SpdMyWQGOQRjhiwlj!0W-yD<3aEj^&X%=?`6lCy~?`&WSWt z?U~EKFcCG_RJ(Qp7j=$I%H8t)Z@6VjA#>1f@EYiS8MRHZphp zMA_5`znM=pzUpBPO)pXGYpQ6gkine{6u_o!P@Q+NKJ}k!_X7u|qfpAyIJb$_#3@wJ z<1SE2Edkfk9C!0t%}8Yio09^F`YGzpaJHGk*-ffsn85@)%4@`;Fv^8q(-Wk7r=Q8p zT&hD`5(f?M{gfzGbbwh8(}G#|#fDuk7v1W)5H9wkorE0ZZjL0Q1=NRGY>zwgfm81DdoaVwNH;or{{eSyybt)m<=zXoA^RALYG-2t zouH|L*BLvmm9cdMmn+KGopyR@4*=&0&4g|FLoreZOhRmh=)R0bg~ zT2(8V_q7~42-zvb)+y959OAv!V$u(O3)%Es0M@CRFmG{5sovIq4%8Ahjk#*5w{+)+ zMWQoJI_r$HxL5km1#6(e@{lK3Udc~n0@g`g$s?VrnQJ$!oPnb?IHh-1qA`Rz$)Ai< z6w$-MJW-gKNvOhL+XMbE7&mFt`x1KY>k4(!KbbpZ`>`K@1J<(#vVbjx@Z@(6Q}MF# zMnbr-f55(cTa^q4+#)=s+ThMaV~E`B8V=|W_fZWDwiso8tNMTNse)RNBGi=gVwgg% zbOg8>mbRN%7^Um-7oj4=6`$|(K7!+t^90a{$18Z>}<#!bm%ZEFQ{X(yBZMc>lCz0f1I2w9Sq zuGh<9<=AO&g6BZte6hn>Qmvv;Rt)*cJfTr2=~EnGD8P$v3R|&1RCl&7)b+`=QGapi zPbLg_pxm`+HZurtFZ;wZ=`Vk*do~$wB zxoW&=j0OTbQ=Q%S8XJ%~qoa3Ea|au5o}_(P;=!y-AjFrERh%8la!z6Fn@lR?^E~H12D?8#ht=1F;7@o4$Q8GDj;sSC%Jfn01xgL&%F2 zwG1|5ikb^qHv&9hT8w83+yv&BQXOQyMVJSBL(Ky~p)gU3#%|blG?IR9rP^zUbs7rOA0X52Ao=GRt@C&zlyjNLv-} z9?*x{y(`509qhCV*B47f2hLrGl^<@SuRGR!KwHei?!CM10Tq*YDIoBNyRuO*>3FU? zHjipIE#B~y3FSfOsMfj~F9PNr*H?0oHyYB^G(YyNh{SxcE(Y-`x5jFMKb~HO*m+R% zrq|ic4fzJ#USpTm;X7K+E%xsT_3VHKe?*uc4-FsILUH;kL>_okY(w`VU*8+l>o>Jm ziU#?2^`>arnsl#)*R&nf_%>A+qwl%o{l(u)M?DK1^mf260_oteV3#E_>6Y4!_hhVD zM8AI6MM2V*^_M^sQ0dmHu11fy^kOqXqzpr?K$`}BKWG`=Es(9&S@K@)ZjA{lj3ea7_MBP zk(|hBFRjHVMN!sNUkrB;(cTP)T97M$0Dtc&UXSec<+q?y>5=)}S~{Z@ua;1xt@=T5 zI7{`Z=z_X*no8s>mY;>BvEXK%b`a6(DTS6t&b!vf_z#HM{Uoy_5fiB(zpkF{})ruka$iX*~pq1ZxD?q68dIo zIZSVls9kFGsTwvr4{T_LidcWtt$u{kJlW7moRaH6+A5hW&;;2O#$oKyEN8kx`LmG)Wfq4ykh+q{I3|RfVpkR&QH_x;t41Uw z`P+tft^E2B$domKT@|nNW`EHwyj>&}K;eDpe z1bNOh=fvIfk`&B61+S8ND<(KC%>y&?>opCnY*r5M+!UrWKxv0_QvTlJc>X#AaI^xo zaRXL}t5Ej_Z$y*|w*$6D+A?Lw-CO-$itm^{2Ct82-<0IW)0KMNvJHgBrdsIR0v~=H z?n6^}l{D``Me90`^o|q!olsF?UX3YSq^6Vu>Ijm>>PaZI8G@<^NGw{Cx&%|PwYrfw zR!gX_%AR=L3BFsf8LxI|K^J}deh0ZdV?$3r--FEX`#INxsOG6_=!v)DI>0q|BxT)z z-G6kzA01M?rba+G_mwNMQD1mbVbNTWmBi*{s_v_Ft9m2Avg!^78(QFu&n6mbRJ2bA zv!b;%yo{g*9l2)>tsZJOOp}U~8VUH`}$ z8p_}t*XIOehezolNa-a2x0BS})Y9}&*TPgua{Ewn-=wVrmJUeU39EKx+%w%=ixQWK zDLpwaNJs65#6o7Ln7~~X+p_o2BR1g~VCfxLzxA{HlWAI6^H;`juI=&r1jQrUv_q0Z z1Ja-tjdktrrP>GOC*#p?*xfQU5MqjMsBe!9lh(u8)w$e@Z|>aUHI5o;MGw*|Myiz3 z-f0;pHg~Q#%*Kx8MxH%AluVXjG2C$)WL-K63@Q`#y9_k_+}eR(x4~dp7oV-ek0H>I zgy8p#i4GN{>#v=pFYUQT(g&b$OeTy-X_#FDgNF8XyfGY6R!>inYn8IR2RDa&O!(6< znXs{W!bkP|s_YI*Yx%4stI`=ZO45IK6rBs`g7sP40ic}GZ58s?Mc$&i`kq_tfci>N zIHrC0H+Qpam1bNa=(`SRKjixBTtm&e`j9porEci!zdlg1RI0Jw#b(_Tb@RQK1Zxr_ z%7SUeH6=TrXt3J@js`4iDD0=IoHhK~I7^W8^Rcp~Yaf>2wVe|Hh1bUpX9ATD#moByY57-f2Ef1TP^lBi&p5_s7WGG9|0T}dlfxOx zXvScJO1Cnq`c`~{Dp;{;l<-KkCDE+pmexJkd}zCgE{eF=)K``-qC~IT6GcRog_)!X z?fK^F8UDz$(zFUrwuR$qro5>qqn>+Z%<5>;_*3pZ8QM|yv9CAtrAx;($>4l^_$_-L z*&?(77!-=zvnCVW&kUcZMb6;2!83si518Y%R*A3JZ8Is|kUCMu`!vxDgaWjs7^0j( ziTaS4HhQ)ldR=r)_7vYFUr%THE}cPF{0H45FJ5MQW^+W>P+eEX2kLp3zzFe*-pFVA zdDZRybv?H|>`9f$AKVjFWJ=wegO7hOOIYCtd?Vj{EYLT*^gl35|HQ`R=ti+ADm{jyQE7K@kdjuqJhWVSks>b^ zxha88-h3s;%3_5b1TqFCPTxVjvuB5U>v=HyZ$?JSk+&I%)M7KE*wOg<)1-Iy)8-K! z^XpIt|0ibmk9RtMmlUd7#Ap3Q!q9N4atQy)TmrhrFhfx1DAN`^vq@Q_SRl|V z#lU<~n67$mT)NvHh`%als+G-)x1`Y%4Bp*6Un5Ri9h=_Db zA-AdP!f>f0m@~>7X#uBM?diI@)Egjuz@jXKvm zJo+==juc9_<;CqeRaU9_Mz@;3e=E4=6TK+c`|uu#pIqhSyNm`G(X)&)B`8q0RBv#> z`gGlw(Q=1Xmf55VHj%C#^1lpc>LY8kfA@|rlC1EA<1#`iuyNO z(=;irt{_&K=i4)^x%;U(Xv<)+o=dczC5H3W~+e|f~{*ucxj@{Yi-cw^MqYr3fN zF5D+~!wd$#al?UfMnz(@K#wn`_5na@rRr8XqN@&M&FGEC@`+OEv}sI1hw>Up0qAWf zL#e4~&oM;TVfjRE+10B_gFlLEP9?Q-dARr3xi6nQqnw>k-S;~b z;!0s2VS4}W8b&pGuK=7im+t(`nz@FnT#VD|!)eQNp-W6)@>aA+j~K*H{$G`y2|QHY z|Hmy+CR@#jWY4~)lr1qBJB_RfHJFfP<}pK5(#ZZGSqcpyS&}01LnTWk5fzmXMGHkJ zTP6L^B+uj;lmB_W<~4=${+v0>z31M!-_O@o-O9GyW)j_mjx}!0@br_LE-7SIuPP84 z;5=O(U*g_um0tyG|61N@d9lEuOeiRd+#NY^{nd5;-CVlw&Ap7J?qwM^?E29wvS}2d zbzar4Fz&RSR(-|s!Z6+za&Z zY#D<5q_JUktIzvL0)yq_kLWG6DO{ri=?c!y!f(Dk%G{8)k`Gym%j#!OgXVDD3;$&v@qy#ISJfp=Vm>pls@9-mapVQChAHHd-x+OGx)(*Yr zC1qDUTZ6mM(b_hi!TuFF2k#8uI2;kD70AQ&di$L*4P*Y-@p`jdm%_c3f)XhYD^6M8&#Y$ZpzQMcR|6nsH>b=*R_Von!$BTRj7yGCXokoAQ z&ANvx0-Epw`QIEPgI(^cS2f(Y85yV@ygI{ewyv5Frng)e}KCZF7JbR(&W618_dcEh(#+^zZFY;o<815<5sOHQdeax9_!PyM&;{P zkBa5xymca0#)c#tke@3KNEM8a_mT&1gm;p&&JlMGH(cL(b)BckgMQ^9&vRwj!~3@l zY?L5}=Jzr080OGKb|y`ee(+`flQg|!lo6>=H)X4`$Gz~hLmu2a%kYW_Uu8x09Pa0J zKZ`E$BKJ=2GPj_3l*TEcZ*uYRr<*J^#5pILTT;k_cgto1ZL-%slyc16J~OH-(RgDA z%;EjEnoUkZ&acS{Q8`{i6T5^nywgqQI5bDIymoa7CSZG|WWVk>GM9)zy*bNih|QIm z%0+(Nnc*a_xo;$=!HQYaapLms>J1ToyjtFByY`C2H1wT#178#4+|{H0BBqtCdd$L% z_3Hc60j@{t9~MjM@LBalR&6@>B;9?r<7J~F+WXyYu*y3?px*=8MAK@EA+jRX8{CG?GI-< z54?Dc9CAh>QTAvyOEm0^+x;r2BWX|{3$Y7)L5l*qVE*y0`7J>l2wCmW zL1?|a`pJ-l{fb_N;R(Z9UMiSj6pQjOvQ^%DvhIJF!+Th7jO2~1f1N+(-TyCFYQZYw z4)>7caf^Ki_KJ^Zx2JUb z&$3zJy!*+rCV4%jqwyuNY3j1ZEiltS0xTzd+=itTb;IPYpaf?8Y+RSdVdpacB(bVQ zC(JupLfFp8y43%PMj2}T|VS@%LVp>hv4Y!RPMF?pp8U_$xCJ)S zQx!69>bphNTIb9yn*_yfj{N%bY)t{L1cs8<8|!f$;UQ*}IN=2<6lA;x^(`8t?;+ST zh)z4qeYYgZkIy{$4x28O-pugO&gauRh3;lti9)9Pvw+^)0!h~%m&8Q!AKX%urEMnl z?yEz?g#ODn$UM`+Q#$Q!6|zsq_`dLO5YK-6bJM6ya>}H+vnW^h?o$z;V&wvuM$dR& zeEq;uUUh$XR`TWeC$$c&Jjau2it3#%J-y}Qm>nW*s?En?R&6w@sDXMEr#8~$=b(gk zwDC3)NtAP;M2BW_lL^5ShpK$D%@|BnD{=!Tq)o(5@z3i7Z){} zGr}Exom_qDO{kAVkZ*MbLNHE666Kina#D{&>Jy%~w7yX$oj;cYCd^p9zy z8*+wgSEcj$4{WxKmCF(5o7U4jqwEvO&dm1H#7z}%VXAbW&W24v-tS6N3}qrm1OnE)fUkoE8yMMn9S$?IswS88tQWm4#Oid#ckgr6 zRtHm!mfNl-`d>O*1~d7%;~n+{Rph6BBy^95zqI{K((E!iFQ+h*C3EsbxNo_aRm5gj zKYug($r*Q#W9`p%Bf{bi6;IY0v`pB^^qu)gbg9QHQ7 zWBj(a1YSu)~2RK8Pi#C>{DMlrqFb9e_RehEHyI{n?e3vL_}L>kYJC z_ly$$)zFi*SFyNrnOt(B*7E$??s67EO%DgoZL2XNk8iVx~X_)o++4oaK1M|ou73vA0K^503j@uuVmLcHH4ya-kOIDfM%5%(E z+Xpt~#7y2!KB&)PoyCA+$~DXqxPxxALy!g-O?<9+9KTk4Pgq4AIdUkl`1<1#j^cJg zgU3`0hkHj_jxV>`Y~%LAZl^3o0}`Sm@iw7kwff{M%VwtN)|~!p{AsfA6vB5UolF~d zHWS%*uBDt<9y!9v2Xe|au&1j&iR1HXCdyCjxSgG*L{wmTD4(NQ=mFjpa~xooc6kju z`~+d{j7$h-;HAB04H!Zscu^hZffL#9!p$)9>sRI|Yovm)g@F>ZnosF2EgkU3ln0bR zTA}|+E(tt)!SG)-bEJi_0m{l+(cAz^pi}`9=~n?y&;2eG;d9{M6nj>BHGn(KA2n|O zt}$=FPq!j`p&kQ8>cirSzkU0c08%8{^Qyqi-w2LoO8)^E7;;I1;HQ6B$u0nNaX2CY zSmfi)F`m94zL8>#zu;8|{aBui@RzRKBlP1&mfFxEC@%cjl?NBs`cr^nm){>;$g?rhKr$AO&6qV_Wbn^}5tfFBry^e1`%du2~o zs$~dN;S_#%iwwA_QvmMjh%Qo?0?rR~6liyN5Xmej8(*V9ym*T`xAhHih-v$7U}8=dfXi2i*aAB!xM(Xekg*ix@r|ymDw*{*s0?dlVys2e)z62u1 z+k3esbJE=-P5S$&KdFp+2H7_2e=}OKDrf( z9-207?6$@f4m4B+9E*e((Y89!q?zH|mz_vM>kp*HGXldO0Hg#!EtFhRuOm$u8e~a9 z5(roy7m$Kh+zjW6@zw{&20u?1f2uP&boD}$#Zy)4o&T;vyBoqFiF2t;*g=|1=)PxB z8eM3Mp=l_obbc?I^xyLz?4Y1YDWPa+nm;O<$Cn;@ane616`J9OO2r=rZr{I_Kizyc zP#^^WCdIEp*()rRT+*YZK>V@^Zs=ht32x>Kwe zab)@ZEffz;VM4{XA6e421^h~`ji5r%)B{wZu#hD}f3$y@L0JV9f3g{-RK!A?vBUA}${YF(vO4)@`6f1 z-A|}e#LN{)(eXloDnX4Vs7eH|<@{r#LodP@Nz--$Dg_Par%DCpu2>2jUnqy~|J?eZ zBG4FVsz_A+ibdwv>mLp>P!(t}E>$JGaK$R~;fb{O3($y1ssQQo|5M;^JqC?7qe|hg zu0ZOqeFcp?qVn&Qu7FQJ4hcFi&|nR!*j)MF#b}QO^lN%5)4p*D^H+B){n8%VPUzi! zDihoGcP71a6!ab`l^hK&*dYrVYzJ0)#}xVrp!e;lI!+x+bfCN0KXwUAPU9@#l7@0& QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a254..b37e5f9d9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip +distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 diff --git a/gradlew b/gradlew index c53aefaa5..cccdd3d51 100755 --- a/gradlew +++ b/gradlew @@ -1,129 +1,78 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# +#!/usr/bin/env sh ############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# +## +## Gradle start up script for UN*X +## ############################################################################## # Attempt to set APP_HOME - # Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} +APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum +MAX_FD="maximum" warn () { echo "$*" -} >&2 +} die () { echo echo "$*" echo exit 1 -} >&2 +} # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java + JAVACMD="$JAVA_HOME/jre/sh/java" else - JAVACMD=$JAVA_HOME/bin/java + JAVACMD="$JAVA_HOME/bin/java" fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -132,7 +81,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD=java + JAVACMD="java" which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -140,95 +89,84 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi fi -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg + i=$((i+1)) done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index ac1b06f93..f9553162f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,84 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "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. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -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. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +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. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +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. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/scripts/generate-locales.ps1 b/scripts/generate-locales.ps1 new file mode 100644 index 000000000..b5d4a61ca --- /dev/null +++ b/scripts/generate-locales.ps1 @@ -0,0 +1,56 @@ +[CmdletBinding()] +param( + [string] $SourceLocaleRoot = '' +) + +$SourceLocaleRoot = if ([string]::IsNullOrWhiteSpace($SourceLocaleRoot)) { + Join-Path $PSScriptRoot '..\..\..\MinecraftMineralogy 112\MinecraftMineralogy\src\main\resources\assets\mineralogy\lang' +} else { $SourceLocaleRoot } +$projectRoot = Split-Path -Parent $PSScriptRoot +$targetRoot = Join-Path $projectRoot 'src\main\resources\assets\mineralogy\lang' +$utf8NoBom = New-Object System.Text.UTF8Encoding($false) +$expectedLocales = @( + 'de_AU', 'de_DE', 'en_CA', 'en_EN', 'en_GB', 'en_PT', 'en_US', + 'es_ES', 'es_MX', 'fr_CA', 'fr_FR', 'ja_JP', 'ko_KR', 'pt_BR', + 'pt_PT', 'ru_RU', 'zh_CN' +) + +function Convert-Key([string] $key) { + if ($key -match '^tile\.mineralogy\.(.+)\.name$') { + return "block.mineralogy.$($Matches[1])" + } + if ($key -match '^item\.mineralogy\.(.+)\.name$') { + return "item.mineralogy.$($Matches[1])" + } + return $key +} + +New-Item -ItemType Directory -Force -Path $targetRoot | Out-Null +foreach ($locale in $expectedLocales) { + $source = Join-Path $SourceLocaleRoot "$locale.lang" + if (-not (Test-Path -LiteralPath $source)) { + throw "Missing reviewed Mineralogy 1.12 locale $source" + } + $translations = [ordered]@{} + foreach ($line in [IO.File]::ReadAllLines($source, [Text.Encoding]::UTF8)) { + if ([string]::IsNullOrWhiteSpace($line) -or $line.StartsWith('#')) { continue } + $equals = $line.IndexOf('=') + if ($equals -lt 1) { throw "Malformed locale line in ${source}: $line" } + $key = Convert-Key $line.Substring(0, $equals) + $value = $line.Substring($equals + 1) + if ($translations.Contains($key)) { throw "Duplicate mapped key $key in $source" } + $translations[$key] = $value + } + if ($translations.Count -ne 938) { + throw "Expected 938 mapped keys in $source, found $($translations.Count)" + } + $destination = Join-Path $targetRoot "$($locale.ToLowerInvariant()).json" + $json = ($translations | ConvertTo-Json -Depth 4) -replace "`r?`n", "`n" + [IO.File]::WriteAllText($destination, $json + "`n", $utf8NoBom) +} + +$actual = @(Get-ChildItem -LiteralPath $targetRoot -Filter '*.json' | Sort-Object Name) +if ($actual.Count -ne 17) { + throw "Expected exactly 17 generated locale files, found $($actual.Count)" +} +Write-Output 'Generated 17 reviewed Mineralogy 1.16.5 JSON locales with 938 ordered keys each.' diff --git a/scripts/generate-recipes.ps1 b/scripts/generate-recipes.ps1 new file mode 100644 index 000000000..3f2fb0ce1 --- /dev/null +++ b/scripts/generate-recipes.ps1 @@ -0,0 +1,692 @@ +[CmdletBinding()] +param() + +$projectRoot = Split-Path -Parent $PSScriptRoot +$recipeRoot = Join-Path $projectRoot 'src\main\resources\data\mineralogy\recipes' +$advancementRoot = Join-Path $projectRoot 'src\main\resources\data\mineralogy\advancements\recipes' +$itemTagRoot = Join-Path $projectRoot 'src\main\resources\data\mineralogy\tags\items' +$utf8NoBom = New-Object System.Text.UTF8Encoding($false) +$generatedNames = New-Object 'System.Collections.Generic.HashSet[string]' +$unlockSources = @{} + +$families = @( + 'andesite', 'basalt', 'diorite', 'granite', 'rhyolite', 'pegmatite', + 'diabase', 'gabbro', 'peridotite', 'basaltic_glass', 'scoria', 'tuff', + 'shale', 'conglomerate', 'dolomite', 'limestone', 'siltstone', 'marble', + 'slate', 'schist', 'gneiss', 'phyllite', 'amphibolite', 'hornfels', + 'quartzite', 'novaculite', 'rock_salt' +) + +$colors = @( + 'black', 'red', 'green', 'brown', 'blue', 'purple', 'cyan', 'silver', + 'gray', 'pink', 'lime', 'yellow', 'light_blue', 'magenta', 'orange', 'white' +) + +function ItemId([string] $path) { + return "mineralogy:$path" +} + +function ItemCondition([string] $item) { + return [ordered]@{ type = 'forge:item_exists'; item = $item } +} + +function ConfigCondition([string] $flag) { + return [ordered]@{ type = 'mineralogy:config'; flag = $flag } +} + +function ItemTagNotEmptyCondition([string] $tag) { + return [ordered]@{ + type = 'forge:not' + value = [ordered]@{ type = 'forge:tag_empty'; tag = $tag } + } +} + +function ItemIngredient([string] $item, [object] $data = $null) { + if ($null -ne $data) { + if ($item -eq 'minecraft:sand') { + $item = if ([int]$data -eq 1) { 'minecraft:red_sand' } else { 'minecraft:sand' } + } + elseif ($item -eq 'minecraft:coal' -and [int]$data -eq 1) { + $item = 'minecraft:charcoal' + } + elseif ($item -eq 'minecraft:dye') { + $dyes = @('ink_sac', 'red_dye', 'green_dye', 'cocoa_beans', 'lapis_lazuli', + 'purple_dye', 'cyan_dye', 'light_gray_dye', 'gray_dye', 'pink_dye', + 'lime_dye', 'yellow_dye', 'light_blue_dye', 'magenta_dye', + 'orange_dye', 'bone_meal') + $item = "minecraft:$($dyes[[int]$data])" + } + } + $ingredient = [ordered]@{ item = $item } + return $ingredient +} + +function OreIngredient([string] $ore) { + if ($ore -eq 'sand') { return [ordered]@{ tag = 'forge:sand' } } + if ($ore -eq 'paper') { return [ordered]@{ tag = 'forge:paper' } } + if ($ore -eq 'drywallWhite') { return [ordered]@{ tag = 'mineralogy:drywall/white' } } + if ($ore -eq 'lampRocksalt') { return [ordered]@{ tag = 'forge:lamps/rock_salt' } } + if ($ore -match '^dust(.+)$') { + $name = $Matches[1] -replace 'Rock_salt', 'rock_salt' + return [ordered]@{ tag = "forge:dusts/$($name.ToLowerInvariant())" } + } + if ($ore -match '^block(.+)$') { + $name = $Matches[1] -replace 'Rocksalt', 'rock_salt' + return [ordered]@{ tag = "forge:storage_blocks/$($name.ToLowerInvariant())" } + } + if ($ore -match '^stone(.+?)(SmoothBrick|Smooth|Brick)?$') { + $family = Convert-CamelToSnake $Matches[1] + $finish = if ($Matches[2]) { '/' + (Convert-CamelToSnake $Matches[2]) } else { '' } + return [ordered]@{ tag = "mineralogy:stones/$family$finish" } + } + if ($ore -match '^slab(.+?)(SmoothBrick|Smooth|Brick)?$') { + $family = Convert-CamelToSnake $Matches[1] + $finish = if ($Matches[2]) { '/' + (Convert-CamelToSnake $Matches[2]) } else { '' } + return [ordered]@{ tag = "mineralogy:slabs/$family$finish" } + } + throw "No Minecraft 1.16.5 tag mapping for legacy OreDictionary key $ore" +} + +function Convert-CamelToSnake([string] $value) { + return (($value -creplace '([a-z0-9])([A-Z])', '$1_$2').ToLowerInvariant()) +} + +function RecipeResult([string] $item, [int] $count) { + return [ordered]@{ item = $item; count = $count } +} + +function ConditionsFor([string] $result, [object[]] $extra = @()) { + return @($extra) + @((ItemCondition $result)) +} + +function Write-Json([string] $path, [System.Collections.IDictionary] $value) { + $json = ($value | ConvertTo-Json -Depth 20) -replace "`r?`n", "`n" + [System.IO.File]::WriteAllText($path, $json + "`n", $utf8NoBom) +} + +function Write-Recipe([string] $name, [System.Collections.IDictionary] $recipe) { + if (-not $generatedNames.Add($name)) { + throw "Duplicate generated recipe name: $name" + } + Write-Json (Join-Path $recipeRoot "$name.json") $recipe +} + +function Register-UnlockSource( + [string] $name, + [string] $sourceItem +) { + if ($unlockSources.ContainsKey($name)) { + throw "Duplicate recipe-book unlock source: $name" + } + $unlockSources[$name] = $sourceItem +} + +function Get-SandUnlockMode([string] $recipeName) { + if ($recipeName -match '^(.+)_smooth$') { + return 'normal' + } + if ($recipeName -match '^(.+)_(raw|brick)_(stairs|slab|wall)_polishing$' -or + $recipeName -match '^(.+)_brick_block_polishing$') { + return 'ore_dictionary' + } + return '' +} + +function Add-SandUnlockCriteria( + [System.Collections.IDictionary] $criteria, + [string] $sandMode +) { + if ([string]::IsNullOrWhiteSpace($sandMode)) { + return + } + + $criteria['has_sand'] = [ordered]@{ + trigger = 'minecraft:inventory_changed' + conditions = [ordered]@{ + items = @([ordered]@{ item = 'minecraft:sand' }) + } + } + if ($sandMode -eq 'ore_dictionary') { + $criteria['has_red_sand'] = [ordered]@{ + trigger = 'minecraft:inventory_changed' + conditions = [ordered]@{ + items = @([ordered]@{ item = 'minecraft:red_sand' }) + } + } + } +} + +function Get-UnlockRequirements([string] $sandMode) { + $requirements = @() + $requirements += ,@('has_the_recipe', 'has_rock') + if ($sandMode -eq 'ore_dictionary') { + $requirements += ,@('has_the_recipe', 'has_sand', 'has_red_sand') + } + elseif ($sandMode -eq 'normal') { + $requirements += ,@('has_the_recipe', 'has_sand') + } + return ,$requirements +} + +function Resolve-IngredientItem([object] $ingredient) { + if ($null -ne $ingredient.item) { return [string]$ingredient.item } + $tag = [string]$ingredient.tag + if ($tag -match '^mineralogy:(stones|slabs)/([^/]+)(?:/(brick|smooth|smooth_brick))?$') { + $family = $Matches[2] + $finish = [string]$Matches[3] + if ($Matches[1] -eq 'slabs') { + return "mineralogy:${family}_$(if ($finish) { "${finish}_" })slab" + } + return "mineralogy:${family}$(if ($finish) { "_${finish}" })" + } + return '' +} + +function Infer-UnlockSource([string] $recipeName, [object] $recipe) { + if ($unlockSources.ContainsKey($recipeName)) { return [string]$unlockSources[$recipeName] } + if ($null -ne $recipe.ingredients -and $recipe.ingredients.Count -gt 0) { + return Resolve-IngredientItem $recipe.ingredients[0] + } + if ($null -ne $recipe.ingredient) { return Resolve-IngredientItem $recipe.ingredient } + if ($null -ne $recipe.key) { + $first = $recipe.key.PSObject.Properties | Select-Object -First 1 + if ($null -ne $first) { return Resolve-IngredientItem $first.Value } + } + return '' +} + +function Write-ShapedRecipe( + [string] $name, + [string] $type, + [string[]] $pattern, + [System.Collections.IDictionary] $key, + [string] $result, + [int] $count, + [object[]] $conditions +) { + if ($type.StartsWith('forge:ore_')) { $type = 'minecraft:crafting_shaped' } + Write-Recipe $name ([ordered]@{ + conditions = $conditions + type = $type + pattern = $pattern + key = $key + result = RecipeResult $result $count + }) +} + +function Write-ShapelessRecipe( + [string] $name, + [string] $type, + [object[]] $ingredients, + [string] $result, + [int] $count, + [object[]] $conditions +) { + if ($type.StartsWith('forge:ore_')) { $type = 'minecraft:crafting_shapeless' } + Write-Recipe $name ([ordered]@{ + conditions = $conditions + type = $type + ingredients = $ingredients + result = RecipeResult $result $count + }) +} + +function FamilyOreName([string] $prefix, [string] $family, [string] $suffix = '') { + $material = $family.Substring(0, 1).ToUpperInvariant() + $family.Substring(1) + return "$prefix$material$suffix" +} + +function Write-BaseFamilyRecipes([string] $family) { + $raw = ItemId $family + $rawOre = FamilyOreName 'stone' $family + $brick = ItemId "${family}_brick" + $brickOre = FamilyOreName 'stone' $family 'Brick' + $smooth = ItemId "${family}_smooth" + $smoothOre = FamilyOreName 'stone' $family 'Smooth' + $smoothBrick = ItemId "${family}_smooth_brick" + $smoothBrickOre = FamilyOreName 'stone' $family 'SmoothBrick' + + Write-ShapelessRecipe "${family}_cobblestone" 'forge:ore_shapeless' @( + (OreIngredient $rawOre), (OreIngredient $rawOre), + (ItemIngredient 'minecraft:gravel'), (ItemIngredient 'minecraft:gravel') + ) 'minecraft:cobblestone' 4 @() + Register-UnlockSource "${family}_cobblestone" $raw + + Write-ShapedRecipe "${family}_stairs" 'forge:ore_shaped' @('x ', 'xx ', 'xxx') ` + ([ordered]@{ x = OreIngredient $rawOre }) (ItemId "${family}_stairs") 4 ` + (ConditionsFor (ItemId "${family}_stairs")) + Write-ShapedRecipe "${family}_slab" 'minecraft:crafting_shaped' @('xxx') ` + ([ordered]@{ x = ItemIngredient $raw }) (ItemId "${family}_slab") 6 ` + (ConditionsFor (ItemId "${family}_slab")) + Write-ShapedRecipe "${family}_furnace" 'forge:ore_shaped' @('xxx', 'xyx', 'xxx') ` + ([ordered]@{ x = OreIngredient (FamilyOreName 'slab' $family); y = ItemIngredient 'minecraft:furnace' }) ` + (ItemId "${family}_furnace") 1 (ConditionsFor (ItemId "${family}_furnace")) + Write-ShapedRecipe "${family}_wall" 'forge:ore_shaped' @('xxx', 'xxx') ` + ([ordered]@{ x = OreIngredient $rawOre }) (ItemId "${family}_wall") 6 ` + (ConditionsFor (ItemId "${family}_wall")) + + Write-ShapedRecipe "${family}_brick" 'forge:ore_shaped' @('xx', 'xx') ` + ([ordered]@{ x = OreIngredient $rawOre }) $brick 4 (ConditionsFor $brick) + Write-ShapedRecipe "${family}_brick_stairs" 'forge:ore_shaped' @('x ', 'xx ', 'xxx') ` + ([ordered]@{ x = OreIngredient $brickOre }) (ItemId "${family}_brick_stairs") 4 ` + (ConditionsFor (ItemId "${family}_brick_stairs")) + Write-ShapedRecipe "${family}_brick_slab" 'minecraft:crafting_shaped' @('xxx') ` + ([ordered]@{ x = ItemIngredient $brick }) (ItemId "${family}_brick_slab") 6 ` + (ConditionsFor (ItemId "${family}_brick_slab")) + Write-ShapedRecipe "${family}_brick_furnace" 'forge:ore_shaped' @('xxx', 'xyx', 'xxx') ` + ([ordered]@{ x = OreIngredient (FamilyOreName 'slab' $family 'Brick'); y = ItemIngredient 'minecraft:furnace' }) ` + (ItemId "${family}_brick_furnace") 1 (ConditionsFor (ItemId "${family}_brick_furnace")) + Write-ShapedRecipe "${family}_brick_wall" 'forge:ore_shaped' @('xxx', 'xxx') ` + ([ordered]@{ x = OreIngredient $brickOre }) (ItemId "${family}_brick_wall") 6 ` + (ConditionsFor (ItemId "${family}_brick_wall")) + + Write-ShapelessRecipe "${family}_smooth" 'forge:ore_shapeless' @( + (OreIngredient $rawOre), (ItemIngredient 'minecraft:sand' 0) + ) $smooth 1 (ConditionsFor $smooth) + Write-ShapedRecipe "${family}_smooth_stairs" 'forge:ore_shaped' @('x ', 'xx ', 'xxx') ` + ([ordered]@{ x = OreIngredient $smoothOre }) (ItemId "${family}_smooth_stairs") 4 ` + (ConditionsFor (ItemId "${family}_smooth_stairs")) + Write-ShapedRecipe "${family}_smooth_slab" 'minecraft:crafting_shaped' @('xxx') ` + ([ordered]@{ x = ItemIngredient $smooth }) (ItemId "${family}_smooth_slab") 6 ` + (ConditionsFor (ItemId "${family}_smooth_slab")) + Write-ShapedRecipe "${family}_smooth_furnace" 'forge:ore_shaped' @('xxx', 'xyx', 'xxx') ` + ([ordered]@{ x = OreIngredient (FamilyOreName 'slab' $family 'Smooth'); y = ItemIngredient 'minecraft:furnace' }) ` + (ItemId "${family}_smooth_furnace") 1 (ConditionsFor (ItemId "${family}_smooth_furnace")) + Write-ShapedRecipe "${family}_smooth_wall" 'forge:ore_shaped' @('xxx', 'xxx') ` + ([ordered]@{ x = OreIngredient $smoothOre }) (ItemId "${family}_smooth_wall") 6 ` + (ConditionsFor (ItemId "${family}_smooth_wall")) + + Write-ShapedRecipe "${family}_smooth_brick" 'forge:ore_shaped' @('xx', 'xx') ` + ([ordered]@{ x = OreIngredient $smoothOre }) $smoothBrick 4 (ConditionsFor $smoothBrick) + Write-ShapedRecipe "${family}_smooth_brick_stairs" 'forge:ore_shaped' @('x ', 'xx ', 'xxx') ` + ([ordered]@{ x = OreIngredient $smoothBrickOre }) (ItemId "${family}_smooth_brick_stairs") 4 ` + (ConditionsFor (ItemId "${family}_smooth_brick_stairs")) + Write-ShapedRecipe "${family}_smooth_brick_slab" 'minecraft:crafting_shaped' @('xxx') ` + ([ordered]@{ x = ItemIngredient $smoothBrick }) (ItemId "${family}_smooth_brick_slab") 6 ` + (ConditionsFor (ItemId "${family}_smooth_brick_slab")) + Write-ShapedRecipe "${family}_smooth_brick_furnace" 'forge:ore_shaped' @('xxx', 'xyx', 'xxx') ` + ([ordered]@{ x = OreIngredient (FamilyOreName 'slab' $family 'SmoothBrick'); y = ItemIngredient 'minecraft:furnace' }) ` + (ItemId "${family}_smooth_brick_furnace") 1 (ConditionsFor (ItemId "${family}_smooth_brick_furnace")) + Write-ShapedRecipe "${family}_smooth_brick_wall" 'forge:ore_shaped' @('xxx', 'xxx') ` + ([ordered]@{ x = OreIngredient $smoothBrickOre }) (ItemId "${family}_smooth_brick_wall") 6 ` + (ConditionsFor (ItemId "${family}_smooth_brick_wall")) +} + +function Write-ReliefRecipes([string] $family) { + $smooth = ItemId "${family}_smooth" + $blank = ItemId "${family}_relief_blank" + $left = ItemId "${family}_relief_left" + + Write-ShapedRecipe "${family}_relief_blank" 'minecraft:crafting_shaped' @('xxx', 'xxx', 'xxx') ` + ([ordered]@{ x = ItemIngredient $smooth }) $blank 16 (ConditionsFor $blank) + Write-ShapedRecipe "${family}_relief_cross" 'minecraft:crafting_shaped' @('x x', ' ', 'x x') ` + ([ordered]@{ x = ItemIngredient $blank }) (ItemId "${family}_relief_cross") 4 ` + (ConditionsFor (ItemId "${family}_relief_cross")) + Write-ShapedRecipe "${family}_relief_hammer" 'minecraft:crafting_shaped' @('zxz', 'zyz', 'zzz') ` + ([ordered]@{ x = ItemIngredient $smooth; y = ItemIngredient 'minecraft:stick'; z = ItemIngredient $blank }) ` + (ItemId "${family}_relief_hammer") 7 (ConditionsFor (ItemId "${family}_relief_hammer")) + Write-ShapedRecipe "${family}_relief_horizontal" 'minecraft:crafting_shaped' @('xxx') ` + ([ordered]@{ x = ItemIngredient $blank }) (ItemId "${family}_relief_horizontal") 3 ` + (ConditionsFor (ItemId "${family}_relief_horizontal")) + Write-ShapedRecipe "${family}_relief_left" 'minecraft:crafting_shaped' @('x ', ' x ', ' x') ` + ([ordered]@{ x = ItemIngredient $blank }) $left 3 ` + (ConditionsFor (ItemId "${family}_relief_left")) + Write-ShapedRecipe "${family}_relief_plus" 'minecraft:crafting_shaped' @(' x ', 'xxx', ' x ') ` + ([ordered]@{ x = ItemIngredient $blank }) (ItemId "${family}_relief_plus") 5 ` + (ConditionsFor (ItemId "${family}_relief_plus")) + Write-ShapelessRecipe "${family}_relief_right" 'minecraft:crafting_shapeless' ` + @((ItemIngredient $left), (ItemIngredient $left)) (ItemId "${family}_relief_right") 2 ` + (ConditionsFor (ItemId "${family}_relief_right")) + Write-ShapedRecipe "${family}_relief_i" 'minecraft:crafting_shaped' @('xxx', ' x ', 'xxx') ` + ([ordered]@{ x = ItemIngredient $blank }) (ItemId "${family}_relief_i") 7 ` + (ConditionsFor (ItemId "${family}_relief_i")) + Write-ShapedRecipe "${family}_relief_vertical" 'minecraft:crafting_shaped' @('x', 'x', 'x') ` + ([ordered]@{ x = ItemIngredient $blank }) (ItemId "${family}_relief_vertical") 3 ` + (ConditionsFor (ItemId "${family}_relief_vertical")) + + foreach ($tool in @('axe', 'hoe', 'pickaxe', 'sword')) { + $ingredients = @() + for ($index = 0; $index -lt 8; $index++) { + $ingredients += ,(ItemIngredient $blank) + } + $ingredients += ,(ItemIngredient "minecraft:stone_$tool" 0) + $result = ItemId "${family}_relief_${tool}" + Write-ShapelessRecipe "${family}_relief_${tool}" 'minecraft:crafting_shapeless' ` + $ingredients $result 8 (ConditionsFor $result) + } +} + +function Write-ConstructionRecipes([string] $family) { + $forms = [ordered]@{ + raw = [ordered]@{ block = ItemId $family; stairs = ItemId "${family}_stairs"; slab = ItemId "${family}_slab"; wall = ItemId "${family}_wall" } + brick = [ordered]@{ block = ItemId "${family}_brick"; stairs = ItemId "${family}_brick_stairs"; slab = ItemId "${family}_brick_slab"; wall = ItemId "${family}_brick_wall" } + polished = [ordered]@{ block = ItemId "${family}_smooth"; stairs = ItemId "${family}_smooth_stairs"; slab = ItemId "${family}_smooth_slab"; wall = ItemId "${family}_smooth_wall" } + polished_brick = [ordered]@{ block = ItemId "${family}_smooth_brick"; stairs = ItemId "${family}_smooth_brick_stairs"; slab = ItemId "${family}_smooth_brick_slab"; wall = ItemId "${family}_smooth_brick_wall" } + } + + foreach ($finish in $forms.Keys) { + $form = $forms[$finish] + Write-ShapelessRecipe "${family}_${finish}_slab_recombination" 'minecraft:crafting_shapeless' ` + @((ItemIngredient $form.slab), (ItemIngredient $form.slab)) $form.block 1 ` + @((ItemCondition $form.slab), (ItemCondition $form.block)) + Register-UnlockSource "${family}_${finish}_slab_recombination" $form.slab + } + + foreach ($conversion in @( + [ordered]@{ name = 'raw'; source = $forms.raw; target = $forms.brick }, + [ordered]@{ name = 'polished'; source = $forms.polished; target = $forms.polished_brick } + )) { + foreach ($shape in @('stairs', 'slab', 'wall')) { + $plural = if ($shape -eq 'slab') { 'slabs' } elseif ($shape -eq 'wall') { 'walls' } else { 'stairs' } + Write-ShapedRecipe "${family}_$($conversion.name)_${plural}_to_brick" 'minecraft:crafting_shaped' ` + @('xx', 'xx') ([ordered]@{ x = ItemIngredient $conversion.source[$shape] }) ` + $conversion.target[$shape] 4 ` + @((ItemCondition $conversion.source[$shape]), (ItemCondition $conversion.target[$shape])) + Register-UnlockSource "${family}_$($conversion.name)_${plural}_to_brick" ` + $conversion.source[$shape] + } + } + + foreach ($polishing in @( + [ordered]@{ name = 'raw'; source = $forms.raw; target = $forms.polished }, + [ordered]@{ name = 'brick'; source = $forms.brick; target = $forms.polished_brick } + )) { + foreach ($shape in @('stairs', 'slab', 'wall')) { + Write-ShapelessRecipe "${family}_$($polishing.name)_${shape}_polishing" 'forge:ore_shapeless' ` + @((ItemIngredient $polishing.source[$shape]), (OreIngredient 'sand')) ` + $polishing.target[$shape] 1 ` + @((ItemCondition $polishing.source[$shape]), (ItemCondition $polishing.target[$shape])) + Register-UnlockSource "${family}_$($polishing.name)_${shape}_polishing" ` + $polishing.source[$shape] + } + } + + Write-ShapelessRecipe "${family}_brick_block_polishing" 'forge:ore_shapeless' ` + @((ItemIngredient $forms.brick.block), (OreIngredient 'sand')) $forms.polished_brick.block 1 ` + @((ItemCondition $forms.brick.block), (ItemCondition $forms.polished_brick.block)) + Register-UnlockSource "${family}_brick_block_polishing" $forms.brick.block +} + +function Write-GlobalRecipes() { + $drywallCondition = ConfigCondition 'ENABLE_DRYWALLS' + for ($metadata = 0; $metadata -lt $colors.Count; $metadata++) { + $result = ItemId "drywall_$($colors[$metadata])" + Write-ShapelessRecipe "drywall_$($colors[$metadata])" 'forge:ore_shapeless' @( + (OreIngredient 'drywallWhite'), (ItemIngredient 'minecraft:dye' $metadata) + ) $result 1 (ConditionsFor $result @($drywallCondition)) + Register-UnlockSource "drywall_$($colors[$metadata])" (ItemId 'drywall_white') + } + + $dustCondition = ConfigCondition 'ENABLE_MINERAL_DUSTS' + $gunpowderTail = @((OreIngredient 'dustNitrate'), (OreIngredient 'dustSulfur')) + Write-ShapelessRecipe 'gunpowder_from_sugar' 'forge:ore_shapeless' ` + (@((ItemIngredient 'minecraft:sugar')) + $gunpowderTail) 'minecraft:gunpowder' 4 @($dustCondition) + Register-UnlockSource 'gunpowder_from_sugar' (ItemId 'nitrate_dust') + Write-ShapelessRecipe 'gunpowder_from_charcoal' 'forge:ore_shapeless' ` + (@((ItemIngredient 'minecraft:coal' 1)) + $gunpowderTail) 'minecraft:gunpowder' 4 @($dustCondition) + Register-UnlockSource 'gunpowder_from_charcoal' (ItemId 'nitrate_dust') + Write-ShapelessRecipe 'gunpowder_from_carbon_dust' 'forge:ore_shapeless' ` + (@((OreIngredient 'dustCarbon')) + $gunpowderTail) 'minecraft:gunpowder' 4 ` + @($dustCondition, (ItemTagNotEmptyCondition 'forge:dusts/carbon')) + Register-UnlockSource 'gunpowder_from_carbon_dust' (ItemId 'nitrate_dust') + Write-ShapelessRecipe 'gunpowder_from_coal_dust' 'forge:ore_shapeless' ` + (@((OreIngredient 'dustCoal')) + $gunpowderTail) 'minecraft:gunpowder' 4 ` + @($dustCondition, (ItemTagNotEmptyCondition 'forge:dusts/coal')) + Register-UnlockSource 'gunpowder_from_coal_dust' (ItemId 'nitrate_dust') + + Write-ShapelessRecipe 'mineralfertilizer' 'forge:ore_shapeless' @( + (OreIngredient 'dustNitrate'), (OreIngredient 'dustPhosphorous') + ) (ItemId 'mineral_fertilizer') 1 ` + (ConditionsFor (ItemId 'mineral_fertilizer') @((ConfigCondition 'ENABLE_MINERAL_FERTILIZER'))) + Register-UnlockSource 'mineralfertilizer' (ItemId 'nitrate_dust') + + Write-ShapelessRecipe 'cobblestone' 'minecraft:crafting_shapeless' @( + (ItemIngredient 'minecraft:stone' 0), (ItemIngredient 'minecraft:stone' 0), + (ItemIngredient 'minecraft:gravel'), (ItemIngredient 'minecraft:gravel') + ) 'minecraft:cobblestone' 4 @() + Register-UnlockSource 'cobblestone' 'minecraft:stone' + + foreach ($storage in @( + [ordered]@{ name = 'gypsum'; dust = 'dustGypsum'; blockOre = 'blockGypsum'; dustItem = 'gypsum_dust'; blockItem = 'gypsum' }, + [ordered]@{ name = 'chalk'; dust = 'dustChalk'; blockOre = 'blockChalk'; dustItem = 'chalk_dust'; blockItem = 'chalk' }, + [ordered]@{ name = 'rock_salt'; dust = 'dustRock_salt'; blockOre = 'blockRocksalt'; dustItem = 'rock_salt_dust'; blockItem = 'rock_salt' } + )) { + $block = ItemId $storage.blockItem + Write-ShapedRecipe $storage.name 'forge:ore_shaped' @('xx', 'xx') ` + ([ordered]@{ x = OreIngredient $storage.dust }) $block 1 (ConditionsFor $block) + Register-UnlockSource $storage.name (ItemId $storage.dustItem) + Write-ShapelessRecipe "$($storage.name)_dust" 'forge:ore_shapeless' @( + (OreIngredient $storage.blockOre) + ) (ItemId $storage.dustItem) 4 (ConditionsFor (ItemId $storage.dustItem)) + Register-UnlockSource "$($storage.name)_dust" $block + } + + Write-ShapedRecipe 'drywall' 'forge:ore_shaped' @('pgp', 'pgp', 'pgp') ` + ([ordered]@{ p = OreIngredient 'paper'; g = OreIngredient 'dustGypsum' }) ` + (ItemId 'drywall_white') 3 ` + (ConditionsFor (ItemId 'drywall_white') @($drywallCondition)) + Register-UnlockSource 'drywall' (ItemId 'gypsum_dust') + + $lampCondition = ConfigCondition 'ENABLE_ROCK_SALT_LAMPS' + Write-ShapelessRecipe 'rocksaltlamp' 'minecraft:crafting_shapeless' @( + (ItemIngredient (ItemId 'rock_salt')), (ItemIngredient 'minecraft:torch'), + (ItemIngredient 'minecraft:iron_ingot') + ) (ItemId 'rocksaltlamp') 1 ` + (ConditionsFor (ItemId 'rocksaltlamp') @($lampCondition)) + Register-UnlockSource 'rocksaltlamp' (ItemId 'rock_salt') + Write-ShapedRecipe 'rocksaltstreetlamp' 'forge:ore_shaped' @('x', 'y', 'y') ` + ([ordered]@{ x = OreIngredient 'lampRocksalt'; y = ItemIngredient 'minecraft:iron_ingot' }) ` + (ItemId 'rocksaltstreetlamp') 1 ` + (ConditionsFor (ItemId 'rocksaltstreetlamp') @($lampCondition)) + Register-UnlockSource 'rocksaltstreetlamp' (ItemId 'rocksaltlamp') + + foreach ($mineral in @('sulfur', 'phosphorous', 'nitrate')) { + $material = $mineral.Substring(0, 1).ToUpperInvariant() + $mineral.Substring(1) + $block = ItemId "${mineral}_block" + $dust = ItemId "${mineral}_dust" + Write-ShapedRecipe "${mineral}_block" 'minecraft:crafting_shaped' @('xxx', 'xxx', 'xxx') ` + ([ordered]@{ x = ItemIngredient $dust }) $block 1 ` + (ConditionsFor $block @($dustCondition)) + Register-UnlockSource "${mineral}_block" $dust + Write-ShapelessRecipe "${mineral}_dust" 'forge:ore_shapeless' @( + (OreIngredient "block$material") + ) $dust 9 (ConditionsFor $dust @($dustCondition)) + Register-UnlockSource "${mineral}_dust" $block + } +} + +function Write-Factories() { + $factories = [ordered]@{ + conditions = [ordered]@{ + config = 'zone.moddev.mc.mineralogy.recipe.ConfigConditionFactory' + } + } + Write-Json (Join-Path $recipeRoot '_factories.json') $factories + Write-Json (Join-Path (Split-Path -Parent $advancementRoot) '_factories.json') $factories +} + +function Ensure-MissingRecipeAdvancements() { + $recipeFiles = Get-ChildItem -LiteralPath $recipeRoot -Filter '*.json' | + Where-Object { -not $_.Name.StartsWith('_') } + $created = 0 + foreach ($recipeFile in $recipeFiles) { + $recipeName = $recipeFile.BaseName + $advancementFile = Join-Path $advancementRoot "$recipeName.json" + if (Test-Path -LiteralPath $advancementFile) { + continue + } + $recipe = Get-Content -LiteralPath $recipeFile.FullName -Raw | ConvertFrom-Json + $sourceItem = Infer-UnlockSource $recipeName $recipe + if ([string]::IsNullOrWhiteSpace($sourceItem)) { + throw "Generated recipe $recipeName has no direct recipe-book unlock source" + } + $criteria = [ordered]@{ + has_the_recipe = [ordered]@{ + trigger = 'minecraft:recipe_unlocked' + conditions = [ordered]@{ recipe = "mineralogy:$recipeName" } + } + has_rock = [ordered]@{ + trigger = 'minecraft:inventory_changed' + conditions = [ordered]@{ + items = @([ordered]@{ item = $sourceItem }) + } + } + } + $sandMode = Get-SandUnlockMode $recipeName + Add-SandUnlockCriteria $criteria $sandMode + $requirements = Get-UnlockRequirements $sandMode + if ($recipeName -match '_furnace$') { + $criteria['has_furnace'] = [ordered]@{ + trigger = 'minecraft:inventory_changed' + conditions = [ordered]@{ items = @([ordered]@{ item = 'minecraft:furnace' }) } + } + $requirements += ,@('has_the_recipe', 'has_furnace') + } + + $generatedAdvancement = [ordered]@{} + if ($null -ne $recipe.conditions) { + $generatedAdvancement.conditions = @($recipe.conditions) + } + $generatedAdvancement.rewards = [ordered]@{ recipes = @("mineralogy:$recipeName") } + $generatedAdvancement.criteria = $criteria + $generatedAdvancement.requirements = $requirements + Write-Json $advancementFile $generatedAdvancement + $created++ + } + return $created +} + +function Synchronize-AdvancementConditions() { + $files = Get-ChildItem -LiteralPath $advancementRoot -Filter '*.json' + foreach ($file in $files) { + $advancement = Get-Content -LiteralPath $file.FullName -Raw | ConvertFrom-Json + $recipeId = [string]$advancement.rewards.recipes[0] + if (-not $recipeId.StartsWith('mineralogy:')) { + throw "Unexpected recipe reward in $($file.FullName): $recipeId" + } + $recipeName = $recipeId.Substring('mineralogy:'.Length) + $recipeFile = Join-Path $recipeRoot "$recipeName.json" + if (-not (Test-Path -LiteralPath $recipeFile)) { + throw "Advancement $($file.Name) references missing generated recipe $recipeId" + } + $recipe = Get-Content -LiteralPath $recipeFile -Raw | ConvertFrom-Json + if ($recipeName -match '^(.+)_relief_(.+)$') { + $family = $Matches[1] + $relief = $Matches[2] + if ($relief -eq 'blank') { + $sourceItem = "mineralogy:${family}_smooth" + } + elseif ($relief -eq 'right') { + $sourceItem = "mineralogy:${family}_relief_left" + } + else { + $sourceItem = "mineralogy:${family}_relief_blank" + } + $advancement.criteria.has_rock.conditions.items[0].item = $sourceItem + } + if ($null -eq $advancement.criteria.has_the_recipe -or $null -eq $advancement.criteria.has_rock) { + throw "Advancement $($file.Name) must have self-recipe and direct-input criteria" + } + $criteria = [ordered]@{} + foreach ($criterion in $advancement.criteria.PSObject.Properties) { + if ($criterion.Name -notin @('has_material_recipe', 'has_sand', 'has_red_sand')) { + $criteria[$criterion.Name] = $criterion.Value + } + } + $sandMode = Get-SandUnlockMode $recipeName + Add-SandUnlockCriteria $criteria $sandMode + $requirements = Get-UnlockRequirements $sandMode + if ($recipeName -match '_furnace$') { + $requirements += ,@('has_the_recipe', 'has_furnace') + } + + $ordered = [ordered]@{} + if ($null -ne $recipe.conditions) { + $ordered.conditions = @($recipe.conditions) + } + foreach ($property in $advancement.PSObject.Properties) { + if ($property.Name -eq 'criteria') { + $ordered[$property.Name] = $criteria + } + elseif ($property.Name -eq 'requirements') { + $ordered[$property.Name] = $requirements + } + elseif ($property.Name -ne 'conditions') { + $ordered[$property.Name] = $property.Value + } + } + Write-Json $file.FullName $ordered + } + return $files.Count +} + +function Prepare-TargetDirectories() { + New-Item -ItemType Directory -Force -Path $recipeRoot | Out-Null + New-Item -ItemType Directory -Force -Path $advancementRoot | Out-Null + + foreach ($file in Get-ChildItem -LiteralPath $recipeRoot -Filter '*.json') { + $recipe = Get-Content -LiteralPath $file.FullName -Raw | ConvertFrom-Json + if ($recipe.type -eq 'minecraft:smelting') { + if ($null -eq $recipe.ingredient.item) { + throw "Smelting recipe $($file.Name) has no direct item ingredient" + } + Register-UnlockSource $file.BaseName ([string]$recipe.ingredient.item) + } + else { + Remove-Item -LiteralPath $file.FullName + } + } + foreach ($file in Get-ChildItem -LiteralPath $advancementRoot -Filter '*.json') { + Remove-Item -LiteralPath $file.FullName + } +} + +function Write-TargetTags() { + foreach ($family in $families) { + foreach ($finish in @('', 'brick', 'smooth', 'smooth_brick')) { + $suffix = if ($finish) { "_$finish" } else { '' } + $pathSuffix = if ($finish) { "/$finish" } else { '' } + foreach ($kind in @('stones', 'slabs')) { + $item = if ($kind -eq 'slabs') { + "mineralogy:${family}${suffix}_slab" + } + else { + "mineralogy:${family}${suffix}" + } + $destination = Join-Path $itemTagRoot "$kind\$family$pathSuffix.json" + New-Item -ItemType Directory -Force -Path (Split-Path -Parent $destination) | Out-Null + Write-Json $destination ([ordered]@{ replace = $false; values = @($item) }) + } + } + } +} + +Prepare-TargetDirectories +Write-TargetTags +New-Item -ItemType Directory -Force -Path $recipeRoot | Out-Null + +foreach ($family in $families) { + Write-BaseFamilyRecipes $family + Write-ReliefRecipes $family + Write-ConstructionRecipes $family +} +Write-GlobalRecipes + +$expectedRecipeCount = ($families.Count * 50) + 37 +if ($generatedNames.Count -ne $expectedRecipeCount) { + throw "Expected $expectedRecipeCount generated recipes, produced $($generatedNames.Count)" +} + +$expectedTargetRecipeCount = $expectedRecipeCount + 28 +$recipeFiles = Get-ChildItem -LiteralPath $recipeRoot -Filter '*.json' | + Where-Object { -not $_.Name.StartsWith('_') } +if ($recipeFiles.Count -ne $expectedTargetRecipeCount) { + throw "Expected $expectedTargetRecipeCount target recipe files, found $($recipeFiles.Count)" +} + +$createdAdvancements = Ensure-MissingRecipeAdvancements +$advancementCount = Synchronize-AdvancementConditions +if ($advancementCount -ne $expectedTargetRecipeCount) { + throw "Expected $expectedTargetRecipeCount recipe advancements, found $advancementCount" +} +Write-Output "Generated $expectedRecipeCount crafting recipe JSON files, retained 28 target-native smelting recipes, created $createdAdvancements missing recipe advancements, and conditioned $advancementCount recipe advancements." diff --git a/settings.gradle b/settings.gradle index dd95e8368..c66b97cf1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,5 @@ +plugins { + id('org.gradle.toolchains.foojay-resolver-convention') version '1.0.0' +} + rootProject.name = 'Mineralogy' diff --git a/src/main/java/com/mcmoddev/mineralogy/Mineralogy.java b/src/main/java/com/mcmoddev/mineralogy/Mineralogy.java deleted file mode 100644 index e17e96366..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/Mineralogy.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.mcmoddev.mineralogy; - -import java.util.List; - -import com.mcmoddev.mineralogy.init.MineralogyRegistry; -import com.mcmoddev.mineralogy.patching.LegacyWorldDataHook; -import com.mcmoddev.mineralogy.worldgen.MineralogyOreGeneration; -import com.mcmoddev.mineralogy.worldgen.GeomeConfig; -import com.mcmoddev.mineralogy.worldgen.GeomeDistributionSampler; -import com.mcmoddev.mineralogy.worldgen.StoneReplacer; - -import net.minecraft.world.level.block.Block; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.ForgeRegistries; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -@Mod(Mineralogy.MODID) -public class Mineralogy { - public static Mineralogy instance; - - public static final String MODID = "mineralogy"; - public static final String NAME = "Mineralogy"; - public static final String VERSION = getVersion(); - - private static final Logger LOGGER = LogManager.getLogger(); - - private static String getVersion() { - Package metadata = Mineralogy.class.getPackage(); - String version = metadata == null ? null : metadata.getImplementationVersion(); - return version == null ? "DEV" : version; - } - - public Mineralogy() { - instance = this; - MineralogyConfig.register(); - MineralogyConfig.registerRecipeConditions(); - MineralogyConfig.registerAdvancementPredicates(); - LegacyWorldDataHook.registerWorldPersistenceHook(); - - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); - MinecraftForge.EVENT_BUS.addListener(LegacyWorldDataHook::onServerAboutToStart); - MinecraftForge.EVENT_BUS.addListener(StoneReplacer::onBiomeLoading); - MinecraftForge.EVENT_BUS.addListener(MineralogyOreGeneration::onBiomeLoading); - } - - private void setup(final FMLCommonSetupEvent event) { - MineralogyConfig.bake(); - applyGeologyConfigOverrides(); - GeomeConfig.bake(); - logGeomeSampler(); - event.enqueueWork(() -> { - StoneReplacer.registerConfiguredFeature(); - MineralogyOreGeneration.registerConfiguredFeatures(); - }); - } - - private static void logGeomeSampler() { - if (Boolean.getBoolean("mineralogy.geomeSampler")) { - LOGGER.info("\n{}", GeomeDistributionSampler.sample(19780401L, ForgeRegistries.BIOMES.getValues(), 8, 8)); - } - } - - private static void applyGeologyConfigOverrides() { - addBlocks(MineralogyRegistry.igneousStones, MineralogyConfig.igneousWhitelist()); - addBlocks(MineralogyRegistry.metamorphicStones, MineralogyConfig.metamorphicWhitelist()); - addBlocks(MineralogyRegistry.sedimentaryStones, MineralogyConfig.sedimentaryWhitelist()); - removeBlocks(MineralogyRegistry.igneousStones, MineralogyConfig.igneousBlacklist()); - removeBlocks(MineralogyRegistry.metamorphicStones, MineralogyConfig.metamorphicBlacklist()); - removeBlocks(MineralogyRegistry.sedimentaryStones, MineralogyConfig.sedimentaryBlacklist()); - } - - private static void addBlocks(List target, List ids) { - for (String id : ids) { - Block block = getBlock(id); - if (block != null && !target.contains(block)) { - target.add(block); - } - } - } - - private static void removeBlocks(List target, List ids) { - for (String id : ids) { - Block block = getBlock(id); - if (block != null) { - target.remove(block); - } - } - } - - private static Block getBlock(String id) { - try { - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(id)); - if (block == null) { - LOGGER.warn("Ignoring unknown Mineralogy geology config block id '{}'", id); - } - return block; - } catch (RuntimeException e) { - LOGGER.warn("Ignoring invalid Mineralogy geology config block id '{}'", id); - return null; - } - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/MineralogyConfig.java b/src/main/java/com/mcmoddev/mineralogy/MineralogyConfig.java deleted file mode 100644 index 1c2885eef..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/MineralogyConfig.java +++ /dev/null @@ -1,682 +0,0 @@ -package com.mcmoddev.mineralogy; - -import java.util.Collections; -import java.util.ArrayList; -import java.util.List; -import java.util.function.BooleanSupplier; -import java.util.stream.Collectors; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonSyntaxException; - -import net.minecraft.advancements.critereon.ItemPredicate; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.util.GsonHelper; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.common.crafting.CraftingHelper; -import net.minecraftforge.common.crafting.conditions.ICondition; -import net.minecraftforge.common.crafting.conditions.IConditionSerializer; -import net.minecraftforge.common.ForgeConfigSpec; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.config.ModConfig; -import net.minecraftforge.registries.ForgeRegistries; - -public final class MineralogyConfig { - public static final ForgeConfigSpec SPEC; - - private static final ForgeConfigSpec.DoubleValue ROCK_LAYER_NOISE; - private static final ForgeConfigSpec.IntValue GEOME_SIZE; - private static final ForgeConfigSpec.IntValue ROCK_LAYER_THICKNESS; - private static final ForgeConfigSpec.EnumValue GEOLOGY_MODE; - private static final ForgeConfigSpec.BooleanValue PLACE_MINERALOGY_ROCK; - private static final ForgeConfigSpec.BooleanValue SMELTABLE_GRAVEL; - private static final ForgeConfigSpec.BooleanValue DROP_COBBLESTONE; - private static final ForgeConfigSpec.BooleanValue PATCH_UPDATE; - private static final ForgeConfigSpec.BooleanValue COBBLESTONE_EQUIVILENT; - private static final ForgeConfigSpec.BooleanValue GENERATE_RELIEFS; - private static final ForgeConfigSpec.BooleanValue GENERATE_ROCKSTAIRS; - private static final ForgeConfigSpec.BooleanValue GENERATE_ROCKFURNACE; - private static final ForgeConfigSpec.BooleanValue GENERATE_ROCKSLAB; - private static final ForgeConfigSpec.BooleanValue GENERATE_ROCKWALL; - private static final ForgeConfigSpec.BooleanValue GENERATE_BRICK; - private static final ForgeConfigSpec.BooleanValue GENERATE_BRICKFURNACE; - private static final ForgeConfigSpec.BooleanValue GENERATE_BRICKSTAIRS; - private static final ForgeConfigSpec.BooleanValue GENERATE_BRICKSLAB; - private static final ForgeConfigSpec.BooleanValue GENERATE_BRICKWALL; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTH; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHFURNACE; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHSTAIRS; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHSLAB; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHWALL; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHBRICK; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHBRICKFURNACE; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHBRICKSTAIRS; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHBRICKSLAB; - private static final ForgeConfigSpec.BooleanValue GENERATE_SMOOTHBRICKWALL; - private static final ForgeConfigSpec.BooleanValue GROUP_TABS_BY_TYPE; - private static final ForgeConfigSpec.ConfigValue> IGNEOUS_BLACKLIST; - private static final ForgeConfigSpec.ConfigValue> SEDIMENTARY_BLACKLIST; - private static final ForgeConfigSpec.ConfigValue> METAMORPHIC_BLACKLIST; - private static final ForgeConfigSpec.ConfigValue> IGNEOUS_WHITELIST; - private static final ForgeConfigSpec.ConfigValue> SEDIMENTARY_WHITELIST; - private static final ForgeConfigSpec.ConfigValue> METAMORPHIC_WHITELIST; - private static final OreConfigSpec SULFUR_ORE; - private static final OreConfigSpec PHOSPHOROUS_ORE; - private static final OreConfigSpec NITRATE_ORE; - - private static double rockLayerNoise = 32.0D; - private static int geomeSize = 100; - private static int geomLayerThickness = 8; - private static GeologyMode geologyMode = GeologyMode.GEOME; - private static boolean placeMineralogyRock = true; - private static boolean smeltableGravel = true; - private static boolean dropCobblestone = false; - private static boolean patchUpdate = true; - private static boolean makeRockCobblestoneEquivilent = true; - private static boolean generateReliefs = true; - private static boolean generateRockStairs = true; - private static boolean generateRockFurnace = true; - private static boolean generateRockSlab = true; - private static boolean generateRockWall = true; - private static boolean generateBrick = true; - private static boolean generateBrickFurnace = true; - private static boolean generateBrickStairs = true; - private static boolean generateBrickSlab = true; - private static boolean generateBrickWall = true; - private static boolean generateSmooth = true; - private static boolean generateSmoothFurnace = true; - private static boolean generateSmoothStairs = true; - private static boolean generateSmoothSlab = true; - private static boolean generateSmoothWall = true; - private static boolean generateSmoothBrick = true; - private static boolean generateSmoothBrickFurnace = true; - private static boolean generateSmoothBrickStairs = true; - private static boolean generateSmoothBrickSlab = true; - private static boolean generateSmoothBrickWall = true; - private static boolean groupCreativeTabItemsByType = false; - private static List igneousWhitelist = Collections.emptyList(); - private static List igneousBlacklist = Collections.emptyList(); - private static List sedimentaryWhitelist = Collections.emptyList(); - private static List sedimentaryBlacklist = Collections.emptyList(); - private static List metamorphicWhitelist = Collections.emptyList(); - private static List metamorphicBlacklist = Collections.emptyList(); - private static OreGenerationSettings sulfurOre = new OreGenerationSettings(16, 64, 1.0D, 16); - private static OreGenerationSettings phosphorousOre = new OreGenerationSettings(16, 64, 1.0D, 16); - private static OreGenerationSettings nitrateOre = new OreGenerationSettings(16, 64, 1.0D, 16); - private static boolean recipeConditionsRegistered = false; - private static boolean advancementPredicatesRegistered = false; - private static final ResourceLocation CONFIG_CONDITION_ID = new ResourceLocation(Mineralogy.MODID, "config"); - - static { - ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder(); - - builder.push("options"); - PLACE_MINERALOGY_ROCK = builder - .comment("If true, then generic stone is replaced with Mineralogy rocks.") - .define("PLACE_MINERALOGY_ROCK", placeMineralogyRock); - PATCH_UPDATE = builder - .comment("If true, then the world patching path may fix compatibility-breaking changes from older versions.") - .define("patch_world", patchUpdate); - SMELTABLE_GRAVEL = builder - .comment("If true, then gravel can be smelted into generic stone. Data recipes may need a restart after changing this.") - .define("SMELTABLE_GRAVEL", smeltableGravel); - DROP_COBBLESTONE = builder - .comment("If true, then ordinary rock blocks also drop cobblestone.") - .define("DROP_COBBLESTONE", dropCobblestone); - COBBLESTONE_EQUIVILENT = builder - .comment("If true, then rock blocks are treated as cobblestone equivalents where the current port supports it.") - .define("COBBLESTONE_EQUIVILENT", makeRockCobblestoneEquivilent); - GENERATE_RELIEFS = builder.comment("If true, then rock reliefs will be generated.") - .define("GENERATE_RELIEFS", generateReliefs); - GENERATE_ROCKSTAIRS = builder.comment("If true, then rock stairs will be generated.") - .define("GENERATE_ROCKSTAIRS", generateRockStairs); - GENERATE_ROCKFURNACE = builder.comment("If true, then rock furnaces will be generated.") - .define("GENERATE_ROCKFURNACE", generateRockFurnace); - GENERATE_ROCKSLAB = builder.comment("If true, then rock slabs will be generated.") - .define("GENERATE_ROCKSLAB", generateRockSlab); - GENERATE_ROCKWALL = builder.comment("If true, then rock walls will be generated.") - .define("GENERATE_ROCKWALL", generateRockWall); - GENERATE_BRICK = builder.comment("If true, then rock brick blocks will be generated.") - .define("GENERATE_BRICK", generateBrick); - GENERATE_BRICKFURNACE = builder.comment("If true, then brick furnaces will be generated.") - .define("GENERATE_BRICKFURNACE", generateBrickFurnace); - GENERATE_BRICKSTAIRS = builder.comment("If true, then brick stairs will be generated.") - .define("GENERATE_BRICKSTAIRS", generateBrickStairs); - GENERATE_BRICKSLAB = builder.comment("If true, then brick slabs will be generated.") - .define("GENERATE_BRICKSLAB", generateBrickSlab); - GENERATE_BRICKWALL = builder.comment("If true, then brick walls will be generated.") - .define("GENERATE_BRICKWALL", generateBrickWall); - GENERATE_SMOOTH = builder.comment("If true, then polished rock will be generated.") - .define("GENERATE_SMOOTH", generateSmooth); - GENERATE_SMOOTHFURNACE = builder.comment("If true, then smooth furnaces will be generated.") - .define("GENERATE_SMOOTHFURNACE", generateSmoothFurnace); - GENERATE_SMOOTHSTAIRS = builder.comment("If true, then polished rock stairs will be generated.") - .define("GENERATE_SMOOTHSTAIRS", generateSmoothStairs); - GENERATE_SMOOTHSLAB = builder.comment("If true, then polished rock slabs will be generated.") - .define("GENERATE_SMOOTHSLAB", generateSmoothSlab); - GENERATE_SMOOTHWALL = builder.comment("If true, then polished walls will be generated.") - .define("GENERATE_SMOOTHWALL", generateSmoothWall); - GENERATE_SMOOTHBRICK = builder.comment("If true, then polished brick blocks will be generated.") - .define("GENERATE_SMOOTHBRICK", generateSmoothBrick); - GENERATE_SMOOTHBRICKFURNACE = builder.comment("If true, then smooth brick furnaces will be generated.") - .define("GENERATE_SMOOTHBRICKFURNACE", generateSmoothBrickFurnace); - GENERATE_SMOOTHBRICKSTAIRS = builder.comment("If true, then polished brick stairs will be generated.") - .define("GENERATE_SMOOTHBRICKSTAIRS", generateSmoothBrickStairs); - GENERATE_SMOOTHBRICKSLAB = builder.comment("If true, then polished brick slabs will be generated.") - .define("GENERATE_SMOOTHBRICKSLAB", generateSmoothBrickSlab); - GENERATE_SMOOTHBRICKWALL = builder.comment("If true, then polished brick walls will be generated.") - .define("GENERATE_SMOOTHBRICKWALL", generateSmoothBrickWall); - GROUP_TABS_BY_TYPE = builder.comment("If true, then creative tabs will be split by item type where supported.") - .define("GROUP_TABS_BY_TYPE", groupCreativeTabItemsByType); - builder.pop(); - - builder.push("world-gen"); - GEOME_SIZE = builder - .comment("Making this value larger increases the size of regions of igneous, sedimentary, and metamorphic rocks.") - .defineInRange("GEOME_SIZE", geomeSize, 4, Short.MAX_VALUE); - GEOLOGY_MODE = builder - .comment("Controls Mineralogy stone replacement. GEOME is the biome-influenced geology model; LEGACY is the old random layer model.") - .defineEnum("GEOLOGY_MODE", geologyMode); - ROCK_LAYER_NOISE = builder - .comment("Changing this value will change the waviness of the layers.") - .defineInRange("ROCK_LAYER_NOISE", rockLayerNoise, 1.0D, Short.MAX_VALUE); - ROCK_LAYER_THICKNESS = builder - .comment("Changing this value will change the height of individual layers.") - .defineInRange("ROCK_LAYER_THICKNESS", geomLayerThickness, 1, 255); - IGNEOUS_BLACKLIST = builder.comment("Ban blocks from spawning in igneous rock layers. Use mod:block entries.") - .defineList("igneous_blacklist", Collections.emptyList(), MineralogyConfig::isString); - SEDIMENTARY_BLACKLIST = builder.comment("Ban blocks from spawning in sedimentary rock layers. Use mod:block entries.") - .defineList("sedimentary_blacklist", Collections.emptyList(), MineralogyConfig::isString); - METAMORPHIC_BLACKLIST = builder.comment("Ban blocks from spawning in metamorphic rock layers. Use mod:block entries.") - .defineList("metamorphic_blacklist", Collections.emptyList(), MineralogyConfig::isString); - IGNEOUS_WHITELIST = builder.comment("Add blocks to igneous rock layers. Use mod:block entries.") - .defineList("igneous_whitelist", Collections.emptyList(), MineralogyConfig::isString); - SEDIMENTARY_WHITELIST = builder.comment("Add blocks to sedimentary rock layers. Use mod:block entries.") - .defineList("sedimentary_whitelist", Collections.emptyList(), MineralogyConfig::isString); - METAMORPHIC_WHITELIST = builder.comment("Add blocks to metamorphic rock layers. Use mod:block entries.") - .defineList("metamorphic_whitelist", Collections.emptyList(), MineralogyConfig::isString); - builder.pop(); - - builder.push("ores"); - SULFUR_ORE = defineOre(builder, "sulfur_ore", sulfurOre); - PHOSPHOROUS_ORE = defineOre(builder, "phosphorous_ore", phosphorousOre); - NITRATE_ORE = defineOre(builder, "nitrate_ore", nitrateOre); - builder.pop(); - - SPEC = builder.build(); - } - - private MineralogyConfig() { - throw new IllegalAccessError("Not an instantiable class"); - } - - public static void register() { - ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, SPEC, Mineralogy.MODID + "-common.toml"); - } - - public static void registerRecipeConditions() { - if (recipeConditionsRegistered) { - return; - } - - CraftingHelper.register(new ConfigConditionSerializer()); - recipeConditionsRegistered = true; - } - - public static void registerAdvancementPredicates() { - if (advancementPredicatesRegistered) { - return; - } - - ItemPredicate.register(new ResourceLocation(Mineralogy.MODID, "config_item"), - MineralogyConfig::configItemPredicate); - advancementPredicatesRegistered = true; - } - - public static void bake() { - rockLayerNoise = ROCK_LAYER_NOISE.get(); - geomeSize = GEOME_SIZE.get(); - geomLayerThickness = ROCK_LAYER_THICKNESS.get(); - geologyMode = GEOLOGY_MODE.get(); - placeMineralogyRock = PLACE_MINERALOGY_ROCK.get(); - smeltableGravel = SMELTABLE_GRAVEL.get(); - dropCobblestone = DROP_COBBLESTONE.get(); - patchUpdate = PATCH_UPDATE.get(); - makeRockCobblestoneEquivilent = COBBLESTONE_EQUIVILENT.get(); - generateReliefs = GENERATE_RELIEFS.get(); - generateRockStairs = GENERATE_ROCKSTAIRS.get(); - generateRockFurnace = GENERATE_ROCKFURNACE.get(); - generateRockSlab = GENERATE_ROCKSLAB.get(); - generateRockWall = GENERATE_ROCKWALL.get(); - generateBrick = GENERATE_BRICK.get(); - generateBrickFurnace = GENERATE_BRICKFURNACE.get(); - generateBrickStairs = GENERATE_BRICKSTAIRS.get(); - generateBrickSlab = GENERATE_BRICKSLAB.get(); - generateBrickWall = GENERATE_BRICKWALL.get(); - generateSmooth = GENERATE_SMOOTH.get(); - generateSmoothFurnace = GENERATE_SMOOTHFURNACE.get(); - generateSmoothStairs = GENERATE_SMOOTHSTAIRS.get(); - generateSmoothSlab = GENERATE_SMOOTHSLAB.get(); - generateSmoothWall = GENERATE_SMOOTHWALL.get(); - generateSmoothBrick = GENERATE_SMOOTHBRICK.get(); - generateSmoothBrickFurnace = GENERATE_SMOOTHBRICKFURNACE.get(); - generateSmoothBrickStairs = GENERATE_SMOOTHBRICKSTAIRS.get(); - generateSmoothBrickSlab = GENERATE_SMOOTHBRICKSLAB.get(); - generateSmoothBrickWall = GENERATE_SMOOTHBRICKWALL.get(); - groupCreativeTabItemsByType = GROUP_TABS_BY_TYPE.get(); - igneousBlacklist = cleanList(IGNEOUS_BLACKLIST.get()); - sedimentaryBlacklist = cleanList(SEDIMENTARY_BLACKLIST.get()); - metamorphicBlacklist = cleanList(METAMORPHIC_BLACKLIST.get()); - igneousWhitelist = cleanList(IGNEOUS_WHITELIST.get()); - sedimentaryWhitelist = cleanList(SEDIMENTARY_WHITELIST.get()); - metamorphicWhitelist = cleanList(METAMORPHIC_WHITELIST.get()); - sulfurOre = SULFUR_ORE.bake(); - phosphorousOre = PHOSPHOROUS_ORE.bake(); - nitrateOre = NITRATE_ORE.bake(); - } - - private static OreConfigSpec defineOre(ForgeConfigSpec.Builder builder, String oreName, - OreGenerationSettings defaults) { - ForgeConfigSpec.IntValue minY = builder - .comment("Minimum " + oreName + " spawn height.") - .defineInRange(oreName + ".minY", defaults.minY(), 1, 255); - ForgeConfigSpec.IntValue maxY = builder - .comment("Maximum " + oreName + " spawn height.") - .defineInRange(oreName + ".maxY", defaults.maxY(), 1, 255); - ForgeConfigSpec.DoubleValue frequency = builder - .comment("Number of " + oreName + " deposits per chunk. Fractional values are supported.") - .defineInRange(oreName + ".frequency", defaults.frequency(), 0.0D, 63.0D); - ForgeConfigSpec.IntValue quantity = builder - .comment("Size of " + oreName + " deposit.") - .defineInRange(oreName + ".quantity", defaults.quantity(), 0, 63); - - return new OreConfigSpec(minY, maxY, frequency, quantity); - } - - private static boolean isString(Object value) { - return value instanceof String; - } - - private static List cleanList(List entries) { - return entries.stream() - .map(String::trim) - .filter(entry -> !entry.isEmpty()) - .collect(Collectors.toList()); - } - - private static ItemPredicate configItemPredicate(JsonObject json) { - List flags = new ArrayList<>(); - if (json.has("flags")) { - JsonArray flagArray = GsonHelper.getAsJsonArray(json, "flags"); - for (JsonElement flag : flagArray) { - flags.add(configFlagCondition(GsonHelper.convertToString(flag, "flag"))); - } - } else { - flags.add(configFlagCondition(GsonHelper.getAsString(json, "flag"))); - } - - return new ConfigItemPredicate(flags, new ResourceLocation(GsonHelper.getAsString(json, "item"))); - } - - private static BooleanSupplier configFlagCondition(String flag) { - switch (flag) { - case "SMELTABLE_GRAVEL": - return configFlag(() -> smeltableGravel); - case "GENERATE_RELIEFS": - return configFlag(() -> generateReliefs); - case "GENERATE_ROCKSTAIRS": - return configFlag(() -> generateRockStairs); - case "GENERATE_ROCKFURNACE": - return configFlag(() -> generateRockFurnace); - case "GENERATE_ROCKSLAB": - return configFlag(() -> generateRockSlab); - case "GENERATE_ROCKWALL": - return configFlag(() -> generateRockWall); - case "GENERATE_BRICK": - return configFlag(() -> generateBrick); - case "GENERATE_BRICKFURNACE": - return configFlag(() -> generateBrickFurnace); - case "GENERATE_BRICKSTAIRS": - return configFlag(() -> generateBrickStairs); - case "GENERATE_BRICKSLAB": - return configFlag(() -> generateBrickSlab); - case "GENERATE_BRICKWALL": - return configFlag(() -> generateBrickWall); - case "GENERATE_SMOOTH": - return configFlag(() -> generateSmooth); - case "GENERATE_SMOOTHFURNACE": - return configFlag(() -> generateSmoothFurnace); - case "GENERATE_SMOOTHSTAIRS": - return configFlag(() -> generateSmoothStairs); - case "GENERATE_SMOOTHSLAB": - return configFlag(() -> generateSmoothSlab); - case "GENERATE_SMOOTHWALL": - return configFlag(() -> generateSmoothWall); - case "GENERATE_SMOOTHBRICK": - return configFlag(() -> generateSmoothBrick); - case "GENERATE_SMOOTHBRICKFURNACE": - return configFlag(() -> generateSmoothBrickFurnace); - case "GENERATE_SMOOTHBRICKSTAIRS": - return configFlag(() -> generateSmoothBrickStairs); - case "GENERATE_SMOOTHBRICKSLAB": - return configFlag(() -> generateSmoothBrickSlab); - case "GENERATE_SMOOTHBRICKWALL": - return configFlag(() -> generateSmoothBrickWall); - default: - throw new JsonSyntaxException("Unknown Mineralogy recipe config flag: " + flag); - } - } - - private static BooleanSupplier configFlag(BooleanSupplier flag) { - return () -> { - bakeIfConfigured(); - return flag.getAsBoolean(); - }; - } - - private static final class ConfigCondition implements ICondition { - private final String flagName; - private final BooleanSupplier flag; - - private ConfigCondition(String flagName) { - this.flagName = flagName; - this.flag = configFlagCondition(flagName); - } - - @Override - public ResourceLocation getID() { - return CONFIG_CONDITION_ID; - } - - @Override - public boolean test() { - return flag.getAsBoolean(); - } - } - - private static final class ConfigConditionSerializer implements IConditionSerializer { - @Override - public void write(JsonObject json, ConfigCondition value) { - json.addProperty("flag", value.flagName); - } - - @Override - public ConfigCondition read(JsonObject json) { - return new ConfigCondition(GsonHelper.getAsString(json, "flag")); - } - - @Override - public ResourceLocation getID() { - return CONFIG_CONDITION_ID; - } - } - - private static void bakeIfConfigured() { - try { - bake(); - } catch (NullPointerException e) { - if (!isEarlyConfigAccess(e)) { - throw e; - } - } - } - - private static boolean isEarlyConfigAccess(NullPointerException e) { - for (StackTraceElement element : e.getStackTrace()) { - if ("net.minecraftforge.common.ForgeConfigSpec$ConfigValue".equals(element.getClassName()) - && "get".equals(element.getMethodName())) { - return true; - } - } - return false; - } - - public static double rockLayerNoise() { - return rockLayerNoise; - } - - public static int geomeSize() { - return geomeSize; - } - - public static int geomLayerThickness() { - return geomLayerThickness; - } - - public static GeologyMode geologyMode() { - return geologyMode; - } - - public static boolean placeMineralogyRock() { - return placeMineralogyRock; - } - - public static boolean smeltableGravel() { - return smeltableGravel; - } - - public static boolean dropCobblestone() { - return dropCobblestone; - } - - public static boolean makeRockCobblestoneEquivilent() { - return makeRockCobblestoneEquivilent; - } - - public static boolean patchUpdate() { - try { - patchUpdate = PATCH_UPDATE.get(); - } catch (NullPointerException e) { - if (!isEarlyConfigAccess(e)) { - throw e; - } - } - return patchUpdate; - } - - public static boolean generateRockFurnace() { - return generateRockFurnace; - } - - public static boolean generateRockStairs() { - return generateRockStairs; - } - - public static boolean generateReliefs() { - return generateReliefs; - } - - public static boolean generateRockSlab() { - return generateRockSlab; - } - - public static boolean generateRockWall() { - return generateRockWall; - } - - public static boolean generateBrick() { - return generateBrick; - } - - public static boolean generateBrickFurnace() { - return generateBrickFurnace; - } - - public static boolean generateBrickStairs() { - return generateBrickStairs; - } - - public static boolean generateBrickSlab() { - return generateBrickSlab; - } - - public static boolean generateBrickWall() { - return generateBrickWall; - } - - public static boolean generateSmooth() { - return generateSmooth; - } - - public static boolean generateSmoothFurnace() { - return generateSmoothFurnace; - } - - public static boolean generateSmoothStairs() { - return generateSmoothStairs; - } - - public static boolean generateSmoothSlab() { - return generateSmoothSlab; - } - - public static boolean generateSmoothWall() { - return generateSmoothWall; - } - - public static boolean generateSmoothBrick() { - return generateSmoothBrick; - } - - public static boolean generateSmoothBrickFurnace() { - return generateSmoothBrickFurnace; - } - - public static boolean generateSmoothBrickStairs() { - return generateSmoothBrickStairs; - } - - public static boolean generateSmoothBrickSlab() { - return generateSmoothBrickSlab; - } - - public static boolean generateSmoothBrickWall() { - return generateSmoothBrickWall; - } - - public static List igneousWhitelist() { - return igneousWhitelist; - } - - public static List igneousBlacklist() { - return igneousBlacklist; - } - - public static List sedimentaryWhitelist() { - return sedimentaryWhitelist; - } - - public static List sedimentaryBlacklist() { - return sedimentaryBlacklist; - } - - public static List metamorphicWhitelist() { - return metamorphicWhitelist; - } - - public static List metamorphicBlacklist() { - return metamorphicBlacklist; - } - - public static boolean groupCreativeTabItemsByType() { - try { - groupCreativeTabItemsByType = GROUP_TABS_BY_TYPE.get(); - } catch (NullPointerException e) { - if (!isEarlyConfigAccess(e)) { - throw e; - } - } - return groupCreativeTabItemsByType; - } - - public static OreGenerationSettings sulfurOre() { - return sulfurOre; - } - - public static OreGenerationSettings phosphorousOre() { - return phosphorousOre; - } - - public static OreGenerationSettings nitrateOre() { - return nitrateOre; - } - - private static final class OreConfigSpec { - private final ForgeConfigSpec.IntValue minY; - private final ForgeConfigSpec.IntValue maxY; - private final ForgeConfigSpec.DoubleValue frequency; - private final ForgeConfigSpec.IntValue quantity; - - private OreConfigSpec(ForgeConfigSpec.IntValue minY, ForgeConfigSpec.IntValue maxY, - ForgeConfigSpec.DoubleValue frequency, ForgeConfigSpec.IntValue quantity) { - this.minY = minY; - this.maxY = maxY; - this.frequency = frequency; - this.quantity = quantity; - } - - private OreGenerationSettings bake() { - return new OreGenerationSettings(minY.get(), maxY.get(), frequency.get(), quantity.get()); - } - } - - public static final class OreGenerationSettings { - private final int minY; - private final int maxY; - private final double frequency; - private final int quantity; - - private OreGenerationSettings(int minY, int maxY, double frequency, int quantity) { - this.minY = minY; - this.maxY = maxY; - this.frequency = frequency; - this.quantity = quantity; - } - - public int minY() { - return minY; - } - - public int maxY() { - return maxY; - } - - public double frequency() { - return frequency; - } - - public int quantity() { - return quantity; - } - } - - private static final class ConfigItemPredicate extends ItemPredicate { - private final List flags; - private final ResourceLocation itemName; - - private ConfigItemPredicate(List flags, ResourceLocation itemName) { - this.flags = flags; - this.itemName = itemName; - } - - @Override - public boolean matches(ItemStack stack) { - for (BooleanSupplier flag : flags) { - if (!flag.getAsBoolean()) { - return false; - } - } - - Item item = ForgeRegistries.ITEMS.getValue(itemName); - return item != null && stack.getItem() == item; - } - } - - public static enum GeologyMode { - GEOME, - LEGACY - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/RockType.java b/src/main/java/com/mcmoddev/mineralogy/RockType.java deleted file mode 100644 index 3b39925ce..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/RockType.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.mcmoddev.mineralogy; - -/** - * Type of rock (e.g. igneous) - * - * @author cybergnome - * - */ -public enum RockType { - SEDIMENTARY, METAMORPHIC, IGNEOUS, ANY -} diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/DoubleSlab.java b/src/main/java/com/mcmoddev/mineralogy/blocks/DoubleSlab.java deleted file mode 100644 index 556ada439..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/DoubleSlab.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.mcmoddev.mineralogy.blocks; - -import java.util.Collections; -import java.util.List; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.item.ItemStack; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.storage.loot.LootContext.Builder; - -public class DoubleSlab extends Block { - private final Block drops; - private final int toolHardnessLevel; - - public DoubleSlab(float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, Block drops, - String name) { - super(BlockBehaviour.Properties.of(Material.STONE).strength(hardness, blastResistance).sound(sound) - .requiresCorrectToolForDrops()); - this.drops = drops; - this.toolHardnessLevel = toolHardnessLevel; - this.setRegistryName(name); - } - - @Override - public ItemStack getCloneItemStack(BlockGetter world, BlockPos pos, BlockState state) { - return new ItemStack(drops); - } - - public List getDrops(BlockState state, Builder builder) { - return Collections.singletonList(new ItemStack(drops, 2)); - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/RockFurnace.java b/src/main/java/com/mcmoddev/mineralogy/blocks/RockFurnace.java deleted file mode 100644 index 1d8eab559..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/RockFurnace.java +++ /dev/null @@ -1,244 +0,0 @@ -package com.mcmoddev.mineralogy.blocks; - -import java.util.Collections; -import java.util.List; -import java.util.Random; - -import com.mcmoddev.mineralogy.Mineralogy; -import com.mcmoddev.mineralogy.init.TileEntities; -import com.mcmoddev.mineralogy.tileentity.TileEntityRockFurnace; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.BaseEntityBlock; -import net.minecraft.world.level.block.HorizontalDirectionalBlock; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.stats.Stats; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.Containers; -import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.RenderShape; -import net.minecraft.world.InteractionResult; -import net.minecraft.core.Direction; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.level.block.Mirror; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.block.Rotation; -import net.minecraft.sounds.SoundSource; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.storage.loot.LootContext.Builder; -import net.minecraftforge.registries.ForgeRegistries; - -public class RockFurnace extends BaseEntityBlock { - public static final net.minecraft.world.level.block.state.properties.DirectionProperty FACING = HorizontalDirectionalBlock.FACING; - private static boolean keepInventory; - - private final boolean burning; - private final float burnModifier; - private final int toolHardnessLevel; - - public RockFurnace(float hardness, float blastResistance, int toolHardnessLevel, boolean burning, - float burnModifier, String name) { - super(BlockBehaviour.Properties.of(Material.STONE).strength(hardness, blastResistance) - .sound(SoundType.STONE).lightLevel(state -> burning ? 14 : 0).requiresCorrectToolForDrops()); - this.burning = burning; - this.burnModifier = burnModifier; - this.toolHardnessLevel = toolHardnessLevel; - this.setRegistryName(name); - this.registerDefaultState(this.getStateDefinition().any().setValue(FACING, Direction.NORTH)); - } - - protected boolean canSilkHarvest() { - return false; - } - - @Override - public BlockState getStateForPlacement(BlockPlaceContext context) { - return defaultBlockState().setValue(FACING, context.getHorizontalDirection().getOpposite()); - } - - @Override - public void setPlacedBy(Level world, BlockPos pos, BlockState state, LivingEntity placer, - ItemStack stack) { - if (stack.hasCustomHoverName()) { - BlockEntity tileEntity = world.getBlockEntity(pos); - if (tileEntity instanceof TileEntityRockFurnace) { - ((TileEntityRockFurnace) tileEntity).setCustomInventoryName(stack.getHoverName()); - } - } - } - - @Override - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, - InteractionHand hand, BlockHitResult hit) { - if (world.isClientSide) { - return InteractionResult.SUCCESS; - } - - BlockEntity tileEntity = world.getBlockEntity(pos); - if (tileEntity instanceof TileEntityRockFurnace) { - player.openMenu((TileEntityRockFurnace) tileEntity); - player.awardStat(Stats.INTERACT_WITH_FURNACE); - } - - return InteractionResult.SUCCESS; - } - - public static void setState(boolean active, Level world, BlockPos pos) { - BlockState oldState = world.getBlockState(pos); - Block oldBlock = oldState.getBlock(); - Block newBlock = getStateBlock(oldBlock, active); - - if (!(newBlock instanceof RockFurnace) || newBlock == oldBlock) { - return; - } - - BlockEntity tileEntity = world.getBlockEntity(pos); - keepInventory = true; - world.setBlock(pos, newBlock.defaultBlockState().setValue(FACING, oldState.getValue(FACING)), 3); - keepInventory = false; - - if (tileEntity != null) { - tileEntity.clearRemoved(); - world.setBlockEntity(tileEntity); - } - } - - @Override - public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { - return new TileEntityRockFurnace(pos, state, burnModifier); - } - - @Override - public BlockEntityTicker getTicker(Level world, BlockState state, - BlockEntityType blockEntityType) { - return world.isClientSide ? null - : createTickerHelper(blockEntityType, TileEntities.rock_furnace, TileEntityRockFurnace::serverTick); - } - - @Override - public List getDrops(BlockState state, Builder builder) { - return Collections.singletonList(new ItemStack(getUnlitBlock(state.getBlock()))); - } - - @Override - public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean isMoving) { - if (state.getBlock() != newState.getBlock()) { - if (!keepInventory) { - BlockEntity tileEntity = world.getBlockEntity(pos); - if (tileEntity instanceof TileEntityRockFurnace) { - Containers.dropContents(world, pos, (TileEntityRockFurnace) tileEntity); - world.updateNeighbourForOutputSignal(pos, this); - } - } - - super.onRemove(state, world, pos, newState, isMoving); - } - } - - @Override - public boolean hasAnalogOutputSignal(BlockState state) { - return true; - } - - @Override - public int getAnalogOutputSignal(BlockState blockState, Level world, BlockPos pos) { - return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(world.getBlockEntity(pos)); - } - - @Override - public ItemStack getCloneItemStack(BlockGetter world, BlockPos pos, BlockState state) { - return new ItemStack(getUnlitBlock(state.getBlock())); - } - - @Override - public void animateTick(BlockState state, Level world, BlockPos pos, Random random) { - if (!burning) { - return; - } - - Direction facing = state.getValue(FACING); - double x = (double) pos.getX() + 0.5D; - double y = (double) pos.getY(); - double z = (double) pos.getZ() + 0.5D; - - if (random.nextDouble() < 0.1D) { - world.playLocalSound(x, y, z, SoundEvents.FURNACE_FIRE_CRACKLE, SoundSource.BLOCKS, 1.0F, 1.0F, - false); - } - - double offset = 0.52D; - double randomOffset = random.nextDouble() * 0.6D - 0.3D; - Direction.Axis axis = facing.getAxis(); - double xOffset = axis == Direction.Axis.X ? (double) facing.getStepX() * offset : randomOffset; - double zOffset = axis == Direction.Axis.Z ? (double) facing.getStepZ() * offset : randomOffset; - - world.addParticle(ParticleTypes.SMOKE, x + xOffset, y + random.nextDouble() * 6.0D / 16.0D, z + zOffset, - 0.0D, 0.0D, 0.0D); - world.addParticle(ParticleTypes.FLAME, x + xOffset, y + random.nextDouble() * 6.0D / 16.0D, z + zOffset, - 0.0D, 0.0D, 0.0D); - } - - @Override - public RenderShape getRenderShape(BlockState state) { - return RenderShape.MODEL; - } - - @Override - public BlockState rotate(BlockState state, Rotation rotation) { - return state.setValue(FACING, rotation.rotate(state.getValue(FACING))); - } - - @Override - public BlockState mirror(BlockState state, Mirror mirror) { - return state.rotate(mirror.getRotation(state.getValue(FACING))); - } - - @Override - protected void createBlockStateDefinition(StateDefinition.Builder builder) { - builder.add(FACING); - } - - public float getBurnModifier() { - return burnModifier; - } - - public boolean isBurningVariant() { - return burning; - } - - private static Block getStateBlock(Block block, boolean active) { - ResourceLocation name = block.getRegistryName(); - if (name == null) { - return block; - } - - String path = name.getPath(); - if (active && !path.startsWith("lit_")) { - path = "lit_" + path; - } else if (!active && path.startsWith("lit_")) { - path = path.substring(4); - } - - Block stateBlock = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Mineralogy.MODID, path)); - return stateBlock == null ? block : stateBlock; - } - - private static Block getUnlitBlock(Block block) { - return getStateBlock(block, false); - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/RockSaltLamp.java b/src/main/java/com/mcmoddev/mineralogy/blocks/RockSaltLamp.java deleted file mode 100644 index ff6b8effe..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/RockSaltLamp.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.mcmoddev.mineralogy.blocks; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.material.Material; -import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.block.state.properties.DirectionProperty; -import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.core.Direction; -import net.minecraft.world.level.block.Mirror; -import net.minecraft.world.level.block.Rotation; -import net.minecraft.core.BlockPos; -import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.Level; - -import java.util.Random; - -public class RockSaltLamp extends Block { - public static final DirectionProperty FACING = DirectionProperty.create("facing", Direction.values()); - - private static final VoxelShape STANDING_SHAPE = Block.box(6.4D, 0.0D, 6.4D, 9.6D, 9.6D, 9.6D); - private static final VoxelShape NORTH_SHAPE = Block.box(5.6D, 3.2D, 11.2D, 10.4D, 12.8D, 16.0D); - private static final VoxelShape SOUTH_SHAPE = Block.box(5.6D, 3.2D, 0.0D, 10.4D, 12.8D, 4.8D); - private static final VoxelShape WEST_SHAPE = Block.box(11.2D, 3.2D, 5.6D, 16.0D, 12.8D, 10.4D); - private static final VoxelShape EAST_SHAPE = Block.box(0.0D, 3.2D, 5.6D, 4.8D, 12.8D, 10.4D); - - public RockSaltLamp() { - super(BlockBehaviour.Properties.of(Material.STONE).strength(0.25F) - .lightLevel(state -> 15).sound(SoundType.STONE)); - this.setRegistryName("rocksaltlamp"); - this.registerDefaultState(this.getStateDefinition().any().setValue(FACING, Direction.UP)); - } - - @Override - public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { - switch (state.getValue(FACING)) { - case EAST: - return EAST_SHAPE; - case WEST: - return WEST_SHAPE; - case SOUTH: - return SOUTH_SHAPE; - case NORTH: - return NORTH_SHAPE; - default: - return STANDING_SHAPE; - } - } - - @Override - public VoxelShape getCollisionShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { - return net.minecraft.world.phys.shapes.Shapes.empty(); - } - - public boolean isCollisionShapeFullBlock(BlockState state, BlockGetter world, BlockPos pos) { - return false; - } - - @Override - public BlockState getStateForPlacement(BlockPlaceContext context) { - Level world = context.getLevel(); - BlockPos pos = context.getClickedPos(); - - for (Direction facing : context.getNearestLookingDirections()) { - BlockState state = this.defaultBlockState().setValue(FACING, facing); - if (state.canSurvive(world, pos)) { - return state; - } - } - - return null; - } - - @Override - public BlockState updateShape(BlockState state, Direction facing, BlockState facingState, - LevelAccessor world, BlockPos currentPos, BlockPos facingPos) { - return facing.getOpposite() == state.getValue(FACING) && !state.canSurvive(world, currentPos) - ? Blocks.AIR.defaultBlockState() - : state; - } - - @Override - public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) { - Direction facing = state.getValue(FACING); - BlockPos supportPos = pos.relative(facing.getOpposite()); - BlockState support = world.getBlockState(supportPos); - - if (facing == Direction.UP) { - return support.isFaceSturdy(world, supportPos, Direction.UP); - } - if (facing == Direction.DOWN) { - return support.isFaceSturdy(world, supportPos, Direction.DOWN); - } - - return support.isFaceSturdy(world, supportPos, facing); - } - - @Override - public void animateTick(BlockState state, Level world, BlockPos pos, Random random) { - Direction facing = state.getValue(FACING); - double x = (double) pos.getX() + 0.5D; - double y = (double) pos.getY() + 0.7D; - double z = (double) pos.getZ() + 0.5D; - - if (facing.getAxis().isHorizontal()) { - Direction opposite = facing.getOpposite(); - world.addParticle(ParticleTypes.SMOKE, - x + 0.27D * (double) opposite.getStepX(), - y + 0.22D, - z + 0.27D * (double) opposite.getStepZ(), - 0.0D, 0.0D, 0.0D); - } else { - world.addParticle(ParticleTypes.SMOKE, x, y, z, 0.0D, 0.0D, 0.0D); - } - } - - @Override - public BlockState rotate(BlockState state, Rotation rotation) { - return state.setValue(FACING, rotation.rotate(state.getValue(FACING))); - } - - @Override - public BlockState mirror(BlockState state, Mirror mirror) { - return state.rotate(mirror.getRotation(state.getValue(FACING))); - } - - @Override - protected void createBlockStateDefinition(StateDefinition.Builder builder) { - builder.add(FACING); - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/RockStairs.java b/src/main/java/com/mcmoddev/mineralogy/blocks/RockStairs.java deleted file mode 100644 index c0b8fd677..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/RockStairs.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mcmoddev.mineralogy.blocks; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.StairBlock; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.level.block.state.BlockState; - -public class RockStairs extends StairBlock { - - public RockStairs(Block materialBlock, float hardness, float blastResistance, int toolHardnessLevel, - SoundType sound, String name) { - super(materialBlock.defaultBlockState(), BlockBehaviour.Properties.of(Material.STONE) - .strength(hardness, blastResistance).sound(sound).requiresCorrectToolForDrops()); - - this.setRegistryName(name); - this.toolHardnessLevel = toolHardnessLevel; - } - - private final int toolHardnessLevel; -} diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/RockWall.java b/src/main/java/com/mcmoddev/mineralogy/blocks/RockWall.java deleted file mode 100644 index a62483458..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/RockWall.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mcmoddev.mineralogy.blocks; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.WallBlock; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.level.block.state.BlockState; - -/** -* -* @author Jasmine Iwanek -* -*/ -public class RockWall extends WallBlock { - public RockWall(Block materialBlock, float hardness, float blastResistance, int toolHardnessLevel, - SoundType sound, String name) { - super(BlockBehaviour.Properties.of(Material.STONE).strength(hardness, blastResistance).sound(sound) - .requiresCorrectToolForDrops()); - - this.setRegistryName(name); - this.toolHardnessLevel = toolHardnessLevel; - } - - private final int toolHardnessLevel; -} diff --git a/src/main/java/com/mcmoddev/mineralogy/client/ClientSetup.java b/src/main/java/com/mcmoddev/mineralogy/client/ClientSetup.java deleted file mode 100644 index 1bcbbcb94..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/client/ClientSetup.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.mcmoddev.mineralogy.client; - -import com.mcmoddev.mineralogy.Mineralogy; -import com.mcmoddev.mineralogy.blocks.DryWall; -import com.mcmoddev.mineralogy.blocks.RockSaltLamp; -import com.mcmoddev.mineralogy.blocks.RockSaltStreetLamp; - -import net.minecraft.world.level.block.Block; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.ItemBlockRenderTypes; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.registries.ForgeRegistries; - -@Mod.EventBusSubscriber(modid = Mineralogy.MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) -public final class ClientSetup { - private ClientSetup() { - } - - @SubscribeEvent - public static void clientSetup(FMLClientSetupEvent event) { - RenderType cutout = RenderType.cutout(); - for (Block block : ForgeRegistries.BLOCKS.getValues()) { - if (block instanceof DryWall || block instanceof RockSaltLamp || block instanceof RockSaltStreetLamp) { - ItemBlockRenderTypes.setRenderLayer(block, cutout); - } - } - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/init/Features.java b/src/main/java/com/mcmoddev/mineralogy/init/Features.java deleted file mode 100644 index f35154999..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/init/Features.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.mcmoddev.mineralogy.init; - -import com.mcmoddev.mineralogy.Mineralogy; -import com.mcmoddev.mineralogy.worldgen.StoneReplacer; - -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -@Mod.EventBusSubscriber(modid = Mineralogy.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) -public final class Features { - @SubscribeEvent - public static void registerFeatures(RegistryEvent.Register> event) { - event.getRegistry().register(StoneReplacer.FEATURE); - } - - private Features() { - throw new IllegalAccessError("Not an instantiable class"); - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/init/MineralogyItemGroups.java b/src/main/java/com/mcmoddev/mineralogy/init/MineralogyItemGroups.java deleted file mode 100644 index ea1d105a5..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/init/MineralogyItemGroups.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.mcmoddev.mineralogy.init; - -import com.mcmoddev.mineralogy.Mineralogy; -import com.mcmoddev.mineralogy.MineralogyConfig; -import com.mcmoddev.mineralogy.blocks.Ore; -import com.mcmoddev.mineralogy.blocks.Rock; -import com.mcmoddev.mineralogy.blocks.RockRelief; -import com.mcmoddev.mineralogy.blocks.RockSlab; -import com.mcmoddev.mineralogy.blocks.RockStairs; -import com.mcmoddev.mineralogy.blocks.RockWall; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.ItemStack; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.registries.ForgeRegistries; - -public final class MineralogyItemGroups { - private MineralogyItemGroups() { - throw new IllegalAccessError("Not an instantiable class"); - } - - public static CreativeModeTab forBlock(Block block) { - if (!MineralogyConfig.groupCreativeTabItemsByType()) { - return MainGroup.MINERALOGY; - } - - if (block instanceof RockRelief) { - return CreativeModeTabs.ITEM; - } - if (block instanceof RockStairs) { - return StairGroup.STAIR; - } - if (block instanceof RockSlab) { - return SlabGroup.SLAB; - } - if (block instanceof RockWall) { - return WallGroup.WALL; - } - if (block instanceof Rock || block instanceof Ore) { - return RockGroup.ROCK; - } - - return CreativeModeTabs.ITEM; - } - - public static CreativeModeTab forItem() { - return MineralogyConfig.groupCreativeTabItemsByType() ? CreativeModeTabs.ITEM : MainGroup.MINERALOGY; - } - - private static CreativeModeTab create(String name, String iconItemName) { - return new CreativeModeTab(Mineralogy.MODID + "." + name) { - @Override - @OnlyIn(Dist.CLIENT) - public ItemStack makeIcon() { - Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Mineralogy.MODID, iconItemName)); - return item != null ? new ItemStack(item) : new ItemStack(net.minecraft.world.item.Items.IRON_PICKAXE); - } - }; - } - - private static final class MainGroup { - private static final CreativeModeTab MINERALOGY = create("mineralogy", "basalt"); - } - - private static final class RockGroup { - private static final CreativeModeTab ROCK = create("rock", "basalt"); - } - - private static final class StairGroup { - private static final CreativeModeTab STAIR = create("stair", "basalt_stairs"); - } - - private static final class SlabGroup { - private static final CreativeModeTab SLAB = create("slab", "basalt_slab"); - } - - private static final class WallGroup { - private static final CreativeModeTab WALL = create("wall", "basalt_wall"); - } - - private static final class CreativeModeTabs { - private static final CreativeModeTab ITEM = create("item", "sulfur_dust"); - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/init/MineralogyRegistry.java b/src/main/java/com/mcmoddev/mineralogy/init/MineralogyRegistry.java deleted file mode 100644 index d7dd146a1..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/init/MineralogyRegistry.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.mcmoddev.mineralogy.init; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.mcmoddev.mineralogy.util.BlockItemPair; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.crafting.Recipe; - -public class MineralogyRegistry { - public static final List sedimentaryStones = new ArrayList<>(); // stone block replacements that are Sedimentary - public static final List metamorphicStones = new ArrayList<>(); // stone block replacements that are Metamorphic - public static final List igneousStones = new ArrayList<>(); // stone block replacements that are Igneous - public static final Map MineralogyBlockRegistry = new HashMap<>(); // all blocks used in this mod (blockID, BlockItemPair) - public static final Map MineralogyItemRegistry = new HashMap<>(); // all items used in this mod (itemID, item) - public static final Map MineralogyRecipeRegistry = new HashMap<>(); // all recipes used in this mod (recipeID, Recipe) - - public static final Map BlocksToRegister = new HashMap<>(); // all blocks used in this mod (blockID, BlockItemPair) - public static final Map ItemsToRegister = new HashMap<>(); // all items used in this mod (itemID, item) -} diff --git a/src/main/java/com/mcmoddev/mineralogy/worldgen/BakedGeomeConfig.java b/src/main/java/com/mcmoddev/mineralogy/worldgen/BakedGeomeConfig.java deleted file mode 100644 index beef45ea2..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/BakedGeomeConfig.java +++ /dev/null @@ -1,269 +0,0 @@ -package com.mcmoddev.mineralogy.worldgen; - -import java.util.IdentityHashMap; -import java.util.Map; - -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.biome.Biome; - -public final class BakedGeomeConfig { - private static final int MAX_Y = 255; - private static final int PICKER_SCALE = 1000; - - final GeomeDefinition[] geomes; - final double geomeScale; - final double biomeInfluence; - final double regionalNoiseInfluence; - final double boundaryNoiseInfluence; - final int[] noiseOffsetX; - final int[] noiseOffsetZ; - - private final Map biomeWeights; - private final int[][][] familyThresholds; - private final WeightedBlockPicker[][][] rockPickers; - private final double[] fallbackWeights; - - BakedGeomeConfig(GeomeDefinition[] geomes, double geomeScale, double biomeInfluence, - double regionalNoiseInfluence, double boundaryNoiseInfluence, Map biomeWeights, - RockEntry[] rocks) { - this.geomes = geomes; - this.geomeScale = geomeScale; - this.biomeInfluence = biomeInfluence; - this.regionalNoiseInfluence = regionalNoiseInfluence; - this.boundaryNoiseInfluence = boundaryNoiseInfluence; - this.biomeWeights = new IdentityHashMap<>(biomeWeights); - this.fallbackWeights = defaultWeights(geomes.length); - this.noiseOffsetX = new int[geomes.length]; - this.noiseOffsetZ = new int[geomes.length]; - for (int i = 0; i < geomes.length; i++) { - noiseOffsetX[i] = (i + 1) * 9973; - noiseOffsetZ[i] = -((i + 1) * 6151); - } - - familyThresholds = new int[geomes.length][MAX_Y + 1][RockFamily.values().length]; - rockPickers = new WeightedBlockPicker[geomes.length][RockFamily.values().length][MAX_Y + 1]; - buildPickers(rocks); - } - - public int pickGeome(Biome biome, double[] regionalNoise, double boundaryNoise) { - double[] weights = biomeWeights.get(biome); - if (weights == null) { - weights = fallbackWeights; - } - - double bestScore = Double.NEGATIVE_INFINITY; - int bestIndex = 0; - for (int i = 0; i < geomes.length; i++) { - double boundary = ((i & 1) == 0 ? boundaryNoise : -boundaryNoise) * boundaryNoiseInfluence; - double score = geomes[i].baseWeight + (weights[i] * biomeInfluence) - + (regionalNoise[i] * regionalNoiseInfluence) + boundary; - if (score > bestScore) { - bestScore = score; - bestIndex = i; - } - } - - return bestIndex; - } - - public RockFamily pickFamily(int geomeIndex, int y, int hash) { - int[] thresholds = familyThresholds[geomeIndex][clampY(y)]; - int total = thresholds[thresholds.length - 1]; - if (total <= 0) { - return RockFamily.SEDIMENTARY; - } - - int value = positive(hash) % total; - for (int i = 0; i < thresholds.length; i++) { - if (value < thresholds[i]) { - return RockFamily.values()[i]; - } - } - - return RockFamily.SEDIMENTARY; - } - - public BlockState pickRock(int geomeIndex, RockFamily family, int y, int hash) { - return rockPickers[geomeIndex][family.ordinal()][clampY(y)].pick(hash); - } - - public String geomeName(int geomeIndex) { - return geomes[geomeIndex].name; - } - - int geomeCount() { - return geomes.length; - } - - private void buildPickers(RockEntry[] rocks) { - for (int geome = 0; geome < geomes.length; geome++) { - for (int y = 0; y <= MAX_Y; y++) { - int familyTotal = 0; - for (RockFamily family : RockFamily.values()) { - WeightedBlockPicker picker = buildRockPicker(rocks, geome, family, y); - rockPickers[geome][family.ordinal()][y] = picker; - - double familyWeight = geomes[geome].familyWeights[family.ordinal()] - * familyDepthWeight(family, y); - if (picker.isEmpty()) { - familyWeight = 0.0D; - } - - if (familyWeight > 0.0D) { - familyTotal += Math.max(1, (int) Math.round(familyWeight * PICKER_SCALE)); - } - familyThresholds[geome][y][family.ordinal()] = familyTotal; - } - } - } - } - - private WeightedBlockPicker buildRockPicker(RockEntry[] rocks, int geome, RockFamily family, int y) { - int count = 0; - for (RockEntry rock : rocks) { - if (rock.family == family) { - count++; - } - } - - BlockState[] states = new BlockState[count]; - int[] thresholds = new int[count]; - int total = 0; - int index = 0; - for (RockEntry rock : rocks) { - if (rock.family != family) { - continue; - } - - double depthWeight = depthWeight(y, rock.depthPeak, rock.depthSpread); - double geomeWeight = rock.geomeWeights[geome]; - double rawWeight = rock.weight * geomeWeight * depthWeight; - if (rawWeight <= 0.0D) { - continue; - } - - total += Math.max(1, (int) Math.round(rawWeight * PICKER_SCALE)); - states[index] = rock.state; - thresholds[index] = total; - index++; - } - - if (index != states.length) { - BlockState[] compactStates = new BlockState[index]; - int[] compactThresholds = new int[index]; - System.arraycopy(states, 0, compactStates, 0, index); - System.arraycopy(thresholds, 0, compactThresholds, 0, index); - states = compactStates; - thresholds = compactThresholds; - } - - return new WeightedBlockPicker(states, thresholds, total); - } - - private static double[] defaultWeights(int count) { - double[] weights = new double[count]; - for (int i = 0; i < weights.length; i++) { - weights[i] = 1.0D; - } - return weights; - } - - private static double depthWeight(int y, int peak, int spread) { - double distance = (y - peak) / (double) Math.max(1, spread); - return 0.08D + (0.92D / (1.0D + distance * distance)); - } - - private static double familyDepthWeight(RockFamily family, int y) { - switch (family) { - case SEDIMENTARY: - return 0.35D + depthWeight(y, 68, 54); - case METAMORPHIC: - return 0.25D + (1.35D * depthWeight(y, 18, 36)); - case IGNEOUS_INTRUSIVE: - return 0.25D + (1.20D * depthWeight(y, 28, 44)); - case IGNEOUS_VOLCANIC: - return 0.25D + (1.20D * depthWeight(y, 76, 30)); - default: - return 1.0D; - } - } - - private static int clampY(int y) { - if (y < 0) { - return 0; - } - if (y > MAX_Y) { - return MAX_Y; - } - return y; - } - - private static int positive(int value) { - return value & 0x7FFFFFFF; - } - - static final class GeomeDefinition { - final String name; - final double baseWeight; - final double[] familyWeights; - - GeomeDefinition(String name, double baseWeight, double[] familyWeights) { - this.name = name; - this.baseWeight = baseWeight; - this.familyWeights = familyWeights; - } - } - - static final class RockEntry { - final BlockState state; - final RockFamily family; - final int depthPeak; - final int depthSpread; - final double weight; - final double[] geomeWeights; - - RockEntry(BlockState state, RockFamily family, int depthPeak, int depthSpread, double weight, - double[] geomeWeights) { - this.state = state; - this.family = family; - this.depthPeak = depthPeak; - this.depthSpread = depthSpread; - this.weight = weight; - this.geomeWeights = geomeWeights; - } - } - - private static final class WeightedBlockPicker { - private static final BlockState FALLBACK = Blocks.STONE.defaultBlockState(); - - private final BlockState[] states; - private final int[] thresholds; - private final int total; - - WeightedBlockPicker(BlockState[] states, int[] thresholds, int total) { - this.states = states; - this.thresholds = thresholds; - this.total = total; - } - - boolean isEmpty() { - return total <= 0 || states.length == 0; - } - - BlockState pick(int hash) { - if (isEmpty()) { - return FALLBACK; - } - - int value = positive(hash) % total; - for (int i = 0; i < thresholds.length; i++) { - if (value < thresholds[i]) { - return states[i]; - } - } - - return states[states.length - 1]; - } - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/worldgen/Geology.java b/src/main/java/com/mcmoddev/mineralogy/worldgen/Geology.java deleted file mode 100644 index 081ed9848..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/Geology.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.mcmoddev.mineralogy.worldgen; - -import java.util.List; -import java.util.Random; - -import com.mcmoddev.mineralogy.MineralogyConfig; -import com.mcmoddev.mineralogy.init.MineralogyRegistry; -import com.mcmoddev.mineralogy.worldgen.math.PerlinNoise2D; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.chunk.ChunkAccess; -import net.minecraft.world.level.levelgen.Heightmap; - -public class Geology { - private final PerlinNoise2D geomeNoiseLayer; - private final PerlinNoise2D rockNoiseLayer; - private final short[] whiteNoiseArray; - - public Geology(long seed, double geomeSize, double rockLayerSize) { - int rockLayerUndertones = 4; - int undertoneMultiplier = 1 << (rockLayerUndertones - 1); - geomeNoiseLayer = new PerlinNoise2D(~seed, 128, (float) geomeSize, 2); - rockNoiseLayer = new PerlinNoise2D(seed, (float) (4 * undertoneMultiplier), - (float) (rockLayerSize * undertoneMultiplier), rockLayerUndertones); - - Random random = new Random(seed); - whiteNoiseArray = new short[256]; - for (int i = 0; i < whiteNoiseArray.length; i++) { - whiteNoiseArray[i] = (short) random.nextInt(0x7FFF); - } - } - - public Block getStoneAt(int x, int y, int z) { - float geome = geomeNoiseLayer.valueAt(x, z) + y; - int rockValue = (int) rockNoiseLayer.valueAt(x, z) + y; - if (geome < -64) { - return pickBlockFromList(rockValue, MineralogyRegistry.igneousStones); - } else if (geome < 64) { - return pickBlockFromList(rockValue, MineralogyRegistry.metamorphicStones); - } - - return pickBlockFromList(rockValue, MineralogyRegistry.sedimentaryStones); - } - - public void replaceStoneInChunk(ChunkAccess chunk) { - ChunkPos chunkPos = chunk.getPos(); - int xOffset = chunkPos.getMinBlockX(); - int zOffset = chunkPos.getMinBlockZ(); - BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos(); - boolean changed = false; - - for (int dx = 0; dx < 16; dx++) { - int x = xOffset + dx; - for (int dz = 0; dz < 16; dz++) { - int z = zOffset + dz; - int y = chunk.getHeight(Heightmap.Types.WORLD_SURFACE_WG, dx, dz); - int baseRockVal = (int) rockNoiseLayer.valueAt(x, z); - int geomeBase = (int) geomeNoiseLayer.valueAt(x, z); - - for (; y > 0; y--) { - cursor.set(x, y, z); - if (chunk.getBlockState(cursor).getBlock() == Blocks.STONE) { - chunk.setBlockState(cursor, pickReplacement(baseRockVal, geomeBase, y).defaultBlockState(), false); - changed = true; - } - } - } - } - - if (changed) { - chunk.setUnsaved(true); - } - } - - private Block pickReplacement(int baseRockVal, int geomeBase, int y) { - int geome = geomeBase + y; - if (geome < -32) { - return pickBlockFromList(baseRockVal + y, MineralogyRegistry.igneousStones); - } else if (geome < 32) { - return pickBlockFromList(baseRockVal + y, MineralogyRegistry.metamorphicStones); - } - - return pickBlockFromList(baseRockVal + y, MineralogyRegistry.sedimentaryStones); - } - - public Block[] getStoneColumn(int x, int z, int height) { - Block[] column = new Block[height]; - int baseRockVal = (int) rockNoiseLayer.valueAt(x, z); - double geomeBase = geomeNoiseLayer.valueAt(x, z); - for (int y = 0; y < column.length; y++) { - double geome = geomeBase + y; - if (geome < -32) { - column[y] = pickBlockFromList(baseRockVal + y, MineralogyRegistry.igneousStones); - } else if (geome < 32) { - column[y] = pickBlockFromList(baseRockVal + y + 3, MineralogyRegistry.metamorphicStones); - } else { - column[y] = pickBlockFromList(baseRockVal + y + 5, MineralogyRegistry.sedimentaryStones); - } - } - return column; - } - - private Block pickBlockFromList(int value, List list) { - if (list.isEmpty()) { - return Blocks.STONE; - } - - return list.get(whiteNoiseArray[(value / MineralogyConfig.geomLayerThickness()) & 0xFF] % list.size()); - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/worldgen/GeomeConfig.java b/src/main/java/com/mcmoddev/mineralogy/worldgen/GeomeConfig.java deleted file mode 100644 index a0d5ec8dd..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/GeomeConfig.java +++ /dev/null @@ -1,534 +0,0 @@ -package com.mcmoddev.mineralogy.worldgen; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.IdentityHashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.google.gson.JsonSyntaxException; -import com.mcmoddev.mineralogy.worldgen.BakedGeomeConfig.GeomeDefinition; -import com.mcmoddev.mineralogy.worldgen.BakedGeomeConfig.RockEntry; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.resources.ResourceKey; -import net.minecraft.util.GsonHelper; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.core.Registry; -import net.minecraft.world.level.biome.Biome; -import net.minecraftforge.common.BiomeDictionary; -import net.minecraftforge.registries.ForgeRegistries; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public final class GeomeConfig { - private static final Logger LOGGER = LogManager.getLogger(); - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private static final Path CONFIG_PATH = Paths.get("config", "mineralogy-geomes.json"); - - private static BakedGeomeConfig bakedConfig = null; - - private GeomeConfig() { - throw new IllegalAccessError("Not an instantiable class"); - } - - public static BakedGeomeConfig bake() { - JsonObject root = loadConfig(); - bakedConfig = bake(root); - return bakedConfig; - } - - public static BakedGeomeConfig baked() { - if (bakedConfig == null) { - return bake(); - } - return bakedConfig; - } - - private static JsonObject loadConfig() { - JsonObject defaults = defaultConfig(); - if (!Files.exists(CONFIG_PATH)) { - writeDefaultConfig(defaults); - return defaults; - } - - try (BufferedReader reader = Files.newBufferedReader(CONFIG_PATH, StandardCharsets.UTF_8)) { - JsonElement element = new JsonParser().parse(reader); - if (!element.isJsonObject()) { - LOGGER.warn("Mineralogy geome config '{}' is not a JSON object; using defaults", CONFIG_PATH); - return defaults; - } - return element.getAsJsonObject(); - } catch (IOException | JsonSyntaxException | IllegalStateException e) { - LOGGER.warn("Could not read Mineralogy geome config '{}'; using defaults", CONFIG_PATH, e); - return defaults; - } - } - - private static void writeDefaultConfig(JsonObject defaults) { - try { - Files.createDirectories(CONFIG_PATH.getParent()); - try (BufferedWriter writer = Files.newBufferedWriter(CONFIG_PATH, StandardCharsets.UTF_8)) { - GSON.toJson(defaults, writer); - } - } catch (IOException e) { - LOGGER.warn("Could not create default Mineralogy geome config '{}'", CONFIG_PATH, e); - } - } - - private static BakedGeomeConfig bake(JsonObject root) { - LinkedHashMap geomeIndexes = new LinkedHashMap<>(); - GeomeDefinition[] geomes = readGeomes(root, geomeIndexes); - double geomeScale = getDouble(root, "geome_scale", 384.0D); - double biomeInfluence = getDouble(root, "biome_influence", 1.15D); - double regionalNoiseInfluence = getDouble(root, "regional_noise_influence", 0.90D); - double boundaryNoiseInfluence = getDouble(root, "boundary_noise_influence", 0.45D); - - Map biomeRules = readWeightRules(root, "biomes", geomeIndexes); - Map dictionaryRules = readWeightRules(root, "biome_dictionary", geomeIndexes); - RockEntry[] rocks = readRocks(root, geomeIndexes); - Map biomeWeights = bakeBiomeWeights(geomeIndexes, biomeRules, dictionaryRules); - - LOGGER.info("Baked Mineralogy geome config with {} geomes, {} rock entries, and {} registered biome profiles", - geomes.length, rocks.length, biomeWeights.size()); - return new BakedGeomeConfig(geomes, geomeScale, biomeInfluence, regionalNoiseInfluence, - boundaryNoiseInfluence, biomeWeights, rocks); - } - - private static GeomeDefinition[] readGeomes(JsonObject root, LinkedHashMap geomeIndexes) { - JsonObject geomeRoot = GsonHelper.getAsJsonObject(root, "geomes", defaultConfig().getAsJsonObject("geomes")); - List geomes = new ArrayList<>(); - for (Entry entry : geomeRoot.entrySet()) { - if (!entry.getValue().isJsonObject()) { - LOGGER.warn("Ignoring Mineralogy geome '{}' because it is not an object", entry.getKey()); - continue; - } - - JsonObject json = entry.getValue().getAsJsonObject(); - double[] familyWeights = new double[RockFamily.values().length]; - for (RockFamily family : RockFamily.values()) { - familyWeights[family.ordinal()] = 1.0D; - } - - JsonObject families = GsonHelper.getAsJsonObject(json, "families", new JsonObject()); - for (RockFamily family : RockFamily.values()) { - familyWeights[family.ordinal()] = getDouble(families, family.configName, familyWeights[family.ordinal()]); - } - - geomeIndexes.put(entry.getKey(), geomes.size()); - geomes.add(new GeomeDefinition(entry.getKey(), getDouble(json, "base", 1.0D), familyWeights)); - } - - if (geomes.isEmpty()) { - throw new JsonSyntaxException("Mineralogy geome config must define at least one geome"); - } - - return geomes.toArray(new GeomeDefinition[geomes.size()]); - } - - private static Map readWeightRules(JsonObject root, String section, - Map geomeIndexes) { - Map rules = new LinkedHashMap<>(); - if (!root.has(section) || !root.get(section).isJsonObject()) { - return rules; - } - - for (Entry entry : root.getAsJsonObject(section).entrySet()) { - if (!entry.getValue().isJsonObject()) { - LOGGER.warn("Ignoring Mineralogy geome {} rule '{}' because it is not an object", section, - entry.getKey()); - continue; - } - rules.put(entry.getKey(), readGeomeWeights(entry.getValue().getAsJsonObject(), geomeIndexes, 0.0D)); - } - return rules; - } - - private static RockEntry[] readRocks(JsonObject root, Map geomeIndexes) { - JsonObject rockRoot = GsonHelper.getAsJsonObject(root, "rocks", defaultConfig().getAsJsonObject("rocks")); - List rocks = new ArrayList<>(); - for (Entry entry : rockRoot.entrySet()) { - if (!entry.getValue().isJsonObject()) { - LOGGER.warn("Ignoring Mineralogy geome rock '{}' because it is not an object", entry.getKey()); - continue; - } - - ResourceLocation id; - try { - id = new ResourceLocation(entry.getKey()); - } catch (RuntimeException e) { - LOGGER.warn("Ignoring invalid Mineralogy geome rock id '{}'", entry.getKey()); - continue; - } - - Block block = ForgeRegistries.BLOCKS.getValue(id); - if (block == null || block == Blocks.AIR) { - LOGGER.warn("Ignoring unknown Mineralogy geome rock block '{}'", id); - continue; - } - - JsonObject json = entry.getValue().getAsJsonObject(); - RockFamily family; - try { - family = RockFamily.fromConfigName(GsonHelper.getAsString(json, "family")); - } catch (RuntimeException e) { - LOGGER.warn("Ignoring Mineralogy geome rock '{}' with invalid family", id); - continue; - } - - JsonObject geomeWeightsJson = GsonHelper.getAsJsonObject(json, "geomes", new JsonObject()); - double[] geomeWeights = readGeomeWeights(geomeWeightsJson, geomeIndexes, 1.0D); - rocks.add(new RockEntry(block.defaultBlockState(), family, - GsonHelper.getAsInt(json, "depth_peak", 48), - Math.max(1, GsonHelper.getAsInt(json, "depth_spread", 48)), - getDouble(json, "weight", 1.0D), - geomeWeights)); - } - - if (rocks.isEmpty()) { - LOGGER.warn("Mineralogy geome config produced no valid rock entries; falling back to vanilla stone"); - double[] weights = new double[geomeIndexes.size()]; - for (int i = 0; i < weights.length; i++) { - weights[i] = 1.0D; - } - rocks.add(new RockEntry(Blocks.STONE.defaultBlockState(), RockFamily.SEDIMENTARY, 64, 64, 1.0D, weights)); - } - return rocks.toArray(new RockEntry[rocks.size()]); - } - - private static Map bakeBiomeWeights(Map geomeIndexes, - Map biomeRules, Map dictionaryRules) { - Map result = new IdentityHashMap<>(); - for (Biome biome : ForgeRegistries.BIOMES.getValues()) { - double[] weights = new double[geomeIndexes.size()]; - for (int i = 0; i < weights.length; i++) { - weights[i] = 1.0D; - } - - ResourceLocation biomeId = biome.getRegistryName(); - if (biomeId != null) { - merge(weights, biomeRules.get(biomeId.toString())); - ResourceKey biomeKey = ResourceKey.create(Registry.BIOME_REGISTRY, biomeId); - for (BiomeDictionary.Type type : BiomeDictionary.getTypes(biomeKey)) { - merge(weights, dictionaryRules.get(type.getName())); - } - } - applyBiomeHeuristic(weights, geomeIndexes, biome); - result.put(biome, weights); - } - return result; - } - - private static void applyBiomeHeuristic(double[] weights, Map geomeIndexes, Biome biome) { - String category = biome.getBiomeCategory().name(); - float temperature = biome.getBaseTemperature(); - float downfall = biome.getDownfall(); - float depth = biome.getDepth(); - float scale = biome.getScale(); - - if (category.contains("OCEAN") || category.contains("RIVER") || category.contains("BEACH")) { - add(weights, geomeIndexes, "coastal_shelf", 2.25D); - add(weights, geomeIndexes, "sedimentary_basin", 0.75D); - } - if (category.contains("DESERT") || category.contains("MESA") || category.contains("SAVANNA") - || (temperature > 0.95F && downfall < 0.25F)) { - add(weights, geomeIndexes, "arid_basin", 2.5D); - } - if (category.contains("SWAMP") || downfall > 0.85F) { - add(weights, geomeIndexes, "wetland_basin", 2.0D); - } - if (category.contains("MOUNTAIN") || category.contains("HILLS") || depth > 0.85F || scale > 0.65F) { - add(weights, geomeIndexes, "mountain_belt", 2.5D); - } - if (category.contains("ICY") || temperature < 0.15F) { - add(weights, geomeIndexes, "glacial_highland", 1.75D); - } - if (category.contains("PLAINS") || category.contains("FOREST") || category.contains("TAIGA")) { - add(weights, geomeIndexes, "stable_craton", 1.25D); - } - } - - private static double[] readGeomeWeights(JsonObject json, Map geomeIndexes, double defaultWeight) { - double[] weights = new double[geomeIndexes.size()]; - for (int i = 0; i < weights.length; i++) { - weights[i] = defaultWeight; - } - - for (Entry entry : json.entrySet()) { - Integer index = geomeIndexes.get(entry.getKey()); - if (index == null) { - LOGGER.warn("Ignoring unknown Mineralogy geome weight '{}'", entry.getKey()); - continue; - } - weights[index] = entry.getValue().getAsDouble(); - } - return weights; - } - - private static void merge(double[] target, double[] source) { - if (source == null) { - return; - } - for (int i = 0; i < target.length && i < source.length; i++) { - target[i] += source[i]; - } - } - - private static void add(double[] weights, Map indexes, String geome, double value) { - Integer index = indexes.get(geome); - if (index != null) { - weights[index] += value; - } - } - - private static double getDouble(JsonObject json, String key, double fallback) { - if (!json.has(key)) { - return fallback; - } - return GsonHelper.getAsFloat(json, key); - } - - private static JsonObject defaultConfig() { - JsonObject root = new JsonObject(); - root.addProperty("schema_version", 1); - root.addProperty("geome_scale", 384.0D); - root.addProperty("biome_influence", 1.15D); - root.addProperty("regional_noise_influence", 0.90D); - root.addProperty("boundary_noise_influence", 0.45D); - - JsonObject geomes = new JsonObject(); - addGeome(geomes, "stable_craton", 1.0D, 0.9D, 1.0D, 1.4D, 0.25D); - addGeome(geomes, "mountain_belt", 1.0D, 0.55D, 2.8D, 1.35D, 0.55D); - addGeome(geomes, "volcanic_arc", 0.9D, 0.35D, 0.75D, 1.25D, 3.6D); - addGeome(geomes, "sedimentary_basin", 1.0D, 3.2D, 0.45D, 0.35D, 0.15D); - addGeome(geomes, "coastal_shelf", 0.9D, 3.0D, 0.35D, 0.25D, 0.25D); - addGeome(geomes, "arid_basin", 0.9D, 2.8D, 0.35D, 0.45D, 0.35D); - addGeome(geomes, "wetland_basin", 0.8D, 2.5D, 0.45D, 0.25D, 0.15D); - addGeome(geomes, "glacial_highland", 0.8D, 0.75D, 2.0D, 1.25D, 0.35D); - root.add("geomes", geomes); - - JsonObject biomeRules = new JsonObject(); - addVanillaBiomeDefaults(biomeRules); - addBiomesOPlentyDefaults(biomeRules); - root.add("biomes", biomeRules); - - JsonObject dictionaryRules = new JsonObject(); - addWeights(dictionaryRules, "MOUNTAIN", "mountain_belt", 3.0D, "stable_craton", 0.75D); - addWeights(dictionaryRules, "HILLS", "mountain_belt", 1.5D, "stable_craton", 0.75D); - addWeights(dictionaryRules, "OCEAN", "coastal_shelf", 3.0D, "sedimentary_basin", 1.0D); - addWeights(dictionaryRules, "RIVER", "coastal_shelf", 1.8D, "sedimentary_basin", 1.4D); - addWeights(dictionaryRules, "BEACH", "coastal_shelf", 3.0D); - addWeights(dictionaryRules, "SANDY", "arid_basin", 2.0D, "sedimentary_basin", 1.0D); - addWeights(dictionaryRules, "DRY", "arid_basin", 1.6D); - addWeights(dictionaryRules, "WET", "wetland_basin", 1.8D, "sedimentary_basin", 0.8D); - addWeights(dictionaryRules, "SWAMP", "wetland_basin", 3.0D); - addWeights(dictionaryRules, "SNOWY", "glacial_highland", 2.4D, "mountain_belt", 0.6D); - addWeights(dictionaryRules, "COLD", "glacial_highland", 1.2D); - addWeights(dictionaryRules, "HOT", "arid_basin", 0.8D, "volcanic_arc", 0.35D); - addWeights(dictionaryRules, "MESA", "arid_basin", 3.0D, "sedimentary_basin", 2.0D); - addWeights(dictionaryRules, "FOREST", "stable_craton", 1.2D); - addWeights(dictionaryRules, "PLAINS", "stable_craton", 1.1D, "sedimentary_basin", 0.6D); - root.add("biome_dictionary", dictionaryRules); - - JsonObject rocks = new JsonObject(); - addDefaultRocks(rocks); - root.add("rocks", rocks); - return root; - } - - private static void addGeome(JsonObject geomes, String name, double base, double sedimentary, - double metamorphic, double intrusive, double volcanic) { - JsonObject geome = new JsonObject(); - geome.addProperty("base", base); - JsonObject families = new JsonObject(); - families.addProperty(RockFamily.SEDIMENTARY.configName, sedimentary); - families.addProperty(RockFamily.METAMORPHIC.configName, metamorphic); - families.addProperty(RockFamily.IGNEOUS_INTRUSIVE.configName, intrusive); - families.addProperty(RockFamily.IGNEOUS_VOLCANIC.configName, volcanic); - geome.add("families", families); - geomes.add(name, geome); - } - - private static void addVanillaBiomeDefaults(JsonObject biomes) { - addWeights(biomes, "minecraft:ocean", "coastal_shelf", 4.0D); - addWeights(biomes, "minecraft:deep_ocean", "coastal_shelf", 4.0D, "sedimentary_basin", 1.0D); - addWeights(biomes, "minecraft:river", "coastal_shelf", 2.0D, "sedimentary_basin", 2.0D); - addWeights(biomes, "minecraft:beach", "coastal_shelf", 4.0D); - addWeights(biomes, "minecraft:stone_shore", "coastal_shelf", 2.5D, "mountain_belt", 1.5D); - addWeights(biomes, "minecraft:plains", "stable_craton", 2.0D, "sedimentary_basin", 1.0D); - addWeights(biomes, "minecraft:forest", "stable_craton", 2.0D); - addWeights(biomes, "minecraft:birch_forest", "stable_craton", 2.0D); - addWeights(biomes, "minecraft:dark_forest", "stable_craton", 2.0D, "wetland_basin", 0.5D); - addWeights(biomes, "minecraft:taiga", "stable_craton", 1.5D, "glacial_highland", 0.75D); - addWeights(biomes, "minecraft:desert", "arid_basin", 4.0D, "sedimentary_basin", 1.5D); - addWeights(biomes, "minecraft:desert_hills", "arid_basin", 3.5D, "sedimentary_basin", 1.2D); - addWeights(biomes, "minecraft:savanna", "arid_basin", 2.5D, "stable_craton", 0.75D); - addWeights(biomes, "minecraft:savanna_plateau", "arid_basin", 2.5D, "mountain_belt", 1.0D); - addWeights(biomes, "minecraft:badlands", "arid_basin", 3.5D, "sedimentary_basin", 3.0D); - addWeights(biomes, "minecraft:badlands_plateau", "arid_basin", 3.0D, "sedimentary_basin", 2.5D, - "mountain_belt", 0.8D); - addWeights(biomes, "minecraft:mountains", "mountain_belt", 4.0D, "stable_craton", 1.0D); - addWeights(biomes, "minecraft:wooded_mountains", "mountain_belt", 3.5D, "stable_craton", 1.2D); - addWeights(biomes, "minecraft:gravelly_mountains", "mountain_belt", 4.0D, "glacial_highland", 0.8D); - addWeights(biomes, "minecraft:swamp", "wetland_basin", 4.0D, "sedimentary_basin", 1.5D); - addWeights(biomes, "minecraft:jungle", "wetland_basin", 1.5D, "stable_craton", 1.5D); - addWeights(biomes, "minecraft:snowy_tundra", "glacial_highland", 3.5D, "sedimentary_basin", 0.7D); - addWeights(biomes, "minecraft:snowy_mountains", "glacial_highland", 3.5D, "mountain_belt", 2.0D); - addWeights(biomes, "minecraft:frozen_ocean", "glacial_highland", 1.5D, "coastal_shelf", 3.0D); - addWeights(biomes, "minecraft:frozen_river", "glacial_highland", 1.5D, "coastal_shelf", 2.0D); - } - - private static void addBiomesOPlentyDefaults(JsonObject biomes) { - String[] mountains = { "alps", "alps_foothills", "highland", "highland_crag", "jade_cliffs", - "rainbow_hills", "redwood_hills" }; - addBOPWeights(biomes, mountains, "mountain_belt", 3.5D, "stable_craton", 0.8D); - addWeights(biomes, bop("highland_moor"), "mountain_belt", 2.0D, "wetland_basin", 1.0D); - addWeights(biomes, bop("volcano"), "volcanic_arc", 6.0D, "mountain_belt", 1.0D); - addWeights(biomes, bop("volcanic_plains"), "volcanic_arc", 4.0D, "arid_basin", 0.8D); - - String[] dry = { "cold_desert", "dry_boneyard", "dryland", "golden_prairie", "grassland", - "grassland_clover_patch", "lush_desert", "lush_savanna", "prairie", "scrubland", "shrubland", - "shrubland_hills", "wasteland", "wooded_scrubland" }; - addBOPWeights(biomes, dry, "arid_basin", 3.0D, "sedimentary_basin", 1.0D); - - String[] wet = { "bayou", "bayou_mangrove", "deep_bayou", "dense_marsh", "fungal_field", - "fungal_jungle", "marsh", "muskeg", "ominous_mire", "rainforest", "rainforest_cliffs", - "rainforest_floodplain", "shroomy_wetland", "wetland", "wetland_forest" }; - addBOPWeights(biomes, wet, "wetland_basin", 3.0D, "sedimentary_basin", 1.1D); - - String[] cold = { "coniferous_forest", "coniferous_lakes", "fir_clearing", - "snowy_coniferous_forest", "snowy_fir_clearing", "snowy_maple_forest", "tundra", - "tundra_basin", "tundra_bog" }; - addBOPWeights(biomes, cold, "glacial_highland", 2.0D, "stable_craton", 1.0D); - - String[] temperate = { "bamboo_blossom_grove", "burnt_forest", "cherry_blossom_grove", - "dead_forest", "dense_woodland", "flower_meadow", "grove", "grove_clearing", "grove_lakes", - "lavender_field", "lavender_forest", "meadow", "meadow_forest", "mystic_grove", - "mystic_plains", "ominous_woods", "orchard", "origin_valley", "redwood_forest", - "redwood_forest_edge", "seasonal_forest", "seasonal_orchard", "seasonal_pumpkin_patch", - "tall_dead_forest", "woodland" }; - addBOPWeights(biomes, temperate, "stable_craton", 2.0D, "wetland_basin", 0.5D); - - addWeights(biomes, bop("gravel_beach"), "coastal_shelf", 3.0D, "mountain_belt", 0.8D); - addWeights(biomes, bop("tropic_beach"), "coastal_shelf", 3.5D, "wetland_basin", 0.8D); - addWeights(biomes, bop("tropics"), "coastal_shelf", 2.0D, "wetland_basin", 1.2D); - } - - private static String bop(String path) { - return "biomesoplenty:" + path; - } - - private static void addBOPWeights(JsonObject biomes, String[] names, Object... values) { - for (String name : names) { - addWeights(biomes, bop(name), values); - } - } - - private static void addDefaultRocks(JsonObject rocks) { - addRock(rocks, "mineralogy:andesite", RockFamily.IGNEOUS_VOLCANIC, 68, 42, 1.0D, - "volcanic_arc", 3.0D, "mountain_belt", 1.2D); - addRock(rocks, "mineralogy:basalt", RockFamily.IGNEOUS_VOLCANIC, 72, 36, 1.2D, - "volcanic_arc", 4.0D, "coastal_shelf", 0.7D); - addRock(rocks, "mineralogy:rhyolite", RockFamily.IGNEOUS_VOLCANIC, 70, 36, 1.0D, - "volcanic_arc", 3.5D, "mountain_belt", 0.8D); - addRock(rocks, "mineralogy:basaltic_glass", RockFamily.IGNEOUS_VOLCANIC, 78, 24, 0.75D, - "volcanic_arc", 4.5D); - addRock(rocks, "mineralogy:scoria", RockFamily.IGNEOUS_VOLCANIC, 80, 22, 0.85D, - "volcanic_arc", 4.0D); - addRock(rocks, "mineralogy:tuff", RockFamily.IGNEOUS_VOLCANIC, 74, 30, 0.9D, - "volcanic_arc", 3.5D, "arid_basin", 0.8D); - addRock(rocks, "mineralogy:pumice", RockFamily.IGNEOUS_VOLCANIC, 82, 20, 0.65D, - "volcanic_arc", 4.0D); - - addRock(rocks, "mineralogy:diorite", RockFamily.IGNEOUS_INTRUSIVE, 36, 42, 1.0D, - "stable_craton", 1.3D, "mountain_belt", 1.0D); - addRock(rocks, "mineralogy:granite", RockFamily.IGNEOUS_INTRUSIVE, 30, 48, 1.1D, - "stable_craton", 2.0D, "mountain_belt", 1.4D); - addRock(rocks, "mineralogy:pegmatite", RockFamily.IGNEOUS_INTRUSIVE, 26, 36, 0.8D, - "stable_craton", 1.6D, "mountain_belt", 1.2D); - addRock(rocks, "mineralogy:diabase", RockFamily.IGNEOUS_INTRUSIVE, 30, 40, 1.0D, - "stable_craton", 1.2D, "volcanic_arc", 1.2D); - addRock(rocks, "mineralogy:gabbro", RockFamily.IGNEOUS_INTRUSIVE, 20, 44, 1.1D, - "stable_craton", 1.2D, "mountain_belt", 1.2D); - addRock(rocks, "mineralogy:peridotite", RockFamily.IGNEOUS_INTRUSIVE, 10, 34, 0.85D, - "mountain_belt", 1.5D, "volcanic_arc", 1.0D); - - addRock(rocks, "mineralogy:shale", RockFamily.SEDIMENTARY, 62, 36, 1.15D, - "sedimentary_basin", 3.5D, "wetland_basin", 2.0D, "coastal_shelf", 1.8D); - addRock(rocks, "mineralogy:conglomerate", RockFamily.SEDIMENTARY, 58, 32, 0.9D, - "sedimentary_basin", 2.2D, "mountain_belt", 0.8D); - addRock(rocks, "mineralogy:dolomite", RockFamily.SEDIMENTARY, 55, 38, 0.9D, - "coastal_shelf", 2.2D, "sedimentary_basin", 1.8D); - addRock(rocks, "mineralogy:limestone", RockFamily.SEDIMENTARY, 60, 40, 1.0D, - "coastal_shelf", 3.0D, "sedimentary_basin", 1.6D); - addRock(rocks, "mineralogy:siltstone", RockFamily.SEDIMENTARY, 66, 34, 1.0D, - "sedimentary_basin", 2.4D, "wetland_basin", 1.8D); - addRock(rocks, "mineralogy:rock_salt", RockFamily.SEDIMENTARY, 54, 28, 0.6D, - "arid_basin", 4.0D, "coastal_shelf", 1.2D); - addRock(rocks, "mineralogy:chert", RockFamily.SEDIMENTARY, 48, 32, 0.65D, - "coastal_shelf", 2.0D, "sedimentary_basin", 1.4D); - addRock(rocks, "mineralogy:gypsum", RockFamily.SEDIMENTARY, 52, 26, 0.65D, - "arid_basin", 3.5D, "coastal_shelf", 1.0D); - addRock(rocks, "mineralogy:chalk", RockFamily.SEDIMENTARY, 68, 24, 0.65D, - "coastal_shelf", 3.0D); - addRock(rocks, "minecraft:sandstone", RockFamily.SEDIMENTARY, 72, 28, 0.55D, - "arid_basin", 2.5D, "coastal_shelf", 0.8D); - - addRock(rocks, "mineralogy:marble", RockFamily.METAMORPHIC, 32, 36, 0.85D, - "mountain_belt", 1.8D, "stable_craton", 1.2D); - addRock(rocks, "mineralogy:slate", RockFamily.METAMORPHIC, 36, 34, 1.0D, - "mountain_belt", 2.0D, "sedimentary_basin", 0.7D); - addRock(rocks, "mineralogy:schist", RockFamily.METAMORPHIC, 24, 34, 1.0D, - "mountain_belt", 2.8D); - addRock(rocks, "mineralogy:gneiss", RockFamily.METAMORPHIC, 18, 38, 1.0D, - "mountain_belt", 2.6D, "stable_craton", 1.2D); - addRock(rocks, "mineralogy:phyllite", RockFamily.METAMORPHIC, 34, 34, 0.9D, - "mountain_belt", 2.0D); - addRock(rocks, "mineralogy:amphibolite", RockFamily.METAMORPHIC, 18, 34, 0.9D, - "mountain_belt", 2.4D, "volcanic_arc", 0.8D); - addRock(rocks, "mineralogy:hornfels", RockFamily.METAMORPHIC, 24, 28, 0.75D, - "volcanic_arc", 2.0D, "mountain_belt", 1.4D); - addRock(rocks, "mineralogy:quartzite", RockFamily.METAMORPHIC, 30, 34, 0.85D, - "mountain_belt", 1.8D, "stable_craton", 1.0D); - addRock(rocks, "mineralogy:novaculite", RockFamily.METAMORPHIC, 28, 30, 0.65D, - "mountain_belt", 1.6D); - } - - private static void addWeights(JsonObject parent, String key, Object... values) { - JsonObject weights = new JsonObject(); - for (int i = 0; i + 1 < values.length; i += 2) { - weights.addProperty((String) values[i], (Double) values[i + 1]); - } - parent.add(key, weights); - } - - private static void addRock(JsonObject rocks, String id, RockFamily family, int peak, int spread, - double weight, Object... geomeWeights) { - JsonObject rock = new JsonObject(); - rock.addProperty("family", family.configName); - rock.addProperty("depth_peak", peak); - rock.addProperty("depth_spread", spread); - rock.addProperty("weight", weight); - JsonObject geomes = new JsonObject(); - for (int i = 0; i + 1 < geomeWeights.length; i += 2) { - geomes.addProperty((String) geomeWeights[i], (Double) geomeWeights[i + 1]); - } - rock.add("geomes", geomes); - rocks.add(id, rock); - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/worldgen/GeomeDistributionSampler.java b/src/main/java/com/mcmoddev/mineralogy/worldgen/GeomeDistributionSampler.java deleted file mode 100644 index 63fbda235..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/GeomeDistributionSampler.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.mcmoddev.mineralogy.worldgen; - -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraft.world.level.block.Block; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.biome.Biome; - -public final class GeomeDistributionSampler { - private GeomeDistributionSampler() { - throw new IllegalAccessError("Not an instantiable class"); - } - - public static String sample(long seed, Iterable biomes, int columnsPerBiome, int yStep) { - BakedGeomeConfig config = GeomeConfig.baked(); - GeomeGeology geology = new GeomeGeology(seed, config); - Map geomeCounts = new LinkedHashMap<>(); - Map rockCounts = new LinkedHashMap<>(); - - int biomeIndex = 0; - int samples = 0; - int step = Math.max(1, yStep); - for (Biome biome : biomes) { - for (int column = 0; column < columnsPerBiome; column++) { - int x = (biomeIndex * 257) + (column * 19); - int z = (biomeIndex * -193) + (column * 23); - add(geomeCounts, geology.getGeomeName(biome, x, z)); - for (int y = 8; y <= 96; y += step) { - Block block = geology.getStoneAt(biome, x, y, z, 96); - ResourceLocation id = block.getRegistryName(); - add(rockCounts, id == null ? "" : id.toString()); - samples++; - } - } - biomeIndex++; - } - - StringBuilder report = new StringBuilder(); - report.append("Geome sampler seed=").append(seed) - .append(" columnsPerBiome=").append(columnsPerBiome) - .append(" yStep=").append(step) - .append(" rockSamples=").append(samples) - .append('\n'); - appendCounts(report, "geomes", geomeCounts); - appendCounts(report, "rocks", rockCounts); - return report.toString(); - } - - private static void appendCounts(StringBuilder report, String label, Map counts) { - report.append(label).append(':').append('\n'); - for (Entry entry : counts.entrySet()) { - report.append(" ").append(entry.getKey()).append('=').append(entry.getValue()).append('\n'); - } - } - - private static void add(Map counts, String key) { - Integer current = counts.get(key); - counts.put(key, current == null ? 1 : current + 1); - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/worldgen/GeomeGeology.java b/src/main/java/com/mcmoddev/mineralogy/worldgen/GeomeGeology.java deleted file mode 100644 index 4255df5a3..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/GeomeGeology.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.mcmoddev.mineralogy.worldgen; - -import java.util.Random; - -import com.mcmoddev.mineralogy.MineralogyConfig; -import com.mcmoddev.mineralogy.worldgen.math.PerlinNoise2D; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.chunk.ChunkAccess; -import net.minecraft.world.level.levelgen.Heightmap; - -public final class GeomeGeology { - private final BakedGeomeConfig config; - private final PerlinNoise2D regionalNoise; - private final PerlinNoise2D boundaryNoise; - private final PerlinNoise2D familyShapeNoise; - private final PerlinNoise2D stratumNoise; - private final short[] whiteNoiseArray; - private final int layerThickness; - - public GeomeGeology(long seed, BakedGeomeConfig config) { - int rockLayerUndertones = 4; - int undertoneMultiplier = 1 << (rockLayerUndertones - 1); - this.config = config; - layerThickness = Math.max(1, MineralogyConfig.geomLayerThickness()); - regionalNoise = new PerlinNoise2D(seed ^ 0x47E04E4DL, 96.0F, (float) config.geomeScale, 2); - boundaryNoise = new PerlinNoise2D(~seed ^ 0x1BADC0DEL, 48.0F, (float) (config.geomeScale * 0.45D), 2); - familyShapeNoise = new PerlinNoise2D(~seed, 128.0F, (float) MineralogyConfig.geomeSize(), 2); - stratumNoise = new PerlinNoise2D(seed, (float) (4 * undertoneMultiplier), - (float) (MineralogyConfig.rockLayerNoise() * undertoneMultiplier), rockLayerUndertones); - - Random random = new Random(seed ^ 0x5EEDBEEFL); - whiteNoiseArray = new short[256]; - for (int i = 0; i < whiteNoiseArray.length; i++) { - whiteNoiseArray[i] = (short) random.nextInt(0x7FFF); - } - } - - public void replaceStoneInChunk(LevelAccessor world, ChunkAccess chunk) { - ChunkPos chunkPos = chunk.getPos(); - int xOffset = chunkPos.getMinBlockX(); - int zOffset = chunkPos.getMinBlockZ(); - BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos(); - double[] regionalValues = new double[config.geomeCount()]; - boolean changed = false; - - for (int dx = 0; dx < 16; dx++) { - int x = xOffset + dx; - for (int dz = 0; dz < 16; dz++) { - int z = zOffset + dz; - int surfaceY = chunk.getHeight(Heightmap.Types.WORLD_SURFACE_WG, dx, dz); - cursor.set(x, surfaceY, z); - Biome biome = world.getBiome(cursor); - int geomeIndex = classifyColumn(biome, x, z, regionalValues); - int baseRockValue = (int) stratumNoise.valueAt(x, z); - - for (int y = surfaceY; y > 0; y--) { - cursor.set(x, y, z); - if (chunk.getBlockState(cursor).getBlock() == Blocks.STONE) { - chunk.setBlockState(cursor, pickReplacement(geomeIndex, baseRockValue, x, y, z), false); - changed = true; - } - } - } - } - - if (changed) { - chunk.setUnsaved(true); - } - } - - public Block getStoneAt(Biome biome, int x, int y, int z, int surfaceY) { - double[] regionalValues = new double[config.geomeCount()]; - int geomeIndex = classifyColumn(biome, x, z, regionalValues); - return pickReplacement(geomeIndex, (int) stratumNoise.valueAt(x, z), x, y, z).getBlock(); - } - - public String getGeomeName(Biome biome, int x, int z) { - double[] regionalValues = new double[config.geomeCount()]; - return config.geomeName(classifyColumn(biome, x, z, regionalValues)); - } - - private int classifyColumn(Biome biome, int x, int z, double[] regionalValues) { - for (int i = 0; i < regionalValues.length; i++) { - regionalValues[i] = regionalNoise.valueAt(x + config.noiseOffsetX[i], z + config.noiseOffsetZ[i]); - } - - double boundary = boundaryNoise.valueAt(x, z); - return config.pickGeome(biome, regionalValues, boundary); - } - - private net.minecraft.world.level.block.state.BlockState pickReplacement(int geomeIndex, int baseRockValue, int x, int y, - int z) { - int stratum = baseRockValue + y; - int layerIndex = Math.floorDiv(stratum, layerThickness); - int layerY = y + (layerThickness / 2) - Math.floorMod(stratum, layerThickness); - int familyHash = whiteNoiseArray[(layerIndex + (geomeIndex * 37)) & 0xFF]; - RockFamily family = pickShapedFamily(geomeIndex, x, y, z, layerY, familyHash); - int rockHash = whiteNoiseArray[((layerIndex * 31) + (family.ordinal() * 53) + (geomeIndex * 79)) & 0xFF]; - return config.pickRock(geomeIndex, family, layerY, rockHash); - } - - private RockFamily pickShapedFamily(int geomeIndex, int x, int y, int z, int layerY, int familyHash) { - double shapedFamily = familyShapeNoise.valueAt(x, z) + y; - boolean nearBoundary = Math.abs(shapedFamily + 32.0D) < 12.0D || Math.abs(shapedFamily - 32.0D) < 12.0D; - if (nearBoundary && (familyHash & 0x03) == 0) { - return config.pickFamily(geomeIndex, layerY, familyHash); - } - - if (shapedFamily < -32.0D) { - return y > 48 ? RockFamily.IGNEOUS_VOLCANIC : RockFamily.IGNEOUS_INTRUSIVE; - } else if (shapedFamily < 32.0D) { - return RockFamily.METAMORPHIC; - } - - return RockFamily.SEDIMENTARY; - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/worldgen/MineralogyOreGeneration.java b/src/main/java/com/mcmoddev/mineralogy/worldgen/MineralogyOreGeneration.java deleted file mode 100644 index 44aa58668..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/MineralogyOreGeneration.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.mcmoddev.mineralogy.worldgen; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import com.mcmoddev.mineralogy.Mineralogy; -import com.mcmoddev.mineralogy.MineralogyConfig; -import com.mcmoddev.mineralogy.MineralogyConfig.OreGenerationSettings; -import com.mcmoddev.mineralogy.blocks.Rock; -import com.mojang.serialization.Codec; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.data.BuiltinRegistries; -import net.minecraft.core.Registry; -import net.minecraft.world.level.biome.Biome.BiomeCategory; -import net.minecraft.world.level.levelgen.GenerationStep; -import net.minecraft.world.level.levelgen.VerticalAnchor; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; -import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; -import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTestType; -import net.minecraftforge.event.world.BiomeLoadingEvent; -import net.minecraftforge.registries.ForgeRegistries; - -public final class MineralogyOreGeneration { - private static final RuleTestType MINERALOGY_ORE_TARGET_TYPE = - RuleTestType.register(Mineralogy.MODID + ":ore_targets", - Codec.unit(MineralogyOreRuleTest::new)); - private static final RuleTest MINERALOGY_ORE_TARGETS = new MineralogyOreRuleTest(); - private static final List> CONFIGURED_FEATURES = new ArrayList>(); - - private MineralogyOreGeneration() { - throw new IllegalAccessError("Not an instantiable class"); - } - - public static void registerConfiguredFeatures() { - CONFIGURED_FEATURES.clear(); - addOre("sulfur_ore", MineralogyConfig.sulfurOre()); - addOre("phosphorous_ore", MineralogyConfig.phosphorousOre()); - addOre("nitrate_ore", MineralogyConfig.nitrateOre()); - } - - public static void onBiomeLoading(BiomeLoadingEvent event) { - if (event.getCategory() == BiomeCategory.NETHER || event.getCategory() == BiomeCategory.THEEND - || event.getCategory() == BiomeCategory.NONE) { - return; - } - - for (ConfiguredFeature feature : CONFIGURED_FEATURES) { - event.getGeneration().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, feature); - } - } - - private static void addOre(String oreName, OreGenerationSettings settings) { - Block ore = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Mineralogy.MODID, oreName)); - if (ore == null || settings.quantity() <= 0 || settings.frequency() <= 0.0D - || settings.maxY() <= settings.minY()) { - return; - } - - OreConfiguration oreConfig = new OreConfiguration(MINERALOGY_ORE_TARGETS, ore.defaultBlockState(), - settings.quantity()); - int wholeCount = (int) settings.frequency(); - float fractionalChance = (float) (settings.frequency() - wholeCount); - - if (wholeCount > 0) { - addConfiguredOreFeature(oreName, "count", oreConfig, - baseOreFeature(oreConfig, settings).count(wholeCount)); - } - - if (fractionalChance > 0.0F) { - int chance = Math.max(1, (int) Math.ceil(1.0F / fractionalChance)); - addConfiguredOreFeature(oreName, "chance", oreConfig, - baseOreFeature(oreConfig, settings).rarity(chance)); - } - } - - private static ConfiguredFeature baseOreFeature(OreConfiguration oreConfig, OreGenerationSettings settings) { - return Feature.ORE.configured(oreConfig) - .rangeUniform(VerticalAnchor.absolute(settings.minY()), VerticalAnchor.absolute(settings.maxY())) - .squared(); - } - - private static void addConfiguredOreFeature(String oreName, String suffix, OreConfiguration oreConfig, - ConfiguredFeature configuredFeature) { - Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, - new ResourceLocation(Mineralogy.MODID, oreName + "_" + suffix), configuredFeature); - CONFIGURED_FEATURES.add(configuredFeature); - } - - private static final class MineralogyOreRuleTest extends RuleTest { - @Override - public boolean test(BlockState state, Random random) { - if (OreConfiguration.Predicates.NATURAL_STONE.test(state, random)) { - return true; - } - - Block block = state.getBlock(); - return block instanceof Rock && ((Rock) block).isStoneEquivalent; - } - - @Override - protected RuleTestType getType() { - return MINERALOGY_ORE_TARGET_TYPE; - } - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/worldgen/RockFamily.java b/src/main/java/com/mcmoddev/mineralogy/worldgen/RockFamily.java deleted file mode 100644 index 490fc0107..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/RockFamily.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.mcmoddev.mineralogy.worldgen; - -public enum RockFamily { - SEDIMENTARY("sedimentary"), - METAMORPHIC("metamorphic"), - IGNEOUS_INTRUSIVE("igneous_intrusive"), - IGNEOUS_VOLCANIC("igneous_volcanic"); - - public final String configName; - - private RockFamily(String configName) { - this.configName = configName; - } - - public static RockFamily fromConfigName(String name) { - for (RockFamily family : values()) { - if (family.configName.equalsIgnoreCase(name) || family.name().equalsIgnoreCase(name)) { - return family; - } - } - - throw new IllegalArgumentException("Unknown rock family: " + name); - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/worldgen/StoneReplacer.java b/src/main/java/com/mcmoddev/mineralogy/worldgen/StoneReplacer.java deleted file mode 100644 index b8b3d7902..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/StoneReplacer.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.mcmoddev.mineralogy.worldgen; - -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import com.mcmoddev.mineralogy.Mineralogy; -import com.mcmoddev.mineralogy.MineralogyConfig; -import com.mcmoddev.mineralogy.MineralogyConfig.GeologyMode; - -import net.minecraft.core.BlockPos; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.data.BuiltinRegistries; -import net.minecraft.core.Registry; -import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.biome.Biome.BiomeCategory; -import net.minecraft.world.level.chunk.ChunkAccess; -import net.minecraft.world.level.levelgen.GenerationStep; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import net.minecraft.world.level.levelgen.feature.configurations.NoneDecoratorConfiguration; -import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -import net.minecraft.world.level.levelgen.placement.FeatureDecorator; -import net.minecraftforge.event.world.BiomeLoadingEvent; - -public class StoneReplacer extends Feature { - public static final StoneReplacer FEATURE = new StoneReplacer(); - private static final ConfiguredFeature CONFIGURED_FEATURE = - FEATURE.configured(NoneFeatureConfiguration.INSTANCE) - .decorated(FeatureDecorator.NOPE.configured(NoneDecoratorConfiguration.INSTANCE)); - - private final Lock geologyLock = new ReentrantLock(); - private Geology geology = null; - private GeomeGeology geomeGeology = null; - private long geologySeed = Long.MIN_VALUE; - - private StoneReplacer() { - super(NoneFeatureConfiguration.CODEC); - setRegistryName(Mineralogy.MODID, "stone_replacer"); - } - - public static void registerConfiguredFeature() { - Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, - new ResourceLocation(Mineralogy.MODID, "stone_replacer"), CONFIGURED_FEATURE); - } - - public static void onBiomeLoading(BiomeLoadingEvent event) { - if (isOverworldCategory(event.getCategory())) { - event.getGeneration().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, CONFIGURED_FEATURE); - } - } - - @Override - public boolean place(FeaturePlaceContext context) { - WorldGenLevel world = context.level(); - BlockPos pos = context.origin(); - if (!MineralogyConfig.placeMineralogyRock() - || world.getLevel().dimension() != Level.OVERWORLD) { - return false; - } - - ChunkAccess chunk = world.getChunk(pos); - if (MineralogyConfig.geologyMode() == GeologyMode.LEGACY) { - getLegacyGeology(world.getSeed()).replaceStoneInChunk(chunk); - } else { - getGeomeGeology(world.getSeed()).replaceStoneInChunk(world, chunk); - } - return true; - } - - private static boolean isOverworldCategory(BiomeCategory category) { - return category != BiomeCategory.NETHER && category != BiomeCategory.THEEND - && category != BiomeCategory.NONE; - } - - private Geology getLegacyGeology(long seed) { - if (geology == null || geologySeed != seed) { - geologyLock.lock(); - try { - if (geology == null || geologySeed != seed) { - geology = new Geology(seed, MineralogyConfig.geomeSize(), MineralogyConfig.rockLayerNoise()); - geomeGeology = null; - geologySeed = seed; - } - } finally { - geologyLock.unlock(); - } - } - - return geology; - } - - private GeomeGeology getGeomeGeology(long seed) { - if (geomeGeology == null || geologySeed != seed) { - geologyLock.lock(); - try { - if (geomeGeology == null || geologySeed != seed) { - geomeGeology = new GeomeGeology(seed, GeomeConfig.baked()); - geology = null; - geologySeed = seed; - } - } finally { - geologyLock.unlock(); - } - } - - return geomeGeology; - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/worldgen/math/CubicInterpolator.java b/src/main/java/com/mcmoddev/mineralogy/worldgen/math/CubicInterpolator.java deleted file mode 100644 index 0318f0c0f..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/math/CubicInterpolator.java +++ /dev/null @@ -1,214 +0,0 @@ -package com.mcmoddev.mineralogy.worldgen.math; - -/** - * This is a convenience class that provides multidimensional cubic - * interpolation methods. This class is abstract and not meant to be extended - * - * @author Cyanobacterium - */ -public abstract class CubicInterpolator { - - /** - * Interpolate with cubic approximation for a point X on a grid. X - * must lie between the X values of the yn1 and yp1 control points. - * - * @param x - * x coordinate to interpolate - * @param yn2 - * Y value at f(floor(x)-1) - * @param yn1 - * Y value at f(floor(x)-0) - * @param yp1 - * Y value at f(floor(x)+1) - * @param yp2 - * Y value at f(floor(x)+2) - * @return A cubic-interpolated value from the given control points. - */ - public static double interpolate(double x, double yn2, double yn1, double yp1, double yp2) { - return interpolate1d(x, yn2, yn1, yp1, yp2); - } - - /** - * Interpolate with cubic approximation for a point X on a grid. X - * must lie between the X values of the yn1 and yp1 control points. - * - * @param x - * x coordinate to interpolate - * @param yn2 - * Y value at f(floor(x)-1) - * @param yn1 - * Y value at f(floor(x)-0) - * @param yp1 - * Y value at f(floor(x)+1) - * @param yp2 - * Y value at f(floor(x)+2) - * @return A cubic-interpolated value from the given control points. - */ - public static double interpolate1d(double x, double yn2, double yn1, double yp1, double yp2) { - double w = x - Math.floor(x); - if (w == 0 && x != 0) - return yp1; // w should be 1, but the way this is calcluated it doesn't work right - // prevent precision-loss artifacts - if (w < 0.000976563) { - return yn1; - } - if (w > 0.999023438) { - return yp1; - } - // adapted from http://www.paulinternet.nl/?page=bicubic - double A = -0.5 * yn2 + 1.5 * yn1 - 1.5 * yp1 + 0.5 * yp2; - double B = yn2 - 2.5 * yn1 + 2 * yp1 - 0.5 * yp2; - double C = -0.5 * yn2 + 0.5 * yp1; - double D = yn1; - return A * w * w * w + B * w * w + C * w + D; - } - - /** - * Returns the bi-cubic interpolation of the (x,y) coordinate inide - * the provided grid of control points. (x,y) is assumed to be in the - * center square of the unit grid. - * - * @param x - * x coordinate between local16[1][y] and local16[2][y] - * @param y - * y coordinate between local16[x][1] and local16[x][2] - * @param local16 - * Array [x][y] of the 4x4 grid around the coordinate - * @return Returns the bi-cubic interpolation of the (x,y) coordinate. - */ - public static double interpolate2d(double x, double y, double[][] local16) { - double[] section = new double[4]; - for (int i = 0; i < 4; i++) { - section[i] = interpolate1d(y, local16[i][0], local16[i][1], local16[i][2], local16[i][3]); - } - return interpolate1d(x, section[0], section[1], section[2], section[3]); - } - - /** - * Performs a tri-cubic interpolation of the (x,y,z) coordinate near - * the center of the provided unit grid of surrounding control points. - * - * @param x - * x coordinate in the middle of the array space - * @param y - * y coordinate in the middle of the array space - * @param z - * z coordinate in the middle of the array space - * @param local64 - * Array [x][y][z] of the 4x4x4 grid around the coordinate - * @return Returns the tri-cubic interpolation of the given coordinate. - */ - public static double interpolate3d(double x, double y, double z, double[][][] local64) { - double[] section = new double[4]; - for (int i = 0; i < 4; i++) { - section[i] = interpolate2d(y, z, local64[i]); - } - return interpolate1d(x, section[0], section[1], section[2], section[3]); - } - - /** - * Interpolate with cubic approximation for a point X on a grid. X - * must lie between the X values of the yn1 and yp1 control points. - * - * @param x - * x coordinate to interpolate - * @param yn2 - * Y value at f(floor(x)-1) - * @param yn1 - * Y value at f(floor(x)-0) - * @param yp1 - * Y value at f(floor(x)+1) - * @param yp2 - * Y value at f(floor(x)+2) - * @return A cubic-interpolated value from the given control points. - */ - public static float interpolate(double x, float yn2, float yn1, float yp1, float yp2) { - return interpolate1d(x, yn2, yn1, yp1, yp2); - } - - /** - * Interpolate with cubic approximation for a point X on a grid. X - * must lie between the X values of the yn1 and yp1 control points. - * - * @param x - * x coordinate to interpolate - * @param yn2 - * Y value at f(floor(x)-1) - * @param yn1 - * Y value at f(floor(x)-0) - * @param yp1 - * Y value at f(floor(x)+1) - * @param yp2 - * Y value at f(floor(x)+2) - * @return A cubic-interpolated value from the given control points. - */ - public static float interpolate1d(double x, float yn2, float yn1, float yp1, float yp2) { - float w = (float) (x - floor(x)); - if (w == 0 && x != 0) - return yn1; // w should be 1, but the way this is calcluated it doesn't work right - // prevent precision-loss artifacts - if (w < 0.0001) { - return yn1; - } - if (w > 0.999) { - return yp1; - } - // adapted from http://www.paulinternet.nl/?page=bicubic - float A = -0.5f * yn2 + 1.5f * yn1 - 1.5f * yp1 + 0.5f * yp2; - float B = yn2 - 2.5f * yn1 + 2f * yp1 - 0.5f * yp2; - float C = -0.5f * yn2 + 0.5f * yp1; - float D = yn1; - return A * w * w * w + B * w * w + C * w + D; - } - - /** - * Returns the bi-cubic interpolation of the (x,y) coordinate inside - * the provided grid of control points. (x,y) is assumed to be in the - * center square of the unit grid. - * - * @param x - * x coordinate between local16[1][y] and local16[2][y] - * @param y - * y coordinate between local16[x][1] and local16[x][2] - * @param local16 - * Array [x][y] of the 4x4 grid around the coordinate - * @return Returns the bi-cubic interpolation of the (x,y) coordinate. - */ - public static float interpolate2d(double x, double y, float[][] local16) { - float[] section = new float[4]; - for (int i = 0; i < 4; i++) { - section[i] = interpolate1d(y, local16[i][0], local16[i][1], local16[i][2], local16[i][3]); - } - return interpolate1d(x, section[0], section[1], section[2], section[3]); - } - - /** - * Performs a tri-cubic interpolation of the (x,y,z) coordinate near - * the center of the provided unit grid of surrounding control points. - * - * @param x - * x coordinate in the middle of the array space - * @param y - * y coordinate in the middle of the array space - * @param z - * z coordinate in the middle of the array space - * @param local64 - * Array [x][y][z] of the 4x4x4 grid around the coordinate - * @return Returns the tri-cubic interpolation of the given coordinate. - */ - public static float interpolate3d(double x, double y, double z, float[][][] local64) { - float[] section = new float[4]; - for (int i = 0; i < 4; i++) { - section[i] = interpolate2d(y, z, local64[i]); - } - return interpolate1d(x, section[0], section[1], section[2], section[3]); - } - - public static int floor(double x) { - if (x >= 0.0) { - return (int) x; - } else { - return ((int) x) - 1; - } - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/worldgen/math/NoiseLayer2D.java b/src/main/java/com/mcmoddev/mineralogy/worldgen/math/NoiseLayer2D.java deleted file mode 100644 index 86b2dc2ac..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/math/NoiseLayer2D.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.mcmoddev.mineralogy.worldgen.math; - -/** - * Perlin Noise Octave - * - * @author Cyanobacterium - * - */ -public class NoiseLayer2D { - - private final long seed; - - /** from java.util.Random implementation */ - private static final long RAND_MULTIPLIER = 0x5DEECE66DL; - /** from java.util.Random implementation */ - private static final long RAND_ADDEND = 0xBL; - /** from java.util.Random implementation */ - private static final long RAND_MASK = (1L << 48) - 1; - - private final float multiplier; - - private final float magnitude; - - private static final int PRECISION_MASK = 0x0FFFFF; - private static final float INT_CONVERSION_MULTIPLIER = 2.0f / (float) PRECISION_MASK; // 2.0 because we will be subtracting 1 - // to make it range from -1 to 1 - - public NoiseLayer2D(long seed, float size, float magnitude) { - this.seed = seed; - this.multiplier = 1.0f / size; - this.magnitude = magnitude; - } - - public float getValueAt(double x, double y) { - x *= multiplier; - y *= multiplier; - int gridX = CubicInterpolator.floor(x); - int gridY = CubicInterpolator.floor(y); - float sx0 = interpolateY(y, gridX, gridY, 0); - float sx1 = interpolateY(y, gridX, gridY, 1); - float sx2 = interpolateY(y, gridX, gridY, 2); - float sx3 = interpolateY(y, gridX, gridY, 3); - return CubicInterpolator.interpolate1d(x, sx0, sx1, sx2, sx3); - } - - private float interpolateY(double y, int gridX, int gridY, int dx) { - int sampleX = gridX + dx; - return CubicInterpolator.interpolate1d(y, - randAt(sampleX, gridY), - randAt(sampleX, gridY + 1), - randAt(sampleX, gridY + 2), - randAt(sampleX, gridY + 3)); - } - - protected float randAt(int x, int y) { - long h = hash(x, y, seed); - return magnitude * ((h & PRECISION_MASK) * INT_CONVERSION_MULTIPLIER - 1.0f); - } - - static long hash(int x, int y, long seed) { - long l = (seed ^ RAND_MULTIPLIER) & RAND_MASK; - l = (((l * RAND_MULTIPLIER) + RAND_ADDEND) ^ x) & RAND_MASK; - l = (((l * RAND_MULTIPLIER) + RAND_ADDEND) ^ y) & RAND_MASK; - l = ((l * RAND_MULTIPLIER) + RAND_ADDEND) & RAND_MASK; - return l; - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/worldgen/math/PerlinNoise2D.java b/src/main/java/com/mcmoddev/mineralogy/worldgen/math/PerlinNoise2D.java deleted file mode 100644 index eeea68b50..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/math/PerlinNoise2D.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.mcmoddev.mineralogy.worldgen.math; - -public class PerlinNoise2D { - - private final NoiseLayer2D[] layers; - - /** from java.util.Random implementation */ - private static final long RAND_MULTIPLIER = 0x5DEECE66DL; - /** from java.util.Random implementation */ - private static final long RAND_ADDEND = 0xBL; - /** from java.util.Random implementation */ - private static final long RAND_MASK = (1L << 48) - 1; - - public PerlinNoise2D(long seed, float initialRange, float initialSize, int numOvertoneLayers) { - layers = new NoiseLayer2D[numOvertoneLayers]; - for (int i = 0; i < layers.length; i++) { - seed = scramble(seed); - layers[i] = new NoiseLayer2D(seed, initialSize, initialRange); - initialSize *= 0.5; - initialRange *= 0.5; - } - } - - public float valueAt(double x, double y) { - float sum = 0; - for (int i = 0; i < layers.length; i++) { - sum += layers[i].getValueAt(x, y); - } - return sum; - } - - private static long scramble(long l) { - return ((l * RAND_MULTIPLIER) + RAND_ADDEND) & RAND_MASK; - } -} diff --git a/src/main/java/com/mcmoddev/mineralogy/Constants.java b/src/main/java/zone/moddev/mc/mineralogy/Constants.java similarity index 95% rename from src/main/java/com/mcmoddev/mineralogy/Constants.java rename to src/main/java/zone/moddev/mc/mineralogy/Constants.java index 52a13d82f..d81ad2c6c 100644 --- a/src/main/java/com/mcmoddev/mineralogy/Constants.java +++ b/src/main/java/zone/moddev/mc/mineralogy/Constants.java @@ -1,44 +1,44 @@ -package com.mcmoddev.mineralogy; - -public class Constants { - // add other blocks and recipes - public static final String[] colorSuffixes = { - "black", - "red", - "green", - "brown", - "blue", - "purple", - "cyan", - "silver", - "gray", - "pink", - "lime", - "yellow", - "light_blue", - "magenta", - "orange", - "white" - }; - public static final String[] colorSuffixesTwo = { - "Black", - "Red", - "Green", - "Brown", - "Blue", - "Purple", - "Cyan", - "LightGray", - "Gray", - "Pink", - "Lime", - "Yellow", - "LightBlue", - "Magenta", - "Orange", - "White" - }; - +package zone.moddev.mc.mineralogy; + +public class Constants { + // add other blocks and recipes + public static final String[] colorSuffixes = { + "black", + "red", + "green", + "brown", + "blue", + "purple", + "cyan", + "silver", + "gray", + "pink", + "lime", + "yellow", + "light_blue", + "magenta", + "orange", + "white" + }; + public static final String[] colorSuffixesTwo = { + "Black", + "Red", + "Green", + "Brown", + "Blue", + "Purple", + "Cyan", + "LightGray", + "Gray", + "Pink", + "Lime", + "Yellow", + "LightBlue", + "Magenta", + "Orange", + "White" + }; + public static final String GYPSUM = "Gypsum"; public static final String CHALK = "Chalk"; public static final String ROCKSALT = "Rock_salt"; @@ -49,30 +49,30 @@ public class Constants { public static final String FURNACE = "furnace"; public static final String RELIEF = "relief"; public static final String SLAB = "slab"; - public static final String ORE = "ore"; - public static final String BLOCK = "Block"; - public static final String DUST = "dust"; - public static final String GUNPOWDER = "GUNPOWDER"; - public static final String DRYWALL = "drywall"; - public static final String PUMICE = "pumice"; - public static final String CHERT = "chert"; - public static final String SMOOTH = "smooth"; - public static final String BRICK = "brick"; - public static final String MINERALFERTILIZER = "mineralFertilizer"; - public static final String COBBLESTONE = "cobblestone"; + public static final String ORE = "ore"; + public static final String BLOCK = "Block"; + public static final String DUST = "dust"; + public static final String GUNPOWDER = "GUNPOWDER"; + public static final String DRYWALL = "drywall"; + public static final String PUMICE = "pumice"; + public static final String CHERT = "chert"; + public static final String SMOOTH = "smooth"; + public static final String BRICK = "brick"; + public static final String MINERALFERTILIZER = "mineralFertilizer"; + public static final String COBBLESTONE = "cobblestone"; public static final String FERTILIZER = "fertilizer"; public static final String BLOCK_GYPSUM = "blockGypsum"; public static final String BLOCK_CHALK = "blockChalk"; public static final String BLOCK_ROCKSALT = "blockRocksalt"; public static final String DUST_SULFUR = "dustSulfur"; public static final String DUST_NITRATE = "dustNitrate"; - public static final String DUST_CARBON = "dustCarbon"; - public static final String DRYWALL_WHITE = "drywallWhite"; - public static final String BLOCK_PUMICE = "blockPumice"; + public static final String DUST_CARBON = "dustCarbon"; + public static final String DRYWALL_WHITE = "drywallWhite"; + public static final String BLOCK_PUMICE = "blockPumice"; public static final String BLOCK_CHERT = "blockChert"; public static final String DUST_GYPSUM = "dustGypsum"; public static final String DUST_CHALK = "dustChalk"; public static final String DUST_ROCKSALT = "dustRock_salt"; public static final String PAPER = "paper"; - public static final String WALL = "wall"; -} + public static final String WALL = "wall"; +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/ContentPolicy.java b/src/main/java/zone/moddev/mc/mineralogy/ContentPolicy.java new file mode 100644 index 000000000..1a59e49aa --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/ContentPolicy.java @@ -0,0 +1,27 @@ +package zone.moddev.mc.mineralogy; + +/** Visibility and recipe policy for compatibility-safe optional content. */ +public final class ContentPolicy { + public static final String ENABLE_DRYWALLS = "ENABLE_DRYWALLS"; + public static final String ENABLE_ROCK_SALT_LAMPS = "ENABLE_ROCK_SALT_LAMPS"; + public static final String ENABLE_MINERAL_DUSTS = "ENABLE_MINERAL_DUSTS"; + public static final String ENABLE_MINERAL_FERTILIZER = "ENABLE_MINERAL_FERTILIZER"; + + private final boolean drywalls; + private final boolean lamps; + private final boolean dusts; + private final boolean fertilizer; + + public ContentPolicy(boolean drywalls, boolean lamps, boolean dusts, boolean fertilizer) { + this.drywalls = drywalls; + this.lamps = lamps; + this.dusts = dusts; + this.fertilizer = fertilizer; + } + + public static ContentPolicy defaults() { return new ContentPolicy(true, true, true, true); } + public boolean drywallsEnabled() { return drywalls; } + public boolean rockSaltLampsEnabled() { return lamps; } + public boolean mineralDustsEnabled() { return dusts; } + public boolean mineralFertilizerEnabled() { return fertilizer; } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/CreativeTabPolicy.java b/src/main/java/zone/moddev/mc/mineralogy/CreativeTabPolicy.java new file mode 100644 index 000000000..adb736464 --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/CreativeTabPolicy.java @@ -0,0 +1,24 @@ +package zone.moddev.mc.mineralogy; + +import zone.moddev.mc.mineralogy.blocks.Ore; +import zone.moddev.mc.mineralogy.blocks.Rock; +import zone.moddev.mc.mineralogy.blocks.RockRelief; +import zone.moddev.mc.mineralogy.blocks.RockSlab; +import zone.moddev.mc.mineralogy.blocks.RockStairs; +import zone.moddev.mc.mineralogy.blocks.RockWall; + +/** Target-native five-way creative classification. */ +public final class CreativeTabPolicy { + public enum ContentGroup { ROCK, STAIR, SLAB, WALL, ITEM } + private final boolean grouped; + public CreativeTabPolicy(boolean grouped) { this.grouped = grouped; } + public boolean groupTabsByType() { return grouped; } + public ContentGroup groupFor(Class type) { + if (RockRelief.class.isAssignableFrom(type)) return ContentGroup.ITEM; + if (RockStairs.class.isAssignableFrom(type)) return ContentGroup.STAIR; + if (RockSlab.class.isAssignableFrom(type)) return ContentGroup.SLAB; + if (RockWall.class.isAssignableFrom(type)) return ContentGroup.WALL; + if (Rock.class.isAssignableFrom(type) || Ore.class.isAssignableFrom(type)) return ContentGroup.ROCK; + return ContentGroup.ITEM; + } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/Mineralogy.java b/src/main/java/zone/moddev/mc/mineralogy/Mineralogy.java new file mode 100644 index 000000000..5575a3a31 --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/Mineralogy.java @@ -0,0 +1,47 @@ +package zone.moddev.mc.mineralogy; + +import zone.moddev.mc.mineralogy.compat.CobblestoneTagPolicy; +import zone.moddev.mc.mineralogy.documentation.DocumentationExporter; +import zone.moddev.mc.mineralogy.migration.LegacyOreConfigMigrator; +import zone.moddev.mc.mineralogy.patching.LegacyWorldDataHook; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +@Mod(Mineralogy.MODID) +public class Mineralogy { + public static Mineralogy instance; + + public static final String MODID = "mineralogy"; + public static final String NAME = "Mineralogy"; + public static final String VERSION = getVersion(); + + public static final Logger LOGGER = LogManager.getLogger(); + + private static String getVersion() { + Package metadata = Mineralogy.class.getPackage(); + String version = metadata == null ? null : metadata.getImplementationVersion(); + return version == null ? "DEV" : version; + } + + public Mineralogy() { + instance = this; + LegacyWorldDataHook.registerWorldPersistenceHook(); + MineralogyConfig.load(); + LegacyOreConfigMigrator.migrate(MineralogyConfig.configFile(), LOGGER); + MineralogyConfig.registerRecipeConditions(); + MineralogyConfig.registerAdvancementPredicates(); + + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); + MinecraftForge.EVENT_BUS.addListener(LegacyWorldDataHook::onServerAboutToStart); + MinecraftForge.EVENT_BUS.addListener(CobblestoneTagPolicy::onTagsUpdated); + } + + private void setup(final FMLCommonSetupEvent event) { + DocumentationExporter.exportBundledGuide(); + } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java b/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java new file mode 100644 index 000000000..dbd34b66f --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java @@ -0,0 +1,373 @@ +package zone.moddev.mc.mineralogy; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.AtomicMoveNotSupportedException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.function.BooleanSupplier; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonSyntaxException; + +import net.minecraft.advancements.criterion.ItemPredicate; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.JSONUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.crafting.CraftingHelper; +import net.minecraftforge.common.crafting.conditions.ICondition; +import net.minecraftforge.common.crafting.conditions.IConditionSerializer; +import net.minecraftforge.fml.loading.FMLPaths; +import net.minecraftforge.registries.ForgeRegistries; + +/** + * Content-only Mineralogy configuration. + * + *

Existing Mineralogy 5 TOML files are read without being rewritten because + * OreSpawn uses their retired geology and ore values during world migration.

+ */ +public final class MineralogyConfig { + public static final String FILE_NAME = "mineralogy-common.toml"; + private static final ResourceLocation CONFIG_CONDITION_ID = + new ResourceLocation(Mineralogy.MODID, "config"); + + private static boolean smeltableGravel = true; + private static boolean dropCobblestone; + private static boolean patchUpdate = true; + private static boolean cobblestoneEquivalent = true; + private static boolean generateReliefs = true; + private static boolean generateRockStairs = true; + private static boolean generateRockFurnace = true; + private static boolean generateRockSlab = true; + private static boolean generateRockWall = true; + private static boolean generateBrick = true; + private static boolean generateBrickFurnace = true; + private static boolean generateBrickStairs = true; + private static boolean generateBrickSlab = true; + private static boolean generateBrickWall = true; + private static boolean generateSmooth = true; + private static boolean generateSmoothFurnace = true; + private static boolean generateSmoothStairs = true; + private static boolean generateSmoothSlab = true; + private static boolean generateSmoothWall = true; + private static boolean generateSmoothBrick = true; + private static boolean generateSmoothBrickFurnace = true; + private static boolean generateSmoothBrickStairs = true; + private static boolean generateSmoothBrickSlab = true; + private static boolean generateSmoothBrickWall = true; + private static ContentPolicy contentPolicy = ContentPolicy.defaults(); + private static CreativeTabPolicy creativeTabPolicy = new CreativeTabPolicy(false); + private static Path configFile; + private static boolean recipeConditionsRegistered; + private static boolean advancementPredicatesRegistered; + + private MineralogyConfig() { + } + + public static void load() { + load(FMLPaths.CONFIGDIR.get()); + } + + static void load(Path configDirectory) { + resetDefaults(); + configFile = configDirectory.resolve(FILE_NAME); + boolean existing = Files.isRegularFile(configFile); + Map values = existing ? readToml(configFile) : Collections.emptyMap(); + + patchUpdate = option(values, "patch_world", patchUpdate); + smeltableGravel = option(values, "SMELTABLE_GRAVEL", smeltableGravel); + dropCobblestone = option(values, "DROP_COBBLESTONE", dropCobblestone); + cobblestoneEquivalent = option(values, "COBBLESTONE_EQUIVILENT", cobblestoneEquivalent); + generateReliefs = option(values, "GENERATE_RELIEFS", generateReliefs); + generateRockStairs = option(values, "GENERATE_ROCKSTAIRS", generateRockStairs); + generateRockFurnace = option(values, "GENERATE_ROCKFURNACE", generateRockFurnace); + generateRockSlab = option(values, "GENERATE_ROCKSLAB", generateRockSlab); + generateRockWall = option(values, "GENERATE_ROCKWALL", generateRockWall); + generateBrick = option(values, "GENERATE_BRICK", generateBrick); + generateBrickFurnace = option(values, "GENERATE_BRICKFURNACE", generateBrickFurnace); + generateBrickStairs = option(values, "GENERATE_BRICKSTAIRS", generateBrickStairs); + generateBrickSlab = option(values, "GENERATE_BRICKSLAB", generateBrickSlab); + generateBrickWall = option(values, "GENERATE_BRICKWALL", generateBrickWall); + generateSmooth = option(values, "GENERATE_SMOOTH", generateSmooth); + generateSmoothFurnace = option(values, "GENERATE_SMOOTHFURNACE", generateSmoothFurnace); + generateSmoothStairs = option(values, "GENERATE_SMOOTHSTAIRS", generateSmoothStairs); + generateSmoothSlab = option(values, "GENERATE_SMOOTHSLAB", generateSmoothSlab); + generateSmoothWall = option(values, "GENERATE_SMOOTHWALL", generateSmoothWall); + generateSmoothBrick = option(values, "GENERATE_SMOOTHBRICK", generateSmoothBrick); + generateSmoothBrickFurnace = option(values, "GENERATE_SMOOTHBRICKFURNACE", generateSmoothBrickFurnace); + generateSmoothBrickStairs = option(values, "GENERATE_SMOOTHBRICKSTAIRS", generateSmoothBrickStairs); + generateSmoothBrickSlab = option(values, "GENERATE_SMOOTHBRICKSLAB", generateSmoothBrickSlab); + generateSmoothBrickWall = option(values, "GENERATE_SMOOTHBRICKWALL", generateSmoothBrickWall); + + contentPolicy = new ContentPolicy( + option(values, ContentPolicy.ENABLE_DRYWALLS, true), + option(values, ContentPolicy.ENABLE_ROCK_SALT_LAMPS, true), + option(values, ContentPolicy.ENABLE_MINERAL_DUSTS, true), + option(values, ContentPolicy.ENABLE_MINERAL_FERTILIZER, true)); + creativeTabPolicy = new CreativeTabPolicy(option(values, "GROUP_TABS_BY_TYPE", false)); + + if (!existing) writeCleanConfig(configFile); + } + + private static void resetDefaults() { + smeltableGravel = true; + dropCobblestone = false; + patchUpdate = true; + cobblestoneEquivalent = true; + generateReliefs = true; + generateRockStairs = true; + generateRockFurnace = true; + generateRockSlab = true; + generateRockWall = true; + generateBrick = true; + generateBrickFurnace = true; + generateBrickStairs = true; + generateBrickSlab = true; + generateBrickWall = true; + generateSmooth = true; + generateSmoothFurnace = true; + generateSmoothStairs = true; + generateSmoothSlab = true; + generateSmoothWall = true; + generateSmoothBrick = true; + generateSmoothBrickFurnace = true; + generateSmoothBrickStairs = true; + generateSmoothBrickSlab = true; + generateSmoothBrickWall = true; + contentPolicy = ContentPolicy.defaults(); + creativeTabPolicy = new CreativeTabPolicy(false); + } + + private static Map readToml(Path file) { + Map values = new LinkedHashMap<>(); + String section = ""; + try { + for (String raw : Files.readAllLines(file, StandardCharsets.UTF_8)) { + String line = raw.trim(); + if (line.startsWith("[") && line.endsWith("]")) { + section = line.substring(1, line.length() - 1).trim().toLowerCase(Locale.ROOT); + continue; + } + int equals = line.indexOf('='); + if (equals <= 0 || line.startsWith("#")) continue; + String key = line.substring(0, equals).trim().toLowerCase(Locale.ROOT); + values.put(section + "." + key, stripInlineComment(line.substring(equals + 1)).trim()); + } + } catch (IOException e) { + Mineralogy.LOGGER.warn("Could not read {}; using compatibility-safe defaults", file, e); + } + return values; + } + + private static String stripInlineComment(String value) { + boolean quoted = false; + boolean escaped = false; + for (int i = 0; i < value.length(); i++) { + char current = value.charAt(i); + if (current == '"' && !escaped) quoted = !quoted; + if (current == '#' && !quoted) return value.substring(0, i); + escaped = current == '\\' && !escaped; + if (current != '\\') escaped = false; + } + return value; + } + + public static Map readLegacyValues(Path file) { + return Collections.unmodifiableMap(readToml(file)); + } + + private static boolean option(Map values, String name, boolean fallback) { + String text = values.get("options." + name.toLowerCase(Locale.ROOT)); + return text == null ? fallback : Boolean.parseBoolean(text); + } + + private static void writeCleanConfig(Path destination) { + String content = "# Mineralogy 6 content configuration. OreSpawn owns all terrain and ore generation.\n" + + "# Changes require a restart.\n\n[options]\n" + optionLines(); + Path temporary = destination.resolveSibling(destination.getFileName().toString() + ".tmp"); + try { + Files.createDirectories(destination.getParent()); + Files.write(temporary, content.getBytes(StandardCharsets.UTF_8)); + try { + Files.move(temporary, destination, StandardCopyOption.ATOMIC_MOVE); + } catch (AtomicMoveNotSupportedException e) { + Files.move(temporary, destination); + } + } catch (IOException e) { + Mineralogy.LOGGER.warn("Could not create clean Mineralogy configuration {}", destination, e); + try { Files.deleteIfExists(temporary); } catch (IOException ignored) { } + } + } + + private static String optionLines() { + StringBuilder out = new StringBuilder(); + append(out, "patch_world", true); + append(out, "SMELTABLE_GRAVEL", true); + append(out, "DROP_COBBLESTONE", false); + append(out, "COBBLESTONE_EQUIVILENT", true); + append(out, "GROUP_TABS_BY_TYPE", false); + append(out, ContentPolicy.ENABLE_DRYWALLS, true); + append(out, ContentPolicy.ENABLE_ROCK_SALT_LAMPS, true); + append(out, ContentPolicy.ENABLE_MINERAL_DUSTS, true); + append(out, ContentPolicy.ENABLE_MINERAL_FERTILIZER, true); + for (String key : new String[] { "GENERATE_RELIEFS", "GENERATE_ROCKSTAIRS", + "GENERATE_ROCKFURNACE", "GENERATE_ROCKSLAB", "GENERATE_ROCKWALL", + "GENERATE_BRICK", "GENERATE_BRICKFURNACE", "GENERATE_BRICKSTAIRS", + "GENERATE_BRICKSLAB", "GENERATE_BRICKWALL", "GENERATE_SMOOTH", + "GENERATE_SMOOTHFURNACE", "GENERATE_SMOOTHSTAIRS", "GENERATE_SMOOTHSLAB", + "GENERATE_SMOOTHWALL", "GENERATE_SMOOTHBRICK", "GENERATE_SMOOTHBRICKFURNACE", + "GENERATE_SMOOTHBRICKSTAIRS", "GENERATE_SMOOTHBRICKSLAB", + "GENERATE_SMOOTHBRICKWALL" }) append(out, key, true); + return out.toString(); + } + + private static void append(StringBuilder out, String key, boolean value) { + out.append('\t').append(key).append(" = ").append(value).append('\n'); + } + + public static void registerRecipeConditions() { + if (!recipeConditionsRegistered) { + CraftingHelper.register(new ConfigConditionSerializer()); + recipeConditionsRegistered = true; + } + } + + public static void registerAdvancementPredicates() { + if (!advancementPredicatesRegistered) { + ItemPredicate.register(new ResourceLocation(Mineralogy.MODID, "config_item"), + MineralogyConfig::configItemPredicate); + advancementPredicatesRegistered = true; + } + } + + private static ItemPredicate configItemPredicate(JsonObject json) { + List flags = new ArrayList<>(); + if (json.has("flags")) { + JsonArray array = JSONUtils.getJsonArray(json, "flags"); + for (JsonElement flag : array) flags.add(configFlagCondition(JSONUtils.getString(flag, "flag"))); + } else { + flags.add(configFlagCondition(JSONUtils.getString(json, "flag"))); + } + return new ConfigItemPredicate(flags, new ResourceLocation(JSONUtils.getString(json, "item"))); + } + + private static BooleanSupplier configFlagCondition(String flag) { + switch (flag) { + case "SMELTABLE_GRAVEL": return () -> smeltableGravel; + case "GENERATE_RELIEFS": return () -> generateReliefs; + case "GENERATE_ROCKSTAIRS": return () -> generateRockStairs; + case "GENERATE_ROCKFURNACE": return () -> generateRockFurnace; + case "GENERATE_ROCKSLAB": return () -> generateRockSlab; + case "GENERATE_ROCKWALL": return () -> generateRockWall; + case "GENERATE_BRICK": return () -> generateBrick; + case "GENERATE_BRICKFURNACE": return () -> generateBrickFurnace; + case "GENERATE_BRICKSTAIRS": return () -> generateBrickStairs; + case "GENERATE_BRICKSLAB": return () -> generateBrickSlab; + case "GENERATE_BRICKWALL": return () -> generateBrickWall; + case "GENERATE_SMOOTH": return () -> generateSmooth; + case "GENERATE_SMOOTHFURNACE": return () -> generateSmoothFurnace; + case "GENERATE_SMOOTHSTAIRS": return () -> generateSmoothStairs; + case "GENERATE_SMOOTHSLAB": return () -> generateSmoothSlab; + case "GENERATE_SMOOTHWALL": return () -> generateSmoothWall; + case "GENERATE_SMOOTHBRICK": return () -> generateSmoothBrick; + case "GENERATE_SMOOTHBRICKFURNACE": return () -> generateSmoothBrickFurnace; + case "GENERATE_SMOOTHBRICKSTAIRS": return () -> generateSmoothBrickStairs; + case "GENERATE_SMOOTHBRICKSLAB": return () -> generateSmoothBrickSlab; + case "GENERATE_SMOOTHBRICKWALL": return () -> generateSmoothBrickWall; + case ContentPolicy.ENABLE_DRYWALLS: return () -> contentPolicy.drywallsEnabled(); + case ContentPolicy.ENABLE_ROCK_SALT_LAMPS: return () -> contentPolicy.rockSaltLampsEnabled(); + case ContentPolicy.ENABLE_MINERAL_DUSTS: return () -> contentPolicy.mineralDustsEnabled(); + case ContentPolicy.ENABLE_MINERAL_FERTILIZER: return () -> contentPolicy.mineralFertilizerEnabled(); + default: throw new JsonSyntaxException("Unknown Mineralogy recipe config flag: " + flag); + } + } + + public static Path configFile() { return configFile; } + public static boolean smeltableGravel() { return smeltableGravel; } + public static boolean dropCobblestone() { return dropCobblestone; } + public static boolean patchUpdate() { return patchUpdate; } + public static boolean makeRockCobblestoneEquivilent() { return cobblestoneEquivalent; } + public static boolean groupCreativeTabItemsByType() { return creativeTabPolicy.groupTabsByType(); } + public static ContentPolicy contentPolicy() { return contentPolicy; } + public static CreativeTabPolicy creativeTabPolicy() { return creativeTabPolicy; } + public static boolean generateReliefs() { return generateReliefs; } + public static boolean generateRockStairs() { return generateRockStairs; } + public static boolean generateRockFurnace() { return generateRockFurnace; } + public static boolean generateRockSlab() { return generateRockSlab; } + public static boolean generateRockWall() { return generateRockWall; } + public static boolean generateBrick() { return generateBrick; } + public static boolean generateBrickFurnace() { return generateBrickFurnace; } + public static boolean generateBrickStairs() { return generateBrickStairs; } + public static boolean generateBrickSlab() { return generateBrickSlab; } + public static boolean generateBrickWall() { return generateBrickWall; } + public static boolean generateSmooth() { return generateSmooth; } + public static boolean generateSmoothFurnace() { return generateSmoothFurnace; } + public static boolean generateSmoothStairs() { return generateSmoothStairs; } + public static boolean generateSmoothSlab() { return generateSmoothSlab; } + public static boolean generateSmoothWall() { return generateSmoothWall; } + public static boolean generateSmoothBrick() { return generateSmoothBrick; } + public static boolean generateSmoothBrickFurnace() { return generateSmoothBrickFurnace; } + public static boolean generateSmoothBrickStairs() { return generateSmoothBrickStairs; } + public static boolean generateSmoothBrickSlab() { return generateSmoothBrickSlab; } + public static boolean generateSmoothBrickWall() { return generateSmoothBrickWall; } + + public static boolean isCreativeVisible(String name) { + if (name.startsWith("drywall_")) return contentPolicy.drywallsEnabled(); + if ("rocksaltlamp".equals(name) || "rocksaltstreetlamp".equals(name)) return contentPolicy.rockSaltLampsEnabled(); + if ("sulfur_dust".equals(name) || "phosphorous_dust".equals(name) + || "nitrate_dust".equals(name) || "sulfur_block".equals(name) + || "phosphorous_block".equals(name) || "nitrate_block".equals(name)) { + return contentPolicy.mineralDustsEnabled(); + } + return !"mineral_fertilizer".equals(name) || contentPolicy.mineralFertilizerEnabled(); + } + + private static final class ConfigCondition implements ICondition { + private final String flagName; + private final BooleanSupplier flag; + + private ConfigCondition(String flagName) { + this.flagName = flagName; + this.flag = configFlagCondition(flagName); + } + + @Override public ResourceLocation getID() { return CONFIG_CONDITION_ID; } + @Override public boolean test() { return flag.getAsBoolean(); } + } + + private static final class ConfigConditionSerializer implements IConditionSerializer { + @Override public void write(JsonObject json, ConfigCondition value) { + json.addProperty("flag", value.flagName); + } + + @Override public ConfigCondition read(JsonObject json) { + return new ConfigCondition(JSONUtils.getString(json, "flag")); + } + + @Override public ResourceLocation getID() { return CONFIG_CONDITION_ID; } + } + + private static final class ConfigItemPredicate extends ItemPredicate { + private final List flags; + private final ResourceLocation itemName; + private ConfigItemPredicate(List flags, ResourceLocation itemName) { + this.flags = flags; + this.itemName = itemName; + } + @Override public boolean test(ItemStack stack) { + for (BooleanSupplier flag : flags) if (!flag.getAsBoolean()) return false; + Item item = ForgeRegistries.ITEMS.getValue(itemName); + return item != null && stack.getItem() == item; + } + } +} diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/Chalk.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/Chalk.java similarity index 91% rename from src/main/java/com/mcmoddev/mineralogy/blocks/Chalk.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/Chalk.java index b89c0b5a5..227125956 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/Chalk.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/Chalk.java @@ -1,9 +1,9 @@ -package com.mcmoddev.mineralogy.blocks; +package zone.moddev.mc.mineralogy.blocks; import java.util.Collections; import java.util.List; -import com.mcmoddev.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.Mineralogy; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/Chert.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/Chert.java similarity index 69% rename from src/main/java/com/mcmoddev/mineralogy/blocks/Chert.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/Chert.java index 42f1da53d..4975a9245 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/Chert.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/Chert.java @@ -1,6 +1,6 @@ -package com.mcmoddev.mineralogy.blocks; +package zone.moddev.mc.mineralogy.blocks; -import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Random; @@ -19,12 +19,10 @@ public Chert() { @Override public List getDrops(BlockState state, Builder builder) { - List drops = new ArrayList(super.getDrops(state, builder)); - if (prng.nextInt(10) == 0) { - drops.add(new ItemStack(Items.FLINT, 1 + Math.max(0, getFortuneLevel(builder)))); + return Collections.singletonList( + new ItemStack(Items.FLINT, 1 + Math.max(0, getFortuneLevel(builder)))); } - - return drops; + return super.getDrops(state, builder); } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java new file mode 100644 index 000000000..626c64edf --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java @@ -0,0 +1,60 @@ +package zone.moddev.mc.mineralogy.blocks; + +import java.util.Collections; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.BlockState; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockReader; +import net.minecraft.loot.LootContext.Builder; +import net.minecraft.loot.LootParameters; +import net.minecraftforge.common.ToolType; + +public class DoubleSlab extends Block { + private final Block drops; + private final Block fullBlock; + private final int toolHardnessLevel; + + public DoubleSlab(float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, Block drops, + String name) { + this(hardness, blastResistance, toolHardnessLevel, sound, drops, drops, name); + } + + public DoubleSlab(float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, Block drops, + Block fullBlock, String name) { + super(Block.Properties.create(Material.ROCK).hardnessAndResistance(hardness, blastResistance).sound(sound)); + this.drops = drops; + this.fullBlock = fullBlock; + this.toolHardnessLevel = toolHardnessLevel; + this.setRegistryName(name); + } + + @Override + public ItemStack getItem(IBlockReader world, BlockPos pos, BlockState state) { + return new ItemStack(drops); + } + + public List getDrops(BlockState state, Builder builder) { + ItemStack tool = builder.get(LootParameters.TOOL); + if (!tool.isEmpty() && EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) { + return Collections.singletonList(new ItemStack(fullBlock)); + } + return Collections.singletonList(new ItemStack(drops, 2)); + } + + @Override + public ToolType getHarvestTool(BlockState state) { + return ToolType.PICKAXE; + } + + @Override + public int getHarvestLevel(BlockState state) { + return toolHardnessLevel; + } +} diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/DryWall.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/DryWall.java similarity index 93% rename from src/main/java/com/mcmoddev/mineralogy/blocks/DryWall.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/DryWall.java index 1cf7c4c72..af54aaa91 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/DryWall.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/DryWall.java @@ -1,4 +1,4 @@ -package com.mcmoddev.mineralogy.blocks; +package zone.moddev.mc.mineralogy.blocks; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockBehaviour; diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/Gypsum.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/Gypsum.java similarity index 92% rename from src/main/java/com/mcmoddev/mineralogy/blocks/Gypsum.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/Gypsum.java index 88ffc60fa..0916d321d 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/Gypsum.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/Gypsum.java @@ -1,10 +1,10 @@ -package com.mcmoddev.mineralogy.blocks; +package zone.moddev.mc.mineralogy.blocks; import java.util.Collections; import java.util.List; import java.util.Random; -import com.mcmoddev.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.Mineralogy; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/Ore.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/Ore.java similarity index 95% rename from src/main/java/com/mcmoddev/mineralogy/blocks/Ore.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/Ore.java index 7bec4fa48..1c7d1595f 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/Ore.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/Ore.java @@ -1,9 +1,9 @@ -package com.mcmoddev.mineralogy.blocks; +package zone.moddev.mc.mineralogy.blocks; import java.util.Collections; import java.util.List; -import com.mcmoddev.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.Mineralogy; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockBehaviour; diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/Rock.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/Rock.java similarity index 86% rename from src/main/java/com/mcmoddev/mineralogy/blocks/Rock.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/Rock.java index 5492ebd4c..5d9fd690e 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/Rock.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/Rock.java @@ -1,10 +1,10 @@ -package com.mcmoddev.mineralogy.blocks; +package zone.moddev.mc.mineralogy.blocks; -import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.function.Predicate; -import com.mcmoddev.mineralogy.MineralogyConfig; +import zone.moddev.mc.mineralogy.MineralogyConfig; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockBehaviour; @@ -41,13 +41,10 @@ public boolean isReplaceableOreGen(BlockState state, LevelReader world, BlockPos } @Override public List getDrops(BlockState state, Builder builder) { - List drops = new ArrayList(super.getDrops(state, builder)); - - if (MineralogyConfig.dropCobblestone()) { - drops.add(new ItemStack(Blocks.COBBLESTONE)); + if (isStoneEquivalent && MineralogyConfig.dropCobblestone()) { + return Collections.singletonList(new ItemStack(Blocks.COBBLESTONE)); } - - return drops; + return super.getDrops(state, builder); } protected static boolean hasSilkTouch(Builder builder) { diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java new file mode 100644 index 000000000..a7ccfc3d8 --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java @@ -0,0 +1,244 @@ +package zone.moddev.mc.mineralogy.blocks; + +import java.util.Collections; +import java.util.List; +import java.util.Random; + +import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.tileentity.TileEntityRockFurnace; + +import net.minecraft.block.Block; +import net.minecraft.block.ContainerBlock; +import net.minecraft.block.HorizontalBlock; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.particles.ParticleTypes; +import net.minecraft.stats.Stats; +import net.minecraft.util.SoundEvents; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.InventoryHelper; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.item.ItemStack; +import net.minecraft.state.StateContainer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.BlockRenderType; +import net.minecraft.util.Direction; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; +import net.minecraft.util.Mirror; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Rotation; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.World; +import net.minecraft.loot.LootContext.Builder; +import net.minecraftforge.common.ToolType; +import net.minecraftforge.registries.ForgeRegistries; + +public class RockFurnace extends ContainerBlock { + public static final net.minecraft.state.DirectionProperty FACING = HorizontalBlock.HORIZONTAL_FACING; + private static boolean keepInventory; + + private final boolean burning; + private final float burnModifier; + private final int toolHardnessLevel; + + public RockFurnace(float hardness, float blastResistance, int toolHardnessLevel, boolean burning, + float burnModifier, String name) { + super(Block.Properties.create(Material.ROCK).hardnessAndResistance(hardness, blastResistance) + .sound(SoundType.STONE).setLightLevel(state -> burning ? 14 : 0)); + this.burning = burning; + this.burnModifier = burnModifier; + this.toolHardnessLevel = toolHardnessLevel; + this.setRegistryName(name); + this.setDefaultState(this.getStateContainer().getBaseState().with(FACING, Direction.NORTH)); + } + + protected boolean canSilkHarvest() { + return false; + } + + @Override + public BlockState getStateForPlacement(BlockItemUseContext context) { + return getDefaultState().with(FACING, context.getPlacementHorizontalFacing().getOpposite()); + } + + @Override + public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity placer, + ItemStack stack) { + if (stack.hasDisplayName()) { + TileEntity tileEntity = world.getTileEntity(pos); + if (tileEntity instanceof TileEntityRockFurnace) { + ((TileEntityRockFurnace) tileEntity).setCustomInventoryName(stack.getDisplayName()); + } + } + } + + @Override + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, + Hand hand, BlockRayTraceResult hit) { + if (world.isRemote) { + return ActionResultType.SUCCESS; + } + + TileEntity tileEntity = world.getTileEntity(pos); + if (tileEntity instanceof TileEntityRockFurnace) { + player.openContainer((TileEntityRockFurnace) tileEntity); + player.addStat(Stats.INTERACT_WITH_FURNACE); + } + + return ActionResultType.SUCCESS; + } + + public static void setState(boolean active, World world, BlockPos pos) { + BlockState oldState = world.getBlockState(pos); + Block oldBlock = oldState.getBlock(); + Block newBlock = getStateBlock(oldBlock, active); + + if (!(newBlock instanceof RockFurnace) || newBlock == oldBlock) { + return; + } + + TileEntity tileEntity = world.getTileEntity(pos); + keepInventory = true; + world.setBlockState(pos, newBlock.getDefaultState().with(FACING, oldState.get(FACING)), 3); + keepInventory = false; + + if (tileEntity != null) { + tileEntity.validate(); + world.setTileEntity(pos, tileEntity); + } + } + + @Override + public TileEntity createNewTileEntity(IBlockReader world) { + return new TileEntityRockFurnace(burnModifier); + } + + @Override + public List getDrops(BlockState state, Builder builder) { + return Collections.singletonList(new ItemStack(getUnlitBlock(state.getBlock()))); + } + + @Override + public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) { + if (state.getBlock() != newState.getBlock()) { + if (!keepInventory) { + TileEntity tileEntity = world.getTileEntity(pos); + if (tileEntity instanceof TileEntityRockFurnace) { + InventoryHelper.dropInventoryItems(world, pos, (TileEntityRockFurnace) tileEntity); + world.updateComparatorOutputLevel(pos, this); + } + } + + super.onReplaced(state, world, pos, newState, isMoving); + } + } + + @Override + public boolean hasComparatorInputOverride(BlockState state) { + return true; + } + + @Override + public int getComparatorInputOverride(BlockState blockState, World world, BlockPos pos) { + return Container.calcRedstone(world.getTileEntity(pos)); + } + + @Override + public ItemStack getItem(IBlockReader world, BlockPos pos, BlockState state) { + return new ItemStack(getUnlitBlock(state.getBlock())); + } + + @Override + public void animateTick(BlockState state, World world, BlockPos pos, Random random) { + if (!burning) { + return; + } + + Direction facing = state.get(FACING); + double x = (double) pos.getX() + 0.5D; + double y = (double) pos.getY(); + double z = (double) pos.getZ() + 0.5D; + + if (random.nextDouble() < 0.1D) { + world.playSound(x, y, z, SoundEvents.BLOCK_FURNACE_FIRE_CRACKLE, SoundCategory.BLOCKS, 1.0F, 1.0F, + false); + } + + double offset = 0.52D; + double randomOffset = random.nextDouble() * 0.6D - 0.3D; + Direction.Axis axis = facing.getAxis(); + double xOffset = axis == Direction.Axis.X ? (double) facing.getXOffset() * offset : randomOffset; + double zOffset = axis == Direction.Axis.Z ? (double) facing.getZOffset() * offset : randomOffset; + + world.addParticle(ParticleTypes.SMOKE, x + xOffset, y + random.nextDouble() * 6.0D / 16.0D, z + zOffset, + 0.0D, 0.0D, 0.0D); + world.addParticle(ParticleTypes.FLAME, x + xOffset, y + random.nextDouble() * 6.0D / 16.0D, z + zOffset, + 0.0D, 0.0D, 0.0D); + } + + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; + } + + @Override + public BlockState rotate(BlockState state, Rotation rotation) { + return state.with(FACING, rotation.rotate(state.get(FACING))); + } + + @Override + public BlockState mirror(BlockState state, Mirror mirror) { + return state.rotate(mirror.toRotation(state.get(FACING))); + } + + @Override + public ToolType getHarvestTool(BlockState state) { + return ToolType.PICKAXE; + } + + @Override + public int getHarvestLevel(BlockState state) { + return toolHardnessLevel; + } + + @Override + protected void fillStateContainer(StateContainer.Builder builder) { + builder.add(FACING); + } + + public float getBurnModifier() { + return burnModifier; + } + + public boolean isBurningVariant() { + return burning; + } + + private static Block getStateBlock(Block block, boolean active) { + ResourceLocation name = block.getRegistryName(); + if (name == null) { + return block; + } + + String path = name.getPath(); + if (active && !path.startsWith("lit_")) { + path = "lit_" + path; + } else if (!active && path.startsWith("lit_")) { + path = path.substring(4); + } + + Block stateBlock = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Mineralogy.MODID, path)); + return stateBlock == null ? block : stateBlock; + } + + private static Block getUnlitBlock(Block block) { + return getStateBlock(block, false); + } +} diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/RockRelief.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockRelief.java similarity index 97% rename from src/main/java/com/mcmoddev/mineralogy/blocks/RockRelief.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/RockRelief.java index 0ab25b14a..946491e6d 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/RockRelief.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockRelief.java @@ -1,4 +1,4 @@ -package com.mcmoddev.mineralogy.blocks; +package zone.moddev.mc.mineralogy.blocks; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/RockSalt.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSalt.java similarity index 91% rename from src/main/java/com/mcmoddev/mineralogy/blocks/RockSalt.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/RockSalt.java index 03d13eeca..aa4dafcae 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/RockSalt.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSalt.java @@ -1,9 +1,9 @@ -package com.mcmoddev.mineralogy.blocks; +package zone.moddev.mc.mineralogy.blocks; import java.util.Collections; import java.util.List; -import com.mcmoddev.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.Mineralogy; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java new file mode 100644 index 000000000..4cb01f20c --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java @@ -0,0 +1,137 @@ +package zone.moddev.mc.mineralogy.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.particles.ParticleTypes; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.StateContainer; +import net.minecraft.util.Direction; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.IWorld; +import net.minecraft.world.IWorldReader; +import net.minecraft.world.World; + +import java.util.Random; + +public class RockSaltLamp extends Block { + public static final DirectionProperty FACING = DirectionProperty.create("facing", Direction.values()); + + private static final VoxelShape STANDING_SHAPE = Block.makeCuboidShape(6.4D, 0.0D, 6.4D, 9.6D, 9.6D, 9.6D); + private static final VoxelShape NORTH_SHAPE = Block.makeCuboidShape(5.6D, 3.2D, 11.2D, 10.4D, 12.8D, 16.0D); + private static final VoxelShape SOUTH_SHAPE = Block.makeCuboidShape(5.6D, 3.2D, 0.0D, 10.4D, 12.8D, 4.8D); + private static final VoxelShape WEST_SHAPE = Block.makeCuboidShape(11.2D, 3.2D, 5.6D, 16.0D, 12.8D, 10.4D); + private static final VoxelShape EAST_SHAPE = Block.makeCuboidShape(0.0D, 3.2D, 5.6D, 4.8D, 12.8D, 10.4D); + + public RockSaltLamp() { + super(Block.Properties.create(Material.ROCK).hardnessAndResistance(0.25F) + .setLightLevel(state -> 15).sound(SoundType.STONE)); + this.setRegistryName("rocksaltlamp"); + this.setDefaultState(this.getStateContainer().getBaseState().with(FACING, Direction.UP)); + } + + @Override + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext context) { + switch (state.get(FACING)) { + case EAST: + return EAST_SHAPE; + case WEST: + return WEST_SHAPE; + case SOUTH: + return SOUTH_SHAPE; + case NORTH: + return NORTH_SHAPE; + default: + return STANDING_SHAPE; + } + } + + @Override + public VoxelShape getCollisionShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext context) { + return net.minecraft.util.math.shapes.VoxelShapes.empty(); + } + + public boolean isNormalCube(BlockState state, IBlockReader world, BlockPos pos) { + return false; + } + + @Override + public BlockState getStateForPlacement(BlockItemUseContext context) { + World world = context.getWorld(); + BlockPos pos = context.getPos(); + + for (Direction facing : context.getNearestLookingDirections()) { + BlockState state = this.getDefaultState().with(FACING, facing); + if (state.isValidPosition(world, pos)) { + return state; + } + } + + return null; + } + + @Override + public BlockState updatePostPlacement(BlockState state, Direction facing, BlockState facingState, + IWorld world, BlockPos currentPos, BlockPos facingPos) { + return facing.getOpposite() == state.get(FACING) && !state.isValidPosition(world, currentPos) + ? Blocks.AIR.getDefaultState() + : state; + } + + @Override + public boolean isValidPosition(BlockState state, IWorldReader world, BlockPos pos) { + Direction facing = state.get(FACING); + BlockPos supportPos = pos.offset(facing.getOpposite()); + BlockState support = world.getBlockState(supportPos); + + if (facing.getAxis().isVertical()) { + // Match vanilla standing-torch support, including fences. The legacy + // lamp accepted canPlaceTorchOnTop blocks in both vertical orientations. + return Block.hasEnoughSolidSide(world, supportPos, facing); + } + + return support.isSolidSide(world, supportPos, facing); + } + + @Override + public void animateTick(BlockState state, World world, BlockPos pos, Random random) { + Direction facing = state.get(FACING); + double x = (double) pos.getX() + 0.5D; + double y = (double) pos.getY() + 0.7D; + double z = (double) pos.getZ() + 0.5D; + + if (facing.getAxis().isHorizontal()) { + Direction opposite = facing.getOpposite(); + world.addParticle(ParticleTypes.SMOKE, + x + 0.27D * (double) opposite.getXOffset(), + y + 0.22D, + z + 0.27D * (double) opposite.getZOffset(), + 0.0D, 0.0D, 0.0D); + } else { + world.addParticle(ParticleTypes.SMOKE, x, y, z, 0.0D, 0.0D, 0.0D); + } + } + + @Override + public BlockState rotate(BlockState state, Rotation rotation) { + return state.with(FACING, rotation.rotate(state.get(FACING))); + } + + @Override + public BlockState mirror(BlockState state, Mirror mirror) { + return state.rotate(mirror.toRotation(state.get(FACING))); + } + + @Override + protected void fillStateContainer(StateContainer.Builder builder) { + builder.add(FACING); + } +} diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/RockSaltStreetLamp.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltStreetLamp.java similarity index 98% rename from src/main/java/com/mcmoddev/mineralogy/blocks/RockSaltStreetLamp.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltStreetLamp.java index 368deff42..e7dab69da 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/RockSaltStreetLamp.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltStreetLamp.java @@ -1,4 +1,4 @@ -package com.mcmoddev.mineralogy.blocks; +package zone.moddev.mc.mineralogy.blocks; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockBehaviour; diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/RockSlab.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSlab.java similarity index 53% rename from src/main/java/com/mcmoddev/mineralogy/blocks/RockSlab.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/RockSlab.java index d849b24c1..99014afb8 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/RockSlab.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSlab.java @@ -1,28 +1,28 @@ -package com.mcmoddev.mineralogy.blocks; - -import com.mcmoddev.mineralogy.Mineralogy; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.state.properties.DirectionProperty; -import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.InteractionResult; -import net.minecraft.core.Direction; -import net.minecraft.world.InteractionHand; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.core.BlockPos; -import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraft.world.phys.Vec3; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.Level; +package zone.moddev.mc.mineralogy.blocks; + +import zone.moddev.mc.mineralogy.Mineralogy; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.StateContainer; +import net.minecraft.util.Direction; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.IWorldReader; +import net.minecraft.world.World; +import net.minecraftforge.common.ToolType; import net.minecraftforge.registries.ForgeRegistries; public class RockSlab extends Block { @@ -31,12 +31,12 @@ public class RockSlab extends Block { private static final VoxelShape[] SHAPES = new VoxelShape[Direction.values().length]; static { - SHAPES[Direction.DOWN.ordinal()] = Block.box(0.0D, THICKNESS, 0.0D, 16.0D, 16.0D, 16.0D); - SHAPES[Direction.UP.ordinal()] = Block.box(0.0D, 0.0D, 0.0D, 16.0D, THICKNESS, 16.0D); - SHAPES[Direction.NORTH.ordinal()] = Block.box(0.0D, 0.0D, THICKNESS, 16.0D, 16.0D, 16.0D); - SHAPES[Direction.SOUTH.ordinal()] = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 16.0D, THICKNESS); - SHAPES[Direction.WEST.ordinal()] = Block.box(THICKNESS, 0.0D, 0.0D, 16.0D, 16.0D, 16.0D); - SHAPES[Direction.EAST.ordinal()] = Block.box(0.0D, 0.0D, 0.0D, THICKNESS, 16.0D, 16.0D); + SHAPES[Direction.DOWN.ordinal()] = Block.makeCuboidShape(0.0D, THICKNESS, 0.0D, 16.0D, 16.0D, 16.0D); + SHAPES[Direction.UP.ordinal()] = Block.makeCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, THICKNESS, 16.0D); + SHAPES[Direction.NORTH.ordinal()] = Block.makeCuboidShape(0.0D, 0.0D, THICKNESS, 16.0D, 16.0D, 16.0D); + SHAPES[Direction.SOUTH.ordinal()] = Block.makeCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 16.0D, THICKNESS); + SHAPES[Direction.WEST.ordinal()] = Block.makeCuboidShape(THICKNESS, 0.0D, 0.0D, 16.0D, 16.0D, 16.0D); + SHAPES[Direction.EAST.ordinal()] = Block.makeCuboidShape(0.0D, 0.0D, 0.0D, THICKNESS, 16.0D, 16.0D); } private final String doubleSlabName; @@ -52,11 +52,10 @@ public RockSlab(float hardness, float blastResistance, int toolHardnessLevel, So public RockSlab(float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, String name, String doubleSlabName) { - super(BlockBehaviour.Properties.of(Material.STONE).strength(hardness, blastResistance).sound(sound) - .requiresCorrectToolForDrops()); + super(Block.Properties.create(Material.ROCK).hardnessAndResistance(hardness, blastResistance).sound(sound)); this.toolHardnessLevel = toolHardnessLevel; this.doubleSlabName = doubleSlabName; - this.registerDefaultState(this.getStateDefinition().any().setValue(FACING, Direction.UP)); + this.setDefaultState(this.getStateContainer().getBaseState().with(FACING, Direction.UP)); if (name != null) { this.setRegistryName(name); @@ -64,75 +63,86 @@ public RockSlab(float hardness, float blastResistance, int toolHardnessLevel, So } @Override - public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { - return SHAPES[state.getValue(FACING).ordinal()]; + public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext context) { + return SHAPES[state.get(FACING).ordinal()]; } @Override - public VoxelShape getCollisionShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { + public VoxelShape getCollisionShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext context) { return getShape(state, world, pos, context); } - public boolean isCollisionShapeFullBlock(BlockState state, BlockGetter world, BlockPos pos) { + public boolean isNormalCube(BlockState state, IBlockReader world, BlockPos pos) { return false; } @Override - public boolean propagatesSkylightDown(BlockState state, BlockGetter world, BlockPos pos) { + public boolean propagatesSkylightDown(BlockState state, IBlockReader world, BlockPos pos) { return false; } @Override - public BlockState getStateForPlacement(net.minecraft.world.item.context.BlockPlaceContext context) { - BlockState state = this.defaultBlockState().setValue(FACING, getPlacementFacing(context)); - return state.canSurvive(context.getLevel(), context.getClickedPos()) ? state : null; + public BlockState getStateForPlacement(net.minecraft.item.BlockItemUseContext context) { + BlockState state = this.getDefaultState().with(FACING, getPlacementFacing(context)); + return state.isValidPosition(context.getWorld(), context.getPos()) ? state : null; } @Override - public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) { + public boolean isValidPosition(BlockState state, IWorldReader world, BlockPos pos) { return canPlaceAtAnyFace(world, pos); } @Override - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, - InteractionHand hand, BlockHitResult hit) { - Direction facing = hit.getDirection(); - if (this.doubleSlabName == null || this.doubleSlabName.isEmpty() || facing != state.getValue(FACING)) { - return super.use(state, world, pos, player, hand, hit); + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, + Hand hand, BlockRayTraceResult hit) { + Direction facing = hit.getFace(); + if (this.doubleSlabName == null || this.doubleSlabName.isEmpty() || facing != state.get(FACING)) { + return super.onBlockActivated(state, world, pos, player, hand, hit); } - ItemStack held = player.getItemInHand(hand); + ItemStack held = player.getHeldItem(hand); ResourceLocation slabItemName = held.isEmpty() ? null : held.getItem().getRegistryName(); if (!this.getRegistryName().equals(slabItemName)) { - return super.use(state, world, pos, player, hand, hit); + return super.onBlockActivated(state, world, pos, player, hand, hit); } Block doubleSlab = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Mineralogy.MODID, this.doubleSlabName)); if (!(doubleSlab instanceof DoubleSlab)) { - return super.use(state, world, pos, player, hand, hit); + return super.onBlockActivated(state, world, pos, player, hand, hit); } - world.setBlock(pos, doubleSlab.defaultBlockState(), 3); + world.setBlockState(pos, doubleSlab.getDefaultState()); if (!player.isCreative()) { held.shrink(1); } - return InteractionResult.SUCCESS; + return ActionResultType.SUCCESS; } -@Override - protected void createBlockStateDefinition(StateDefinition.Builder builder) { + + @Override + public ToolType getHarvestTool(BlockState state) { + return ToolType.PICKAXE; + } + + @Override + public int getHarvestLevel(BlockState state) { + return toolHardnessLevel; + } + + @Override + protected void fillStateContainer(StateContainer.Builder builder) { builder.add(FACING); } - private static boolean canPlaceAt(BlockGetter world, BlockPos pos, Direction facing) { - BlockPos supportPos = pos.relative(facing.getOpposite()); + private static boolean canPlaceAt(IBlockReader world, BlockPos pos, Direction facing) { + BlockPos supportPos = pos.offset(facing.getOpposite()); BlockState support = world.getBlockState(supportPos); - return support.isFaceSturdy(world, supportPos, facing); + return support.isSolidSide(world, supportPos, facing); } - private static boolean canPlaceAtAnyFace(BlockGetter world, BlockPos pos) { - for (Direction facing : FACING.getPossibleValues()) { + private static boolean canPlaceAtAnyFace(IBlockReader world, BlockPos pos) { + for (Direction facing : FACING.getAllowedValues()) { if (canPlaceAt(world, pos, facing)) { return true; } @@ -141,10 +151,10 @@ private static boolean canPlaceAtAnyFace(BlockGetter world, BlockPos pos) { return false; } - private static Direction getPlacementFacing(net.minecraft.world.item.context.BlockPlaceContext context) { - Direction face = context.getClickedFace(); - Vec3 hitVec = context.getClickLocation(); - BlockPos pos = context.getClickedPos(); + private static Direction getPlacementFacing(net.minecraft.item.BlockItemUseContext context) { + Direction face = context.getFace(); + Vector3d hitVec = context.getHitVec(); + BlockPos pos = context.getPos(); float hitX = (float) (hitVec.x - (double) pos.getX()); float hitY = (float) (hitVec.y - (double) pos.getY()); float hitZ = (float) (hitVec.z - (double) pos.getZ()); @@ -221,7 +231,7 @@ private static Direction rotateAround(Direction face, Direction.Axis axis) { if (face == Direction.UP || face == Direction.DOWN) { return face; } - return face.getClockWise(); + return face.rotateY(); case Z: if (face == Direction.NORTH || face == Direction.SOUTH) { return face; diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java new file mode 100644 index 000000000..1345258ec --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java @@ -0,0 +1,32 @@ +package zone.moddev.mc.mineralogy.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.StairsBlock; +import net.minecraft.block.material.Material; +import net.minecraft.block.BlockState; +import net.minecraftforge.common.ToolType; + +public class RockStairs extends StairsBlock { + + public RockStairs(Block materialBlock, float hardness, float blastResistance, int toolHardnessLevel, + SoundType sound, String name) { + super(materialBlock.getDefaultState(), Block.Properties.create(Material.ROCK) + .hardnessAndResistance(hardness, blastResistance).sound(sound)); + + this.setRegistryName(name); + this.toolHardnessLevel = toolHardnessLevel; + } + + private final int toolHardnessLevel; + + @Override + public ToolType getHarvestTool(BlockState state) { + return ToolType.PICKAXE; + } + + @Override + public int getHarvestLevel(BlockState state) { + return toolHardnessLevel; + } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java new file mode 100644 index 000000000..352134202 --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java @@ -0,0 +1,35 @@ +package zone.moddev.mc.mineralogy.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.WallBlock; +import net.minecraft.block.material.Material; +import net.minecraft.block.BlockState; +import net.minecraftforge.common.ToolType; + +/** +* +* @author Jasmine Iwanek +* +*/ +public class RockWall extends WallBlock { + public RockWall(Block materialBlock, float hardness, float blastResistance, int toolHardnessLevel, + SoundType sound, String name) { + super(Block.Properties.create(Material.ROCK).hardnessAndResistance(hardness, blastResistance).sound(sound)); + + this.setRegistryName(name); + this.toolHardnessLevel = toolHardnessLevel; + } + + private final int toolHardnessLevel; + + @Override + public ToolType getHarvestTool(BlockState state) { + return ToolType.PICKAXE; + } + + @Override + public int getHarvestLevel(BlockState state) { + return toolHardnessLevel; + } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java b/src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java new file mode 100644 index 000000000..bd79d940a --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java @@ -0,0 +1,34 @@ +package zone.moddev.mc.mineralogy.client; + +import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.blocks.DryWall; +import zone.moddev.mc.mineralogy.blocks.RockSaltLamp; +import zone.moddev.mc.mineralogy.blocks.RockSaltStreetLamp; +import zone.moddev.mc.mineralogy.fluids.MineralogyFluids; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderTypeLookup; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.registries.ForgeRegistries; + +@Mod.EventBusSubscriber(modid = Mineralogy.MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) +public final class ClientSetup { + private ClientSetup() { + } + + @SubscribeEvent + public static void clientSetup(FMLClientSetupEvent event) { + RenderType cutout = RenderType.getCutout(); + for (Block block : ForgeRegistries.BLOCKS.getValues()) { + if (block instanceof DryWall || block instanceof RockSaltLamp || block instanceof RockSaltStreetLamp) { + RenderTypeLookup.setRenderLayer(block, cutout); + } + } + RenderTypeLookup.setRenderLayer(MineralogyFluids.CRUDE_OIL, RenderType.getTranslucent()); + RenderTypeLookup.setRenderLayer(MineralogyFluids.FLOWING_CRUDE_OIL, RenderType.getTranslucent()); + } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java b/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java new file mode 100644 index 000000000..b136eaf8a --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java @@ -0,0 +1,126 @@ +package zone.moddev.mc.mineralogy.compat; + +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; + +import net.minecraft.block.Block; +import net.minecraft.entity.EntityType; +import net.minecraft.fluid.Fluid; +import net.minecraft.item.Item; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.tags.ITag; +import net.minecraft.tags.ITagCollection; +import net.minecraft.tags.ITagCollectionSupplier; +import net.minecraft.tags.TagRegistryManager; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.event.TagsUpdatedEvent; +import net.minecraftforge.registries.ForgeRegistries; + +import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.MineralogyConfig; +import zone.moddev.mc.mineralogy.data.Material; +import zone.moddev.mc.mineralogy.data.MaterialData; + +/** Applies the legacy cobblestone option to target-native block and item tags. */ +public final class CobblestoneTagPolicy { + private static final ResourceLocation COBBLESTONE = new ResourceLocation("forge", "cobblestone"); + + private CobblestoneTagPolicy() { + } + + /** Apply after the initial server tag load and after every data reload. */ + public static void onTagsUpdated(TagsUpdatedEvent event) { + apply(event.getTagManager()); + } + + static void apply(ITagCollectionSupplier manager) { + Set configuredBlocks = rawRockBlocks(); + Set configuredItems = new LinkedHashSet<>(); + for (Block block : configuredBlocks) configuredItems.add(block.asItem()); + + ITagCollection blockTags = manager.getBlockTags(); + Set blocks = existing(blockTags, COBBLESTONE); + blocks.removeAll(configuredBlocks); + if (MineralogyConfig.makeRockCobblestoneEquivilent()) blocks.addAll(configuredBlocks); + addBlock(blocks, "chert"); + addBlock(blocks, "pumice"); + + ITagCollection itemTags = manager.getItemTags(); + Set items = existing(itemTags, COBBLESTONE); + items.removeAll(configuredItems); + if (MineralogyConfig.makeRockCobblestoneEquivilent()) items.addAll(configuredItems); + addItem(items, "chert"); + addItem(items, "pumice"); + + ITagCollectionSupplier configured = new ITagCollectionSupplier() { + @Override + public ITagCollection getBlockTags() { + return replace(blockTags, blocks); + } + + @Override + public ITagCollection getItemTags() { + return replace(itemTags, items); + } + + @Override + public ITagCollection getFluidTags() { + return manager.getFluidTags(); + } + + @Override + public ITagCollection> getEntityTypeTags() { + return manager.getEntityTypeTags(); + } + + @Override + public Map> getCustomTagTypes() { + return manager.getCustomTagTypes(); + } + }; + + // Forge 36 snapshots the loaded tags in immutable collections before + // firing TagsUpdatedEvent. Rebuild only the two cobblestone collections + // and refetch the named wrappers used by blocks, items and recipes. + TagRegistryManager.fetchTags(configured); + + // Ingredients cache their expanded matching stacks independently of the + // named tag wrapper, so invalidate them after every initial load/reload. + Ingredient.invalidateAll(); + } + + private static Set rawRockBlocks() { + Set blocks = new LinkedHashSet<>(); + for (Material material : MaterialData.allIncludingRockSalt()) { + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Mineralogy.MODID, material.id())); + if (block != null) blocks.add(block); + } + return blocks; + } + + private static Set existing(ITagCollection collection, ResourceLocation id) { + ITag tag = collection.get(id); + return tag == null ? new LinkedHashSet<>() : new LinkedHashSet<>(tag.getAllElements()); + } + + private static ITagCollection replace(ITagCollection collection, Set values) { + if (collection.get(COBBLESTONE) == null) { + throw new IllegalStateException("Missing required tag " + COBBLESTONE); + } + Map> tags = new LinkedHashMap<>(collection.getIDTagMap()); + tags.put(COBBLESTONE, ITag.getTagOf(values)); + return ITagCollection.getTagCollectionFromMap(tags); + } + + private static void addBlock(Set blocks, String name) { + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Mineralogy.MODID, name)); + if (block != null) blocks.add(block); + } + + private static void addItem(Set items, String name) { + Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Mineralogy.MODID, name)); + if (item != null) items.add(item); + } +} diff --git a/src/main/java/com/mcmoddev/mineralogy/data/Material.java b/src/main/java/zone/moddev/mc/mineralogy/data/Material.java similarity index 67% rename from src/main/java/com/mcmoddev/mineralogy/data/Material.java rename to src/main/java/zone/moddev/mc/mineralogy/data/Material.java index 4e6696a11..06b43f2d2 100644 --- a/src/main/java/com/mcmoddev/mineralogy/data/Material.java +++ b/src/main/java/zone/moddev/mc/mineralogy/data/Material.java @@ -1,34 +1,29 @@ -package com.mcmoddev.mineralogy.data; - -import com.mcmoddev.mineralogy.Mineralogy; -import com.mcmoddev.mineralogy.RockType; -import com.mcmoddev.mineralogy.blocks.Rock; -import com.mcmoddev.mineralogy.blocks.RockStairs; -import com.mcmoddev.mineralogy.blocks.RockWall; -import com.mcmoddev.mineralogy.init.MineralogyItemGroups; - -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.BlockItem; -import net.minecraft.resources.ResourceLocation; +package zone.moddev.mc.mineralogy.data; + +import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.blocks.Rock; +import zone.moddev.mc.mineralogy.blocks.RockStairs; +import zone.moddev.mc.mineralogy.blocks.RockWall; +import zone.moddev.mc.mineralogy.init.MineralogyItemGroups; + +import net.minecraft.block.SoundType; +import net.minecraft.item.Item; +import net.minecraft.item.BlockItem; +import net.minecraft.util.ResourceLocation; public class Material { public String materialName; - public RockType rockType; public double hardness; - public double blastResistance; - public int toolHardnessLevel; - public boolean cobbleEquivilent; - public boolean standardRockType; - private Rock rock; - + public double blastResistance; + public int toolHardnessLevel; + public boolean cobbleEquivilent; + public boolean standardRockType; + private Rock rock; + /** * @param materialName - * Name of the block (should start with capital letter) - * - * @param type - * Igneous, sedimentary, or metamorphic - * + * Name of the block (should start with capital letter) + * * @param hardness * How hard (time duration) the block is to pick. For reference, dirt * is 0.5, stone is 1.5, ores are 3, and obsidian is 50 @@ -40,95 +35,96 @@ public class Material { * @param cobbleEquivilent * is material equivalent to cobblestone */ - public Material(String materialName, RockType rockType, - double hardness, double blastResistance, int toolHardnessLevel, - boolean cobbleEquivilent) { - this(materialName, rockType, hardness, blastResistance, toolHardnessLevel, cobbleEquivilent, true); - } - - public Material(String materialName, RockType rockType, - double hardness, double blastResistance, int toolHardnessLevel, - boolean cobbleEquivilent, boolean standardRockType) { - this.materialName = materialName; - this.rockType = rockType; - this.hardness = hardness; - this.blastResistance = blastResistance; - this.toolHardnessLevel = toolHardnessLevel; - this.cobbleEquivilent = cobbleEquivilent; - this.standardRockType = standardRockType; - } - - public Rock toRock(boolean isSmooth, boolean isBrick) { - String name = this.materialName.toLowerCase(); - + public Material(String materialName, double hardness, double blastResistance, int toolHardnessLevel, + boolean cobbleEquivilent) { + this(materialName, hardness, blastResistance, toolHardnessLevel, cobbleEquivilent, true); + } + + public Material(String materialName, double hardness, double blastResistance, int toolHardnessLevel, + boolean cobbleEquivilent, boolean standardRockType) { + this.materialName = materialName; + this.hardness = hardness; + this.blastResistance = blastResistance; + this.toolHardnessLevel = toolHardnessLevel; + this.cobbleEquivilent = cobbleEquivilent; + this.standardRockType = standardRockType; + } + + public String id() { + return materialName.toLowerCase(); + } + + public Rock toRock(boolean isSmooth, boolean isBrick) { + String name = this.materialName.toLowerCase(); + if (isSmooth) name = name + "_smooth"; - + if (isBrick) name = name + "_brick"; - + rock = new Rock(true, (float)this.hardness, (float)this.blastResistance, (int)this.toolHardnessLevel, SoundType.STONE, name); - - return rock; - } - - public void setRock(Rock rock) { - this.rock = rock; - } - + + return rock; + } + + public void setRock(Rock rock) { + this.rock = rock; + } + public RockWall toRockWall(boolean isSmooth, boolean isBrick) { String name = this.materialName.toLowerCase(); - + if (isSmooth) name = name + "_smooth"; - + if (isBrick) name = name + "_brick"; - + return new RockWall(rock, (float)this.hardness, (float)this.blastResistance, (int)this.toolHardnessLevel, SoundType.STONE, name + "_wall"); } - + public RockStairs toRockStairs(boolean isSmooth, boolean isBrick) { String name = this.materialName.toLowerCase(); - + if (isSmooth) name = name + "_smooth"; - + if (isBrick) name = name + "_brick"; - + return new RockStairs(rock, (float)this.hardness, (float)this.blastResistance, (int)this.toolHardnessLevel, SoundType.STONE, name + "_stairs"); } - - public BlockItem getBlockItem(Rock blockHandle) { - BlockItem blockItem = new BlockItem(blockHandle, - new Item.Properties().tab(MineralogyItemGroups.forBlock(blockHandle))); - - blockItem.setRegistryName(Mineralogy.MODID, blockHandle.getRegistryName().getPath()); - + + public BlockItem getBlockItem(Rock blockHandle) { + BlockItem blockItem = new BlockItem(blockHandle, + new Item.Properties().group(MineralogyItemGroups.forBlock(blockHandle))); + + blockItem.setRegistryName(Mineralogy.MODID, blockHandle.getRegistryName().getPath()); + return blockItem; } - - public BlockItem getBlockItem(RockStairs blockHandle) { - BlockItem blockItem = new BlockItem(blockHandle, - new Item.Properties().tab(MineralogyItemGroups.forBlock(blockHandle))); - - blockItem.setRegistryName(Mineralogy.MODID, blockHandle.getRegistryName().getPath()); - + + public BlockItem getBlockItem(RockStairs blockHandle) { + BlockItem blockItem = new BlockItem(blockHandle, + new Item.Properties().group(MineralogyItemGroups.forBlock(blockHandle))); + + blockItem.setRegistryName(Mineralogy.MODID, blockHandle.getRegistryName().getPath()); + return blockItem; } - - public BlockItem getBlockItem(RockWall blockHandle) { - BlockItem blockItem = new BlockItem(blockHandle, - new Item.Properties().tab(MineralogyItemGroups.forBlock(blockHandle))); - - blockItem.setRegistryName(Mineralogy.MODID, blockHandle.getRegistryName().getPath()); - + + public BlockItem getBlockItem(RockWall blockHandle) { + BlockItem blockItem = new BlockItem(blockHandle, + new Item.Properties().group(MineralogyItemGroups.forBlock(blockHandle))); + + blockItem.setRegistryName(Mineralogy.MODID, blockHandle.getRegistryName().getPath()); + return blockItem; } - + @Override public String toString() { return materialName; } -} +} diff --git a/src/main/java/com/mcmoddev/mineralogy/data/MaterialData.java b/src/main/java/zone/moddev/mc/mineralogy/data/MaterialData.java similarity index 53% rename from src/main/java/com/mcmoddev/mineralogy/data/MaterialData.java rename to src/main/java/zone/moddev/mc/mineralogy/data/MaterialData.java index a924aa2a2..9a6298300 100644 --- a/src/main/java/com/mcmoddev/mineralogy/data/MaterialData.java +++ b/src/main/java/zone/moddev/mc/mineralogy/data/MaterialData.java @@ -1,47 +1,46 @@ -package com.mcmoddev.mineralogy.data; - -import java.util.ArrayList; -import com.mcmoddev.mineralogy.RockType; - -public class MaterialData { - public static final Material ANDESITE = new Material("Andesite", RockType.IGNEOUS, 1.5, 10, 0, true); - public static final Material BASALT = new Material("Basalt", RockType.IGNEOUS, 5, 100, 2, true); - public static final Material DIORITE = new Material("Diorite", RockType.IGNEOUS, 1.5, 10, 0, true); - public static final Material GRANITE = new Material("Granite", RockType.IGNEOUS, 3, 15, 1, true); - public static final Material RHYOLITE = new Material("Rhyolite", RockType.IGNEOUS, 1.5, 10, 0, true); - public static final Material PEGMATITE = new Material("Pegmatite", RockType.IGNEOUS, 1.5, 10, 0, true); - public static final Material DIABASE = new Material("Diabase", RockType.IGNEOUS, 5, 100, 2, true); - public static final Material GABBRO = new Material("Gabbro", RockType.IGNEOUS, 5, 100, 2, true); - public static final Material PERIDOTITE = new Material("Peridotite", RockType.IGNEOUS, 3, 15, 0, true); - public static final Material BASALTIC_GLASS = new Material("Basaltic_glass", RockType.IGNEOUS, 3, 15, 0, true); - public static final Material SCORIA = new Material("Scoria", RockType.IGNEOUS, 1, 7, 0, true); - public static final Material TUFF = new Material("Tuff", RockType.IGNEOUS, 2, 10, 0, true); +package zone.moddev.mc.mineralogy.data; - public static final Material SHALE = new Material("Shale", RockType.SEDIMENTARY, 1.5, 10, 0, true); - public static final Material CONGLOMERATE = new Material("Conglomerate", RockType.SEDIMENTARY, 1.5, 10, 0, true); - public static final Material DOLOMITE = new Material("Dolomite", RockType.SEDIMENTARY, 3, 15, 1, true); - public static final Material LIMESTONE = new Material("Limestone", RockType.SEDIMENTARY, 1.5, 10, 0, true); - public static final Material MARBLE = new Material("Marble", RockType.METAMORPHIC, 1.5, 10, 0, true); - public static final Material SILTSTONE = new Material("Siltstone", RockType.SEDIMENTARY, 1, 10, 0, true); - public static final Material ROCK_SALT = new Material("Rock_salt", RockType.SEDIMENTARY, 1.5, 10, 0, true, false); - - public static final Material SLATE = new Material("Slate", RockType.METAMORPHIC, 1.5, 10, 0, true); - public static final Material SCHIST = new Material("Schist", RockType.METAMORPHIC, 3, 15, 1, true); - public static final Material GNEISS = new Material("Gneiss", RockType.METAMORPHIC, 3, 15, 1, true); - public static final Material PHYLLITE = new Material("Phyllite", RockType.METAMORPHIC, 1.5, 10, 0, true); - public static final Material AMPHIBOLITE = new Material("Amphibolite", RockType.METAMORPHIC, 3, 15, 1, true); - public static final Material HORNFELS = new Material("Hornfels", RockType.METAMORPHIC, 3, 15, 1, true); - public static final Material QUARTZITE = new Material("Quartzite", RockType.METAMORPHIC, 4, 15, 1, true); - public static final Material NOVACULITE = new Material("Novaculite", RockType.METAMORPHIC, 3, 15, 1, true); - - public static ArrayList toArray() { - ArrayList materialArray = new ArrayList(); - - materialArray.add(MaterialData.ANDESITE); - materialArray.add(MaterialData.BASALT); - materialArray.add(MaterialData.DIORITE); +import java.util.ArrayList; + +public class MaterialData { + public static final Material ANDESITE = new Material("Andesite", 1.5, 10, 0, true); + public static final Material BASALT = new Material("Basalt", 5, 100, 2, true); + public static final Material DIORITE = new Material("Diorite", 1.5, 10, 0, true); + public static final Material GRANITE = new Material("Granite", 3, 15, 1, true); + public static final Material RHYOLITE = new Material("Rhyolite", 1.5, 10, 0, true); + public static final Material PEGMATITE = new Material("Pegmatite", 1.5, 10, 0, true); + public static final Material DIABASE = new Material("Diabase", 5, 100, 2, true); + public static final Material GABBRO = new Material("Gabbro", 5, 100, 2, true); + public static final Material PERIDOTITE = new Material("Peridotite", 3, 15, 0, true); + public static final Material BASALTIC_GLASS = new Material("Basaltic_glass", 3, 15, 0, true); + public static final Material SCORIA = new Material("Scoria", 1, 7, 0, true); + public static final Material TUFF = new Material("Tuff", 2, 10, 0, true); + + public static final Material SHALE = new Material("Shale", 1.5, 10, 0, true); + public static final Material CONGLOMERATE = new Material("Conglomerate", 1.5, 10, 0, true); + public static final Material DOLOMITE = new Material("Dolomite", 3, 15, 1, true); + public static final Material LIMESTONE = new Material("Limestone", 1.5, 10, 0, true); + public static final Material MARBLE = new Material("Marble", 1.5, 10, 0, true); + public static final Material SILTSTONE = new Material("Siltstone", 1, 10, 0, true); + public static final Material ROCK_SALT = new Material("Rock_salt", 1.5, 10, 0, true, false); + + public static final Material SLATE = new Material("Slate", 1.5, 10, 0, true); + public static final Material SCHIST = new Material("Schist", 3, 15, 1, true); + public static final Material GNEISS = new Material("Gneiss", 3, 15, 1, true); + public static final Material PHYLLITE = new Material("Phyllite", 1.5, 10, 0, true); + public static final Material AMPHIBOLITE = new Material("Amphibolite", 3, 15, 1, true); + public static final Material HORNFELS = new Material("Hornfels", 3, 15, 1, true); + public static final Material QUARTZITE = new Material("Quartzite", 4, 15, 1, true); + public static final Material NOVACULITE = new Material("Novaculite", 3, 15, 1, true); + + public static ArrayList toArray() { + ArrayList materialArray = new ArrayList(); + + materialArray.add(MaterialData.ANDESITE); + materialArray.add(MaterialData.BASALT); + materialArray.add(MaterialData.DIORITE); materialArray.add(MaterialData.GRANITE); - materialArray.add(MaterialData.RHYOLITE); + materialArray.add(MaterialData.RHYOLITE); materialArray.add(MaterialData.PEGMATITE); materialArray.add(MaterialData.DIABASE); materialArray.add(MaterialData.GABBRO); @@ -49,25 +48,31 @@ public static ArrayList toArray() { materialArray.add(MaterialData.BASALTIC_GLASS); materialArray.add(MaterialData.SCORIA); materialArray.add(MaterialData.TUFF); - materialArray.add(MaterialData.SHALE); + materialArray.add(MaterialData.SHALE); materialArray.add(MaterialData.CONGLOMERATE); - materialArray.add(MaterialData.DOLOMITE); + materialArray.add(MaterialData.DOLOMITE); materialArray.add(MaterialData.LIMESTONE); materialArray.add(MaterialData.SILTSTONE); - materialArray.add(MaterialData.MARBLE); + materialArray.add(MaterialData.MARBLE); materialArray.add(MaterialData.SLATE); materialArray.add(MaterialData.SCHIST); materialArray.add(MaterialData.GNEISS); - materialArray.add(MaterialData.PHYLLITE); + materialArray.add(MaterialData.PHYLLITE); materialArray.add(MaterialData.AMPHIBOLITE); materialArray.add(MaterialData.HORNFELS); materialArray.add(MaterialData.QUARTZITE); materialArray.add(MaterialData.NOVACULITE); - - return materialArray; - } - - private MaterialData() { - throw new IllegalAccessError("Not an instantiable class"); - } -} + + return materialArray; + } + + public static ArrayList allIncludingRockSalt() { + ArrayList materials = toArray(); + materials.add(ROCK_SALT); + return materials; + } + + private MaterialData() { + throw new IllegalAccessError("Not an instantiable class"); + } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporter.java b/src/main/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporter.java new file mode 100644 index 000000000..373880331 --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporter.java @@ -0,0 +1,75 @@ +package zone.moddev.mc.mineralogy.documentation; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.AtomicMoveNotSupportedException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import net.minecraftforge.fml.loading.FMLPaths; + +/** Copies the bundled human-facing Mineralogy guide beside its configuration. */ +public final class DocumentationExporter { + private static final Logger LOGGER = LogManager.getLogger(); + private static final GuideFile[] FILES = { + guide("README.md"), guide("PLAYER_GUIDE.md"), guide("DEVELOPER_GUIDE.md"), + guide("CONTENT_CONFIG.md"), guide("PROVIDER.md"), guide("VERSIONS.md"), + new GuideFile("examples/mineralogy-provider.json", "/data/mineralogy/orespawn/provider.json") + }; + + private DocumentationExporter() { + } + + public static void exportBundledGuide() { + Path target = FMLPaths.CONFIGDIR.get().resolve("mineralogy-guide"); + try { + int exported = exportMissing(target); + if (exported > 0) LOGGER.info("Exported {} Mineralogy guide files to {}", exported, target.toAbsolutePath()); + } catch (IOException e) { + LOGGER.warn("Could not export the Mineralogy guide to {}", target.toAbsolutePath(), e); + } + } + + public static int exportMissing(Path targetRoot) throws IOException { + int exported = 0; + for (GuideFile file : FILES) { + Path target = targetRoot.resolve(file.target); + if (Files.exists(target)) continue; + try (InputStream source = DocumentationExporter.class.getResourceAsStream(file.resource)) { + if (source == null) throw new IOException("Missing bundled documentation resource " + file.resource); + Files.createDirectories(target.getParent()); + Path temporary = Files.createTempFile(target.getParent(), target.getFileName().toString(), ".tmp"); + try { + Files.copy(source, temporary, StandardCopyOption.REPLACE_EXISTING); + moveIntoPlace(temporary, target); + exported++; + } finally { + Files.deleteIfExists(temporary); + } + } + } + return exported; + } + + private static void moveIntoPlace(Path source, Path target) throws IOException { + try { + Files.move(source, target, StandardCopyOption.ATOMIC_MOVE); + } catch (AtomicMoveNotSupportedException e) { + Files.move(source, target); + } + } + + private static GuideFile guide(String name) { + return new GuideFile(name, "/META-INF/mineralogy/docs/" + name); + } + + private static final class GuideFile { + private final String target; + private final String resource; + private GuideFile(String target, String resource) { this.target = target; this.resource = resource; } + } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/fluids/MineralogyFluids.java b/src/main/java/zone/moddev/mc/mineralogy/fluids/MineralogyFluids.java new file mode 100644 index 000000000..55fc148c8 --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/fluids/MineralogyFluids.java @@ -0,0 +1,78 @@ +package zone.moddev.mc.mineralogy.fluids; + +import net.minecraft.block.Block; +import net.minecraft.block.FlowingFluidBlock; +import net.minecraft.block.material.Material; +import net.minecraft.fluid.Fluid; +import net.minecraft.item.BucketItem; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fluids.FluidAttributes; +import net.minecraftforge.fluids.ForgeFlowingFluid; +import net.minecraftforge.fml.common.Mod; + +import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.MineralogyConfig; +import zone.moddev.mc.mineralogy.init.MineralogyItemGroups; + +/** Forge 36-native source, flowing block and bucket for Mineralogy crude oil. */ +@Mod.EventBusSubscriber(modid = Mineralogy.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +public final class MineralogyFluids { + private static final ResourceLocation STILL_TEXTURE = + new ResourceLocation(Mineralogy.MODID, "blocks/crude_oil_still"); + private static final ResourceLocation FLOW_TEXTURE = + new ResourceLocation(Mineralogy.MODID, "blocks/crude_oil_flow"); + + public static ForgeFlowingFluid.Source CRUDE_OIL; + public static ForgeFlowingFluid.Flowing FLOWING_CRUDE_OIL; + public static FlowingFluidBlock CRUDE_OIL_BLOCK; + public static Item CRUDE_OIL_BUCKET; + + private static final ForgeFlowingFluid.Properties PROPERTIES = + new ForgeFlowingFluid.Properties(() -> CRUDE_OIL, () -> FLOWING_CRUDE_OIL, + FluidAttributes.builder(STILL_TEXTURE, FLOW_TEXTURE) + .translationKey("fluid.mineralogy.crude_oil") + .density(850) + .viscosity(2000)) + .bucket(() -> CRUDE_OIL_BUCKET) + .block(() -> CRUDE_OIL_BLOCK) + .slopeFindDistance(4) + .levelDecreasePerBlock(1) + .tickRate(15) + .explosionResistance(100.0F); + + private MineralogyFluids() { + } + + @SubscribeEvent + public static void registerFluids(RegistryEvent.Register event) { + CRUDE_OIL = (ForgeFlowingFluid.Source) new ForgeFlowingFluid.Source(PROPERTIES) + .setRegistryName(Mineralogy.MODID, "crude_oil"); + FLOWING_CRUDE_OIL = (ForgeFlowingFluid.Flowing) new ForgeFlowingFluid.Flowing(PROPERTIES) + .setRegistryName(Mineralogy.MODID, "flowing_crude_oil"); + event.getRegistry().registerAll(CRUDE_OIL, FLOWING_CRUDE_OIL); + } + + @SubscribeEvent + public static void registerBlock(RegistryEvent.Register event) { + CRUDE_OIL_BLOCK = (FlowingFluidBlock) new FlowingFluidBlock(() -> CRUDE_OIL, + Block.Properties.create(Material.WATER).doesNotBlockMovement() + .hardnessAndResistance(100.0F).variableOpacity()) + .setRegistryName(Mineralogy.MODID, "crude_oil"); + event.getRegistry().register(CRUDE_OIL_BLOCK); + } + + @SubscribeEvent + public static void registerBucket(RegistryEvent.Register event) { + Item.Properties properties = new Item.Properties().maxStackSize(1).containerItem(Items.BUCKET); + if (MineralogyConfig.isCreativeVisible("crude_oil_bucket")) { + properties.group(MineralogyItemGroups.forItem()); + } + CRUDE_OIL_BUCKET = new BucketItem(() -> CRUDE_OIL, properties) + .setRegistryName(Mineralogy.MODID, "crude_oil_bucket"); + event.getRegistry().register(CRUDE_OIL_BUCKET); + } +} diff --git a/src/main/java/com/mcmoddev/mineralogy/init/Blocks.java b/src/main/java/zone/moddev/mc/mineralogy/init/Blocks.java similarity index 81% rename from src/main/java/com/mcmoddev/mineralogy/init/Blocks.java rename to src/main/java/zone/moddev/mc/mineralogy/init/Blocks.java index 09a949798..9027d3881 100644 --- a/src/main/java/com/mcmoddev/mineralogy/init/Blocks.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/Blocks.java @@ -1,27 +1,26 @@ -package com.mcmoddev.mineralogy.init; - -import com.mcmoddev.mineralogy.Mineralogy; -import com.mcmoddev.mineralogy.MineralogyConfig; -import com.mcmoddev.mineralogy.RockType; -import com.mcmoddev.mineralogy.blocks.Chalk; -import com.mcmoddev.mineralogy.blocks.Chert; -import com.mcmoddev.mineralogy.blocks.DoubleSlab; -import com.mcmoddev.mineralogy.blocks.DryWall; -import com.mcmoddev.mineralogy.blocks.Gypsum; -import com.mcmoddev.mineralogy.blocks.Ore; -import com.mcmoddev.mineralogy.blocks.Rock; -import com.mcmoddev.mineralogy.blocks.RockFurnace; -import com.mcmoddev.mineralogy.blocks.RockRelief; -import com.mcmoddev.mineralogy.blocks.RockSalt; -import com.mcmoddev.mineralogy.blocks.RockSaltLamp; -import com.mcmoddev.mineralogy.blocks.RockSaltStreetLamp; -import com.mcmoddev.mineralogy.blocks.RockSlab; -import com.mcmoddev.mineralogy.blocks.RockStairs; -import com.mcmoddev.mineralogy.blocks.RockWall; -import com.mcmoddev.mineralogy.data.MaterialData; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.SoundType; +package zone.moddev.mc.mineralogy.init; + +import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.MineralogyConfig; +import zone.moddev.mc.mineralogy.blocks.Chalk; +import zone.moddev.mc.mineralogy.blocks.Chert; +import zone.moddev.mc.mineralogy.blocks.DoubleSlab; +import zone.moddev.mc.mineralogy.blocks.DryWall; +import zone.moddev.mc.mineralogy.blocks.Gypsum; +import zone.moddev.mc.mineralogy.blocks.Ore; +import zone.moddev.mc.mineralogy.blocks.Rock; +import zone.moddev.mc.mineralogy.blocks.RockFurnace; +import zone.moddev.mc.mineralogy.blocks.RockRelief; +import zone.moddev.mc.mineralogy.blocks.RockSalt; +import zone.moddev.mc.mineralogy.blocks.RockSaltLamp; +import zone.moddev.mc.mineralogy.blocks.RockSaltStreetLamp; +import zone.moddev.mc.mineralogy.blocks.RockSlab; +import zone.moddev.mc.mineralogy.blocks.RockStairs; +import zone.moddev.mc.mineralogy.blocks.RockWall; +import zone.moddev.mc.mineralogy.data.MaterialData; + +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -47,7 +46,7 @@ public class Blocks { public static final Rock gneiss = null; public static final Rock phyllite = null; public static final Rock amphibolite = null; - + public static final Rock andesite_smooth = null; public static final Rock basalt_smooth = null; public static final Rock diorite_smooth = null; @@ -64,7 +63,7 @@ public class Blocks { public static final Rock gneiss_smooth = null; public static final Rock phyllite_smooth = null; public static final Rock amphibolite_smooth = null; - + public static final RockStairs andesite_stairs = null; public static final RockStairs basalt_stairs = null; public static final RockStairs diorite_stairs = null; @@ -81,7 +80,7 @@ public class Blocks { public static final RockStairs gneiss_stairs = null; public static final RockStairs phyllite_stairs = null; public static final RockStairs amphibolite_stairs = null; - + public static final RockStairs andesite_smooth_stairs = null; public static final RockStairs basalt_smooth_stairs = null; public static final RockStairs diorite_smooth_stairs = null; @@ -98,7 +97,7 @@ public class Blocks { public static final RockStairs gneiss_smooth_stairs = null; public static final RockStairs phyllite_smooth_stairs = null; public static final RockStairs amphibolite_smooth_stairs = null; - + public static final Rock andesite_brick = null; public static final Rock basalt_brick = null; public static final Rock diorite_brick = null; @@ -115,7 +114,7 @@ public class Blocks { public static final Rock gneiss_brick = null; public static final Rock phyllite_brick = null; public static final Rock amphibolite_brick = null; - + public static final Rock andesite_smooth_brick = null; public static final Rock basalt_smooth_brick = null; public static final Rock diorite_smooth_brick = null; @@ -132,7 +131,7 @@ public class Blocks { public static final Rock gneiss_smooth_brick = null; public static final Rock phyllite_smooth_brick = null; public static final Rock amphibolite_smooth_brick = null; - + public static final RockStairs andesite_brick_stairs = null; public static final RockStairs basalt_brick_stairs = null; public static final RockStairs diorite_brick_stairs = null; @@ -149,7 +148,7 @@ public class Blocks { public static final RockStairs gneiss_brick_stairs = null; public static final RockStairs phyllite_brick_stairs = null; public static final RockStairs amphibolite_brick_stairs = null; - + public static final RockStairs andesite_smooth_brick_stairs = null; public static final RockStairs basalt_smooth_brick_stairs = null; public static final RockStairs diorite_smooth_brick_stairs = null; @@ -166,7 +165,7 @@ public class Blocks { public static final RockStairs gneiss_smooth_brick_stairs = null; public static final RockStairs phyllite_smooth_brick_stairs = null; public static final RockStairs amphibolite_smooth_brick_stairs = null; - + public static final RockWall andesite_wall = null; public static final RockWall basalt_wall = null; public static final RockWall diorite_wall = null; @@ -183,7 +182,7 @@ public class Blocks { public static final RockWall gneiss_wall = null; public static final RockWall phyllite_wall = null; public static final RockWall amphibolite_wall = null; - + public static final RockWall andesite_smooth_wall = null; public static final RockWall basalt_smooth_wall = null; public static final RockWall diorite_smooth_wall = null; @@ -200,7 +199,7 @@ public class Blocks { public static final RockWall gneiss_smooth_wall = null; public static final RockWall phyllite_smooth_wall = null; public static final RockWall amphibolite_smooth_wall = null; - + public static final RockWall andesite_brick_wall = null; public static final RockWall basalt_brick_wall = null; public static final RockWall diorite_brick_wall = null; @@ -217,7 +216,7 @@ public class Blocks { public static final RockWall gneiss_brick_wall = null; public static final RockWall phyllite_brick_wall = null; public static final RockWall amphibolite_brick_wall = null; - + public static final RockWall andesite_smooth_brick_wall = null; public static final RockWall basalt_smooth_brick_wall = null; public static final RockWall diorite_smooth_brick_wall = null; @@ -234,14 +233,14 @@ public class Blocks { public static final RockWall gneiss_smooth_brick_wall = null; public static final RockWall phyllite_smooth_brick_wall = null; public static final RockWall amphibolite_smooth_brick_wall = null; - + @SubscribeEvent public static void registerBlocks(RegistryEvent.Register event) { - for (com.mcmoddev.mineralogy.data.Material material : MaterialData.toArray()) { - registerMaterialFamily(event, material, material.toRock(false, false), true); + for (zone.moddev.mc.mineralogy.data.Material material : MaterialData.toArray()) { + registerMaterialFamily(event, material, material.toRock(false, false)); } - registerMaterialFamily(event, MaterialData.ROCK_SALT, new RockSalt(), true); + registerMaterialFamily(event, MaterialData.ROCK_SALT, new RockSalt()); registerSpecialGeologyBlocks(event); registerDryWalls(event); @@ -256,10 +255,10 @@ public static void registerBlocks(RegistryEvent.Register event) { new Rock(false, 1.5F, 10.0F, 0, SoundType.STONE, "phosphorous_block"), new Rock(false, 1.5F, 10.0F, 0, SoundType.STONE, "nitrate_block") ); - - //event.getRegistry().register(MaterialData.BASALT.toRockWall(false, false)); - - + + //event.getRegistry().register(MaterialData.BASALT.toRockWall(false, false)); + + } private static void registerSpecialGeologyBlocks(RegistryEvent.Register event) { @@ -270,28 +269,20 @@ private static void registerSpecialGeologyBlocks(RegistryEvent.Register e event.getRegistry().registerAll(chert, gypsum, chalk, pumice); - MineralogyRegistry.sedimentaryStones.add(net.minecraft.world.level.block.Blocks.SANDSTONE); - MineralogyRegistry.sedimentaryStones.add(chert); - MineralogyRegistry.sedimentaryStones.add(gypsum); - MineralogyRegistry.sedimentaryStones.add(chalk); - MineralogyRegistry.igneousStones.add(pumice); } private static void registerDryWalls(RegistryEvent.Register event) { - for (String color : com.mcmoddev.mineralogy.Constants.colorSuffixes) { + for (String color : zone.moddev.mc.mineralogy.Constants.colorSuffixes) { event.getRegistry().register(new DryWall(color)); } } private static void registerMaterialFamily(RegistryEvent.Register event, - com.mcmoddev.mineralogy.data.Material material, Rock baseRock, boolean addToGeology) { + zone.moddev.mc.mineralogy.data.Material material, Rock baseRock) { event.getRegistry().register(baseRock); - if (addToGeology) { - addStoneType(material.rockType, baseRock); - } if (MineralogyConfig.generateRockSlab()) { - registerSlabPair(event, createSlab(material, false, false), material, false, false); + registerSlabPair(event, createSlab(material, false, false), baseRock, material, false, false); if (MineralogyConfig.generateRockFurnace()) { registerFurnacePair(event, material, false, false); } @@ -312,7 +303,7 @@ private static void registerMaterialFamily(RegistryEvent.Register event, registerReliefs(event, material); } if (MineralogyConfig.generateSmoothSlab()) { - registerSlabPair(event, createSlab(material, true, false), material, true, false); + registerSlabPair(event, createSlab(material, true, false), smoothRock, material, true, false); if (MineralogyConfig.generateSmoothFurnace()) { registerFurnacePair(event, material, true, false); } @@ -331,7 +322,7 @@ private static void registerMaterialFamily(RegistryEvent.Register event, event.getRegistry().register(brickRock); if (MineralogyConfig.generateBrickSlab()) { - registerSlabPair(event, createSlab(material, false, true), material, false, true); + registerSlabPair(event, createSlab(material, false, true), brickRock, material, false, true); if (MineralogyConfig.generateBrickFurnace()) { registerFurnacePair(event, material, false, true); } @@ -349,7 +340,7 @@ private static void registerMaterialFamily(RegistryEvent.Register event, event.getRegistry().register(smoothBrickRock); if (MineralogyConfig.generateSmoothBrickSlab()) { - registerSlabPair(event, createSlab(material, true, true), material, true, true); + registerSlabPair(event, createSlab(material, true, true), smoothBrickRock, material, true, true); if (MineralogyConfig.generateSmoothBrickFurnace()) { registerFurnacePair(event, material, true, true); } @@ -363,40 +354,41 @@ private static void registerMaterialFamily(RegistryEvent.Register event, } } - private static void registerSlabPair(RegistryEvent.Register event, RockSlab slab, - com.mcmoddev.mineralogy.data.Material material, boolean isSmooth, boolean isBrick) { + private static void registerSlabPair(RegistryEvent.Register event, RockSlab slab, Block fullBlock, + zone.moddev.mc.mineralogy.data.Material material, boolean isSmooth, boolean isBrick) { event.getRegistry().register(slab); - event.getRegistry().register(createDoubleSlab(slab, material, isSmooth, isBrick)); + event.getRegistry().register(createDoubleSlab(slab, fullBlock, material, isSmooth, isBrick)); } - private static RockStairs createStairs(Block sourceBlock, com.mcmoddev.mineralogy.data.Material material, + private static RockStairs createStairs(Block sourceBlock, zone.moddev.mc.mineralogy.data.Material material, boolean isSmooth, boolean isBrick) { return new RockStairs(sourceBlock, (float) material.hardness, (float) material.blastResistance, material.toolHardnessLevel, SoundType.STONE, getVariantName(material, isSmooth, isBrick) + "_stairs"); } - private static RockWall createWall(Block sourceBlock, com.mcmoddev.mineralogy.data.Material material, + private static RockWall createWall(Block sourceBlock, zone.moddev.mc.mineralogy.data.Material material, boolean isSmooth, boolean isBrick) { return new RockWall(sourceBlock, (float) material.hardness, (float) material.blastResistance, material.toolHardnessLevel, SoundType.STONE, getVariantName(material, isSmooth, isBrick) + "_wall"); } - private static RockSlab createSlab(com.mcmoddev.mineralogy.data.Material material, boolean isSmooth, + private static RockSlab createSlab(zone.moddev.mc.mineralogy.data.Material material, boolean isSmooth, boolean isBrick) { String name = getVariantName(material, isSmooth, isBrick); return new RockSlab((float) material.hardness, (float) material.blastResistance, material.toolHardnessLevel, SoundType.STONE, name + "_slab", name + "_double_slab"); } - private static DoubleSlab createDoubleSlab(Block sourceBlock, com.mcmoddev.mineralogy.data.Material material, + private static DoubleSlab createDoubleSlab(Block sourceBlock, Block fullBlock, + zone.moddev.mc.mineralogy.data.Material material, boolean isSmooth, boolean isBrick) { return new DoubleSlab((float) material.hardness, (float) material.blastResistance, - material.toolHardnessLevel, SoundType.STONE, sourceBlock, + material.toolHardnessLevel, SoundType.STONE, sourceBlock, fullBlock, getVariantName(material, isSmooth, isBrick) + "_double_slab"); } private static void registerFurnacePair(RegistryEvent.Register event, - com.mcmoddev.mineralogy.data.Material material, boolean isSmooth, boolean isBrick) { + zone.moddev.mc.mineralogy.data.Material material, boolean isSmooth, boolean isBrick) { String name = getVariantName(material, isSmooth, isBrick) + "_furnace"; float burnModifier = (float) (1.0D + ((material.hardness - 3.0D) / 10.0D)); @@ -407,7 +399,7 @@ private static void registerFurnacePair(RegistryEvent.Register event, } private static void registerReliefs(RegistryEvent.Register event, - com.mcmoddev.mineralogy.data.Material material) { + zone.moddev.mc.mineralogy.data.Material material) { String name = material.materialName.toLowerCase(); String[] suffixes = new String[] { "blank", @@ -432,7 +424,7 @@ private static void registerReliefs(RegistryEvent.Register event, } } - private static String getVariantName(com.mcmoddev.mineralogy.data.Material material, boolean isSmooth, + private static String getVariantName(zone.moddev.mc.mineralogy.data.Material material, boolean isSmooth, boolean isBrick) { String name = material.materialName.toLowerCase(); @@ -446,25 +438,5 @@ private static String getVariantName(com.mcmoddev.mineralogy.data.Material mater return name; } - private static void addStoneType(RockType rockType, Block block) { - switch (rockType) { - case IGNEOUS: - MineralogyRegistry.igneousStones.add(block); - break; - case METAMORPHIC: - MineralogyRegistry.metamorphicStones.add(block); - break; - case SEDIMENTARY: - MineralogyRegistry.sedimentaryStones.add(block); - break; - case ANY: - MineralogyRegistry.igneousStones.add(block); - MineralogyRegistry.metamorphicStones.add(block); - MineralogyRegistry.sedimentaryStones.add(block); - break; - default: - break; - } - } } diff --git a/src/main/java/com/mcmoddev/mineralogy/init/Items.java b/src/main/java/zone/moddev/mc/mineralogy/init/Items.java similarity index 66% rename from src/main/java/com/mcmoddev/mineralogy/init/Items.java rename to src/main/java/zone/moddev/mc/mineralogy/init/Items.java index 72f68106c..63fc0d76b 100644 --- a/src/main/java/com/mcmoddev/mineralogy/init/Items.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/Items.java @@ -1,25 +1,26 @@ -package com.mcmoddev.mineralogy.init; +package zone.moddev.mc.mineralogy.init; import java.util.ArrayList; import java.util.List; -import com.mcmoddev.mineralogy.Mineralogy; -import com.mcmoddev.mineralogy.blocks.DryWall; -import com.mcmoddev.mineralogy.blocks.Ore; -import com.mcmoddev.mineralogy.blocks.Rock; -import com.mcmoddev.mineralogy.blocks.RockFurnace; -import com.mcmoddev.mineralogy.blocks.RockRelief; -import com.mcmoddev.mineralogy.blocks.RockSaltLamp; -import com.mcmoddev.mineralogy.blocks.RockSaltStreetLamp; -import com.mcmoddev.mineralogy.blocks.RockSlab; -import com.mcmoddev.mineralogy.blocks.RockStairs; -import com.mcmoddev.mineralogy.blocks.RockWall; -import com.mcmoddev.mineralogy.items.MineralFertilizer; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.BlockItem; -import net.minecraft.resources.ResourceLocation; +import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.MineralogyConfig; +import zone.moddev.mc.mineralogy.blocks.DryWall; +import zone.moddev.mc.mineralogy.blocks.Ore; +import zone.moddev.mc.mineralogy.blocks.Rock; +import zone.moddev.mc.mineralogy.blocks.RockFurnace; +import zone.moddev.mc.mineralogy.blocks.RockRelief; +import zone.moddev.mc.mineralogy.blocks.RockSaltLamp; +import zone.moddev.mc.mineralogy.blocks.RockSaltStreetLamp; +import zone.moddev.mc.mineralogy.blocks.RockSlab; +import zone.moddev.mc.mineralogy.blocks.RockStairs; +import zone.moddev.mc.mineralogy.blocks.RockWall; +import zone.moddev.mc.mineralogy.items.MineralFertilizer; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.BlockItem; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -81,11 +82,15 @@ private static boolean isMineralogyBlockItem(Block block) { } private static BlockItem createBlockItem(Block block) { - Item.Properties properties = new Item.Properties().tab(MineralogyItemGroups.forBlock(block)); + ResourceLocation name = block.getRegistryName(); + Item.Properties properties = new Item.Properties(); + if (name != null && MineralogyConfig.isCreativeVisible(name.getPath())) { + properties.group(MineralogyItemGroups.forBlock(block)); + } if (block instanceof RockFurnace) { - properties.stacksTo(1); + properties.maxStackSize(1); } else if (block instanceof RockSaltStreetLamp) { - properties.stacksTo(16); + properties.maxStackSize(16); } BlockItem item = new BlockItem(block, properties); @@ -101,13 +106,16 @@ private static boolean isUnlitRockFurnace(Block block) { } private static Item createItem(String name) { - Item item = new Item(new Item.Properties().tab(MineralogyItemGroups.forItem())); + Item.Properties properties = new Item.Properties(); + if (MineralogyConfig.isCreativeVisible(name)) properties.group(MineralogyItemGroups.forItem()); + Item item = new Item(properties); item.setRegistryName(Mineralogy.MODID, name); return item; } private static Item createFertilizer() { - MineralFertilizer item = new MineralFertilizer(MineralogyItemGroups.forItem()); + MineralFertilizer item = new MineralFertilizer(MineralogyConfig.isCreativeVisible("mineral_fertilizer") + ? MineralogyItemGroups.forFertilizer() : null); item.setRegistryName(Mineralogy.MODID, "mineral_fertilizer"); return item; } diff --git a/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java new file mode 100644 index 000000000..f73027910 --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java @@ -0,0 +1,76 @@ +package zone.moddev.mc.mineralogy.init; + +import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.MineralogyConfig; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.registries.ForgeRegistries; + +public final class MineralogyItemGroups { + private MineralogyItemGroups() { + throw new IllegalAccessError("Not an instantiable class"); + } + + public static ItemGroup forBlock(Block block) { + if (!MineralogyConfig.groupCreativeTabItemsByType()) { + return MainGroup.MINERALOGY; + } + + switch (MineralogyConfig.creativeTabPolicy().groupFor(block.getClass())) { + case ROCK: return RockGroup.ROCK; + case STAIR: return StairGroup.STAIR; + case SLAB: return SlabGroup.SLAB; + case WALL: return WallGroup.WALL; + default: return ItemGroups.ITEM; + } + } + + public static ItemGroup forItem() { + return MineralogyConfig.groupCreativeTabItemsByType() ? ItemGroups.ITEM : MainGroup.MINERALOGY; + } + + public static ItemGroup forFertilizer() { + return MineralogyConfig.groupCreativeTabItemsByType() ? ItemGroups.ITEM : ItemGroup.MATERIALS; + } + + private static ItemGroup create(String name, String iconItemName) { + return new ItemGroup(Mineralogy.MODID + "." + name) { + @Override + @OnlyIn(Dist.CLIENT) + public ItemStack createIcon() { + Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Mineralogy.MODID, iconItemName)); + return item != null ? new ItemStack(item) : new ItemStack(net.minecraft.item.Items.IRON_PICKAXE); + } + }; + } + + private static final class MainGroup { + private static final ItemGroup MINERALOGY = create("mineralogy", "basalt"); + } + + private static final class RockGroup { + private static final ItemGroup ROCK = create("rock", "basalt"); + } + + private static final class StairGroup { + private static final ItemGroup STAIR = create("stair", "basalt_stairs"); + } + + private static final class SlabGroup { + private static final ItemGroup SLAB = create("slab", "basalt_slab"); + } + + private static final class WallGroup { + private static final ItemGroup WALL = create("wall", "basalt_wall"); + } + + private static final class ItemGroups { + private static final ItemGroup ITEM = create("item", "sulfur_dust"); + } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyRegistry.java b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyRegistry.java new file mode 100644 index 000000000..4b30a71ee --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyRegistry.java @@ -0,0 +1,14 @@ +package zone.moddev.mc.mineralogy.init; + +import java.util.HashMap; +import java.util.Map; + +import zone.moddev.mc.mineralogy.util.BlockItemPair; + +import net.minecraft.item.Item; + +public class MineralogyRegistry { + public static final Map MineralogyBlockRegistry = new HashMap<>(); // all blocks used in this mod (blockID, BlockItemPair) + public static final Map MineralogyItemRegistry = new HashMap<>(); // all items used in this mod (itemID, item) + public static final Map ItemsToRegister = new HashMap<>(); // all items used in this mod (itemID, item) +} diff --git a/src/main/java/com/mcmoddev/mineralogy/init/TileEntities.java b/src/main/java/zone/moddev/mc/mineralogy/init/TileEntities.java similarity index 86% rename from src/main/java/com/mcmoddev/mineralogy/init/TileEntities.java rename to src/main/java/zone/moddev/mc/mineralogy/init/TileEntities.java index 0e512db26..af9cb24f5 100644 --- a/src/main/java/com/mcmoddev/mineralogy/init/TileEntities.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/TileEntities.java @@ -1,11 +1,11 @@ -package com.mcmoddev.mineralogy.init; +package zone.moddev.mc.mineralogy.init; import java.util.ArrayList; import java.util.List; -import com.mcmoddev.mineralogy.Mineralogy; -import com.mcmoddev.mineralogy.blocks.RockFurnace; -import com.mcmoddev.mineralogy.tileentity.TileEntityRockFurnace; +import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.blocks.RockFurnace; +import zone.moddev.mc.mineralogy.tileentity.TileEntityRockFurnace; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/src/main/java/com/mcmoddev/mineralogy/inventory/ContainerRockFurnace.java b/src/main/java/zone/moddev/mc/mineralogy/inventory/ContainerRockFurnace.java similarity index 83% rename from src/main/java/com/mcmoddev/mineralogy/inventory/ContainerRockFurnace.java rename to src/main/java/zone/moddev/mc/mineralogy/inventory/ContainerRockFurnace.java index 326a18cfa..b9a2f9cd4 100644 --- a/src/main/java/com/mcmoddev/mineralogy/inventory/ContainerRockFurnace.java +++ b/src/main/java/zone/moddev/mc/mineralogy/inventory/ContainerRockFurnace.java @@ -1,6 +1,6 @@ -package com.mcmoddev.mineralogy.inventory; +package zone.moddev.mc.mineralogy.inventory; -import com.mcmoddev.mineralogy.tileentity.TileEntityRockFurnace; +import zone.moddev.mc.mineralogy.tileentity.TileEntityRockFurnace; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.FurnaceMenu; diff --git a/src/main/java/com/mcmoddev/mineralogy/inventory/SlotRockFurnaceOutput.java b/src/main/java/zone/moddev/mc/mineralogy/inventory/SlotRockFurnaceOutput.java similarity index 96% rename from src/main/java/com/mcmoddev/mineralogy/inventory/SlotRockFurnaceOutput.java rename to src/main/java/zone/moddev/mc/mineralogy/inventory/SlotRockFurnaceOutput.java index f02aa76d7..650ef7a57 100644 --- a/src/main/java/com/mcmoddev/mineralogy/inventory/SlotRockFurnaceOutput.java +++ b/src/main/java/zone/moddev/mc/mineralogy/inventory/SlotRockFurnaceOutput.java @@ -1,8 +1,8 @@ -package com.mcmoddev.mineralogy.inventory; +package zone.moddev.mc.mineralogy.inventory; import java.util.Map; -import com.mcmoddev.mineralogy.tileentity.TileEntityRockFurnace; +import zone.moddev.mc.mineralogy.tileentity.TileEntityRockFurnace; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.ExperienceOrb; diff --git a/src/main/java/com/mcmoddev/mineralogy/items/MineralFertilizer.java b/src/main/java/zone/moddev/mc/mineralogy/items/MineralFertilizer.java similarity index 92% rename from src/main/java/com/mcmoddev/mineralogy/items/MineralFertilizer.java rename to src/main/java/zone/moddev/mc/mineralogy/items/MineralFertilizer.java index e7611b9cd..c36535a95 100644 --- a/src/main/java/com/mcmoddev/mineralogy/items/MineralFertilizer.java +++ b/src/main/java/zone/moddev/mc/mineralogy/items/MineralFertilizer.java @@ -1,4 +1,4 @@ -package com.mcmoddev.mineralogy.items; +package zone.moddev.mc.mineralogy.items; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.BoneMealItem; @@ -15,7 +15,7 @@ public class MineralFertilizer extends Item { private final ItemStack phantomBonemeal = new ItemStack(Items.BONE_MEAL, 27); public MineralFertilizer() { - this(com.mcmoddev.mineralogy.init.MineralogyItemGroups.forItem()); + this(zone.moddev.mc.mineralogy.init.MineralogyItemGroups.forItem()); } public MineralFertilizer(CreativeModeTab group) { diff --git a/src/main/java/com/mcmoddev/mineralogy/lib/data/MaterialStats.java b/src/main/java/zone/moddev/mc/mineralogy/lib/data/MaterialStats.java similarity index 82% rename from src/main/java/com/mcmoddev/mineralogy/lib/data/MaterialStats.java rename to src/main/java/zone/moddev/mc/mineralogy/lib/data/MaterialStats.java index 452fc2034..a3502afd3 100644 --- a/src/main/java/com/mcmoddev/mineralogy/lib/data/MaterialStats.java +++ b/src/main/java/zone/moddev/mc/mineralogy/lib/data/MaterialStats.java @@ -1,4 +1,4 @@ -package com.mcmoddev.mineralogy.lib.data; +package zone.moddev.mc.mineralogy.lib.data; import java.util.TreeMap; @@ -6,9 +6,9 @@ import com.google.common.collect.Maps; -import net.minecraft.util.StringRepresentable; +import net.minecraft.util.IStringSerializable; -public enum MaterialStats implements StringRepresentable { +public enum MaterialStats implements IStringSerializable { /** * hardness on a scale from 0 to 10 (or more), where 0 is non-solid and * diamond is 10. For reference, wood is 3, stone is 5, iron is 8, diamond @@ -41,12 +41,12 @@ public enum MaterialStats implements StringRepresentable { for (MaterialStats stat : values()) { MAP.put(stat.ordinal(), stat); } - } - - @Override - public String getSerializedName() { - return name().toLowerCase(); - } + } + + @Override + public String getString() { + return name().toLowerCase(); + } public static MaterialStats getType(@Nonnull int ordinal) { if ((ordinal > values().length) || (ordinal < 0)) { @@ -55,8 +55,8 @@ public static MaterialStats getType(@Nonnull int ordinal) { return values()[ordinal]; } - @Override - public String toString() { - return getSerializedName(); - } -} + @Override + public String toString() { + return getString(); + } +} diff --git a/src/main/java/com/mcmoddev/mineralogy/lib/data/MaterialType.java b/src/main/java/zone/moddev/mc/mineralogy/lib/data/MaterialType.java similarity index 72% rename from src/main/java/com/mcmoddev/mineralogy/lib/data/MaterialType.java rename to src/main/java/zone/moddev/mc/mineralogy/lib/data/MaterialType.java index 4f3c22ded..1ef95938f 100644 --- a/src/main/java/com/mcmoddev/mineralogy/lib/data/MaterialType.java +++ b/src/main/java/zone/moddev/mc/mineralogy/lib/data/MaterialType.java @@ -1,11 +1,11 @@ -package com.mcmoddev.mineralogy.lib.data; - -/** - * ENUM of all the types of Materials - * - * @author Jasmine Iwanek - * - */ -public enum MaterialType { - WOOD, ROCK, METAL, MINERAL, GEM, CRYSTAL +package zone.moddev.mc.mineralogy.lib.data; + +/** + * ENUM of all the types of Materials + * + * @author Jasmine Iwanek + * + */ +public enum MaterialType { + WOOD, ROCK, METAL, MINERAL, GEM, CRYSTAL } \ No newline at end of file diff --git a/src/main/java/com/mcmoddev/mineralogy/lib/data/Names.java b/src/main/java/zone/moddev/mc/mineralogy/lib/data/Names.java similarity index 79% rename from src/main/java/com/mcmoddev/mineralogy/lib/data/Names.java rename to src/main/java/zone/moddev/mc/mineralogy/lib/data/Names.java index 2b57cd9dc..dee35587c 100644 --- a/src/main/java/com/mcmoddev/mineralogy/lib/data/Names.java +++ b/src/main/java/zone/moddev/mc/mineralogy/lib/data/Names.java @@ -1,4 +1,4 @@ -package com.mcmoddev.mineralogy.lib.data; +package zone.moddev.mc.mineralogy.lib.data; import java.util.Locale; import java.util.TreeMap; @@ -7,9 +7,9 @@ import com.google.common.collect.Maps; -import net.minecraft.util.StringRepresentable; +import net.minecraft.util.IStringSerializable; -public enum Names implements StringRepresentable { +public enum Names implements IStringSerializable { // Items ARROW, AXE, BLEND, BOOTS, BOLT, BOW, CHESTPLATE, CRACKHAMMER, CROSSBOW, FISHING_ROD, GEAR, HELMET, HOE, HORSE_ARMOR, INGOT, LEGGINGS, NUGGET, PICKAXE, POWDER, ROD, SHEARS, SHIELD, SHOVEL, SMALLBLEND, SMALLPOWDER, SWORD, GEM, @@ -34,12 +34,12 @@ public enum Names implements StringRepresentable { for (Names name : values()) { MAP.put(name.ordinal(), name); } - } - - @Override - public String getSerializedName() { - return this.name(); - } + } + + @Override + public String getString() { + return this.name(); + } public static Names getType(@Nonnull int ordinal) { if ((ordinal > values().length) || (ordinal < 0)) { @@ -48,8 +48,8 @@ public static Names getType(@Nonnull int ordinal) { return values()[ordinal]; } - @Override - public String toString() { - return this.getSerializedName().toLowerCase(Locale.ROOT); - } -} + @Override + public String toString() { + return this.getString().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/com/mcmoddev/mineralogy/lib/exceptions/ItemNotFoundException.java b/src/main/java/zone/moddev/mc/mineralogy/lib/exceptions/ItemNotFoundException.java similarity index 75% rename from src/main/java/com/mcmoddev/mineralogy/lib/exceptions/ItemNotFoundException.java rename to src/main/java/zone/moddev/mc/mineralogy/lib/exceptions/ItemNotFoundException.java index 3fa642b57..4cc7101ec 100644 --- a/src/main/java/com/mcmoddev/mineralogy/lib/exceptions/ItemNotFoundException.java +++ b/src/main/java/zone/moddev/mc/mineralogy/lib/exceptions/ItemNotFoundException.java @@ -1,14 +1,14 @@ -package com.mcmoddev.mineralogy.lib.exceptions; - -public class ItemNotFoundException extends Exception { - - /** - * - */ - private static final long serialVersionUID = 1L; - - public ItemNotFoundException(String itemName) { - super(itemName + " was not found or not mapped"); - } - -} +package zone.moddev.mc.mineralogy.lib.exceptions; + +public class ItemNotFoundException extends Exception { + + /** + * + */ + private static final long serialVersionUID = 1L; + + public ItemNotFoundException(String itemName) { + super(itemName + " was not found or not mapped"); + } + +} diff --git a/src/main/java/com/mcmoddev/mineralogy/lib/exceptions/MaterialNotFoundException.java b/src/main/java/zone/moddev/mc/mineralogy/lib/exceptions/MaterialNotFoundException.java similarity index 77% rename from src/main/java/com/mcmoddev/mineralogy/lib/exceptions/MaterialNotFoundException.java rename to src/main/java/zone/moddev/mc/mineralogy/lib/exceptions/MaterialNotFoundException.java index ffa3d18b4..942df89df 100644 --- a/src/main/java/com/mcmoddev/mineralogy/lib/exceptions/MaterialNotFoundException.java +++ b/src/main/java/zone/moddev/mc/mineralogy/lib/exceptions/MaterialNotFoundException.java @@ -1,14 +1,14 @@ -package com.mcmoddev.mineralogy.lib.exceptions; - -public class MaterialNotFoundException extends Exception { - - /** - * - */ - private static final long serialVersionUID = 1L; - - public MaterialNotFoundException(String materialName) { - super(materialName + " was not found in the tab array"); - } - -} +package zone.moddev.mc.mineralogy.lib.exceptions; + +public class MaterialNotFoundException extends Exception { + + /** + * + */ + private static final long serialVersionUID = 1L; + + public MaterialNotFoundException(String materialName) { + super(materialName + " was not found in the tab array"); + } + +} diff --git a/src/main/java/com/mcmoddev/mineralogy/lib/exceptions/TabNotFoundException.java b/src/main/java/zone/moddev/mc/mineralogy/lib/exceptions/TabNotFoundException.java similarity index 75% rename from src/main/java/com/mcmoddev/mineralogy/lib/exceptions/TabNotFoundException.java rename to src/main/java/zone/moddev/mc/mineralogy/lib/exceptions/TabNotFoundException.java index 89c79205e..98d29eb81 100644 --- a/src/main/java/com/mcmoddev/mineralogy/lib/exceptions/TabNotFoundException.java +++ b/src/main/java/zone/moddev/mc/mineralogy/lib/exceptions/TabNotFoundException.java @@ -1,14 +1,14 @@ -package com.mcmoddev.mineralogy.lib.exceptions; - -public class TabNotFoundException extends Exception { - - /** - * - */ - private static final long serialVersionUID = 1L; - - public TabNotFoundException(String tabName) { - super(tabName + " was not found in the tab array"); - } - -} +package zone.moddev.mc.mineralogy.lib.exceptions; + +public class TabNotFoundException extends Exception { + + /** + * + */ + private static final long serialVersionUID = 1L; + + public TabNotFoundException(String tabName) { + super(tabName + " was not found in the tab array"); + } + +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/migration/LegacyOreConfigMigrator.java b/src/main/java/zone/moddev/mc/mineralogy/migration/LegacyOreConfigMigrator.java new file mode 100644 index 000000000..50807f3ab --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/migration/LegacyOreConfigMigrator.java @@ -0,0 +1,203 @@ +package zone.moddev.mc.mineralogy.migration; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.nio.file.AtomicMoveNotSupportedException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.util.LinkedHashMap; +import java.util.Map; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +import org.apache.logging.log4j.Logger; + +import zone.moddev.mc.mineralogy.MineralogyConfig; + +/** One-time, non-destructive migration of Mineralogy 5 ore settings to OreSpawn 4. */ +public final class LegacyOreConfigMigrator { + public static final String OVERRIDE_FILE = "mineralogy-orespawn.json"; + public static final String REPORT_FILE = "mineralogy-orespawn-upgrade-report.txt"; + public static final String GLOBAL_FILE = "orespawn-worldgen.json"; + private static final String PROVIDER_RESOURCE = "data/mineralogy/orespawn/provider.json"; + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + private static final OreSettings DEFAULTS = new OreSettings(16, 64, 1.0D, 16); + + private LegacyOreConfigMigrator() { + } + + public static void migrate(Path mineralogyConfigFile, Logger logger) { + if (mineralogyConfigFile == null || !Files.isRegularFile(mineralogyConfigFile)) return; + Path directory = mineralogyConfigFile.toAbsolutePath().getParent(); + if (directory == null) return; + Path report = directory.resolve(REPORT_FILE); + if (Files.isRegularFile(report)) return; + + StringBuilder text = new StringBuilder(); + text.append("Mineralogy 6 / OreSpawn 4 ore migration report\n"); + text.append("source=").append(MineralogyConfig.FILE_NAME).append('\n'); + Path override = directory.resolve(OVERRIDE_FILE); + if (Files.isRegularFile(override)) { + text.append("result=skipped\nreason=existing Mineralogy provider override is authoritative\n"); + writeAtomicallyIfAbsent(report, text.toString(), logger); + return; + } + if (Files.isRegularFile(directory.resolve(GLOBAL_FILE))) { + text.append("result=skipped\nreason=existing OreSpawn global configuration is authoritative\n"); + writeAtomicallyIfAbsent(report, text.toString(), logger); + return; + } + + Map values = MineralogyConfig.readLegacyValues(mineralogyConfigFile); + Map migrations = new LinkedHashMap<>(); + inspect("sulfur_ore", "sulphur_ore", "mineralogy:ore/mineralogy/sulfur_ore", + values, migrations, text, logger); + inspect("phosphorous_ore", null, "mineralogy:ore/mineralogy/phosphorous_ore", + values, migrations, text, logger); + inspect("nitrate_ore", null, "mineralogy:ore/mineralogy/nitrate_ore", + values, migrations, text, logger); + if (migrations.isEmpty()) { + text.append("result=defaults\nreason=no valid non-default ore settings\n"); + writeAtomicallyIfAbsent(report, text.toString(), logger); + return; + } + + try { + JsonObject provider = loadPackagedProvider(); + JsonObject ores = provider.getAsJsonObject("ores"); + for (Map.Entry entry : migrations.entrySet()) { + JsonObject dimension = ores.getAsJsonObject(entry.getKey()) + .getAsJsonObject("dimensions").getAsJsonObject("minecraft:overworld"); + OreSettings settings = entry.getValue(); + dimension.addProperty("min_y", settings.minY); + dimension.addProperty("max_y", settings.maxYExclusive - 1); + dimension.addProperty("frequency", settings.frequency); + dimension.addProperty("quantity", settings.quantity); + } + writeAtomicallyIfAbsent(override, GSON.toJson(provider) + "\n", logger); + text.append("result=migrated\noverride=").append(OVERRIDE_FILE).append('\n'); + } catch (Exception e) { + text.append("result=defaults\nwarning=unable to create provider override\n"); + warn(logger, "Unable to create Mineralogy OreSpawn override; using packaged defaults", e); + } + writeAtomicallyIfAbsent(report, text.toString(), logger); + } + + private static void inspect(String primary, String fallback, String providerId, + Map values, Map migrations, + StringBuilder report, Logger logger) { + String selected = has(values, primary) ? primary : fallback != null && has(values, fallback) ? fallback : primary; + String prefix = "ores." + selected.toLowerCase() + "."; + String min = values.get(prefix + "miny"); + String max = values.get(prefix + "maxy"); + String frequency = values.get(prefix + "frequency"); + String quantity = values.get(prefix + "quantity"); + report.append("ore.").append(selected).append(".source=") + .append(value(min)).append(',').append(value(max)).append(',') + .append(value(frequency)).append(',').append(value(quantity)).append('\n'); + OreSettings parsed = parse(min, max, frequency, quantity); + if (parsed == null) { + report.append("ore.").append(selected).append(".result=default-invalid\n"); + if (min != null || max != null || frequency != null || quantity != null) { + warn(logger, "Invalid or incomplete legacy settings for " + selected + + "; using packaged OreSpawn defaults", null); + } + } else if (parsed.equals(DEFAULTS)) { + report.append("ore.").append(selected).append(".result=default\n"); + } else { + migrations.put(providerId, parsed); + report.append("ore.").append(selected).append(".result=migrated min_y=") + .append(parsed.minY).append(" max_y=").append(parsed.maxYExclusive - 1) + .append(" frequency=").append(parsed.frequency) + .append(" quantity=").append(parsed.quantity).append('\n'); + } + } + + private static boolean has(Map values, String ore) { + String prefix = "ores." + ore.toLowerCase() + "."; + return values.containsKey(prefix + "miny") || values.containsKey(prefix + "maxy") + || values.containsKey(prefix + "frequency") || values.containsKey(prefix + "quantity"); + } + + private static OreSettings parse(String min, String max, String frequency, String quantity) { + if (min == null && max == null && frequency == null && quantity == null) return DEFAULTS; + try { + int minY = Integer.parseInt(min); + int maxY = Integer.parseInt(max); + double attempts = Double.parseDouble(frequency); + int size = Integer.parseInt(quantity); + if (minY < 0 || maxY > 256 || maxY <= minY || !Double.isFinite(attempts) + || attempts < 0.0D || attempts > 64.0D || size < 1 || size > 64) return null; + return new OreSettings(minY, maxY, attempts, size); + } catch (RuntimeException e) { + return null; + } + } + + private static JsonObject loadPackagedProvider() throws IOException { + InputStream stream = LegacyOreConfigMigrator.class.getClassLoader().getResourceAsStream(PROVIDER_RESOURCE); + if (stream == null) throw new IOException("missing " + PROVIDER_RESOURCE); + try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) { + JsonElement parsed = new JsonParser().parse(reader); + if (!parsed.isJsonObject()) throw new IOException("provider root is not an object"); + return parsed.getAsJsonObject(); + } + } + + private static void writeAtomicallyIfAbsent(Path destination, String content, Logger logger) { + if (Files.exists(destination)) return; + Path temporary = destination.resolveSibling(destination.getFileName().toString() + ".tmp"); + try { + Files.createDirectories(destination.getParent()); + Files.write(temporary, content.getBytes(StandardCharsets.UTF_8)); + try { + Files.move(temporary, destination, StandardCopyOption.ATOMIC_MOVE); + } catch (AtomicMoveNotSupportedException e) { + Files.move(temporary, destination); + } + } catch (IOException e) { + warn(logger, "Unable to write " + destination.getFileName(), e); + try { Files.deleteIfExists(temporary); } catch (IOException ignored) { } + } + } + + private static String value(String value) { return value == null ? "missing" : value; } + + private static void warn(Logger logger, String message, Throwable failure) { + if (logger == null) return; + if (failure == null) logger.warn(message); else logger.warn(message, failure); + } + + private static final class OreSettings { + final int minY; + final int maxYExclusive; + final double frequency; + final int quantity; + OreSettings(int minY, int maxYExclusive, double frequency, int quantity) { + this.minY = minY; + this.maxYExclusive = maxYExclusive; + this.frequency = frequency; + this.quantity = quantity; + } + @Override public boolean equals(Object other) { + if (!(other instanceof OreSettings)) return false; + OreSettings that = (OreSettings) other; + return minY == that.minY && maxYExclusive == that.maxYExclusive + && Double.compare(frequency, that.frequency) == 0 && quantity == that.quantity; + } + @Override public int hashCode() { + long bits = Double.doubleToLongBits(frequency); + int result = 31 * minY + maxYExclusive; + result = 31 * result + (int) (bits ^ bits >>> 32); + return 31 * result + quantity; + } + } +} diff --git a/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizer.java b/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizer.java new file mode 100644 index 000000000..d50450ad8 --- /dev/null +++ b/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizer.java @@ -0,0 +1,107 @@ +package zone.moddev.mc.mineralogy.patching; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +/** + * Converts pre-namespaced tile-entity identifiers into values Forge 36 can + * safely parse. Minecraft 1.14 and 1.15 construct a ResourceLocation before looking + * up the tile type, so an otherwise harmless missing legacy tile such as + * {@code Chest} aborts the complete chunk future because of its uppercase + * character. + */ +final class LegacyTileEntityIdNormalizer { + private static final Map VANILLA_IDS; + + static { + Map ids = new HashMap<>(); + ids.put("Furnace", "minecraft:furnace"); + ids.put("Chest", "minecraft:chest"); + ids.put("EnderChest", "minecraft:ender_chest"); + ids.put("RecordPlayer", "minecraft:jukebox"); + ids.put("Trap", "minecraft:dispenser"); + ids.put("Dropper", "minecraft:dropper"); + ids.put("Sign", "minecraft:sign"); + ids.put("MobSpawner", "minecraft:mob_spawner"); + ids.put("Music", "minecraft:noteblock"); + ids.put("Piston", "minecraft:piston"); + ids.put("Cauldron", "minecraft:brewing_stand"); + ids.put("EnchantTable", "minecraft:enchanting_table"); + ids.put("Airportal", "minecraft:end_portal"); + ids.put("Control", "minecraft:command_block"); + ids.put("Beacon", "minecraft:beacon"); + ids.put("Skull", "minecraft:skull"); + ids.put("DLDetector", "minecraft:daylight_detector"); + ids.put("Hopper", "minecraft:hopper"); + ids.put("Comparator", "minecraft:comparator"); + ids.put("FlowerPot", "minecraft:flower_pot"); + ids.put("Banner", "minecraft:banner"); + ids.put("Structure", "minecraft:structure_block"); + ids.put("EndGateway", "minecraft:end_gateway"); + ids.put("Bed", "minecraft:bed"); + ids.put("ShulkerBox", "minecraft:shulker_box"); + VANILLA_IDS = Collections.unmodifiableMap(ids); + } + + private LegacyTileEntityIdNormalizer() { + } + + static String normalize(String id) { + String vanilla = VANILLA_IDS.get(id); + if (vanilla != null) { + return vanilla; + } + if (isValid(id)) { + return id; + } + + int separator = id.indexOf(':'); + String namespace = separator >= 0 ? id.substring(0, separator) : "minecraft"; + String path = separator >= 0 ? id.substring(separator + 1) : id; + return sanitize(namespace) + ':' + sanitize(path); + } + + private static boolean isValid(String id) { + if (id == null || id.isEmpty()) { + return false; + } + int separator = id.indexOf(':'); + if (separator != id.lastIndexOf(':')) { + return false; + } + String namespace = separator >= 0 ? id.substring(0, separator) : "minecraft"; + String path = separator >= 0 ? id.substring(separator + 1) : id; + return !namespace.isEmpty() && !path.isEmpty() + && validPart(namespace, false) && validPart(path, true); + } + + private static boolean validPart(String value, boolean path) { + for (int index = 0; index < value.length(); ++index) { + char character = value.charAt(index); + boolean valid = character >= 'a' && character <= 'z' + || character >= '0' && character <= '9' + || character == '_' || character == '-' || character == '.' + || path && character == '/'; + if (!valid) { + return false; + } + } + return true; + } + + private static String sanitize(String value) { + String lower = value == null ? "" : value.toLowerCase(Locale.ROOT); + StringBuilder sanitized = new StringBuilder(lower.length()); + for (int index = 0; index < lower.length(); ++index) { + char character = lower.charAt(index); + boolean valid = character >= 'a' && character <= 'z' + || character >= '0' && character <= '9' + || character == '_' || character == '-' || character == '.' + || character == '/'; + sanitized.append(valid ? character : '_'); + } + return sanitized.length() == 0 ? "unknown" : sanitized.toString(); + } +} diff --git a/src/main/java/com/mcmoddev/mineralogy/patching/LegacyWorldDataHook.java b/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java similarity index 100% rename from src/main/java/com/mcmoddev/mineralogy/patching/LegacyWorldDataHook.java rename to src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java diff --git a/src/main/java/com/mcmoddev/mineralogy/patching/PatchHandler.java b/src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java similarity index 94% rename from src/main/java/com/mcmoddev/mineralogy/patching/PatchHandler.java rename to src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java index a4c1e6d05..ebaad8d17 100644 --- a/src/main/java/com/mcmoddev/mineralogy/patching/PatchHandler.java +++ b/src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java @@ -1,7 +1,7 @@ -package com.mcmoddev.mineralogy.patching; +package zone.moddev.mc.mineralogy.patching; -import com.mcmoddev.mineralogy.Mineralogy; -import com.mcmoddev.mineralogy.MineralogyConfig; +import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.MineralogyConfig; import net.minecraft.world.level.block.Block; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/mcmoddev/mineralogy/tileentity/TileEntityRockFurnace.java b/src/main/java/zone/moddev/mc/mineralogy/tileentity/TileEntityRockFurnace.java similarity index 98% rename from src/main/java/com/mcmoddev/mineralogy/tileentity/TileEntityRockFurnace.java rename to src/main/java/zone/moddev/mc/mineralogy/tileentity/TileEntityRockFurnace.java index 3aa6f0597..8288933be 100644 --- a/src/main/java/com/mcmoddev/mineralogy/tileentity/TileEntityRockFurnace.java +++ b/src/main/java/zone/moddev/mc/mineralogy/tileentity/TileEntityRockFurnace.java @@ -1,4 +1,4 @@ -package com.mcmoddev.mineralogy.tileentity; +package zone.moddev.mc.mineralogy.tileentity; import java.util.ArrayList; import java.util.HashMap; @@ -7,9 +7,9 @@ import javax.annotation.Nullable; -import com.mcmoddev.mineralogy.blocks.RockFurnace; -import com.mcmoddev.mineralogy.init.TileEntities; -import com.mcmoddev.mineralogy.inventory.ContainerRockFurnace; +import zone.moddev.mc.mineralogy.blocks.RockFurnace; +import zone.moddev.mc.mineralogy.init.TileEntities; +import zone.moddev.mc.mineralogy.inventory.ContainerRockFurnace; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/mcmoddev/mineralogy/util/BlockItemPair.java b/src/main/java/zone/moddev/mc/mineralogy/util/BlockItemPair.java similarity index 87% rename from src/main/java/com/mcmoddev/mineralogy/util/BlockItemPair.java rename to src/main/java/zone/moddev/mc/mineralogy/util/BlockItemPair.java index 9e1223aae..7e454e0ae 100644 --- a/src/main/java/com/mcmoddev/mineralogy/util/BlockItemPair.java +++ b/src/main/java/zone/moddev/mc/mineralogy/util/BlockItemPair.java @@ -1,4 +1,4 @@ -package com.mcmoddev.mineralogy.util; +package zone.moddev.mc.mineralogy.util; import net.minecraft.world.level.block.Block; import net.minecraft.world.item.Item; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 5e7c1c243..b30fba37d 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,7 +1,7 @@ modLoader="javafml" -loaderVersion="[37,)" +loaderVersion="[36,)" license="LGPL-2.1" -issueTrackerURL="https://github.com/SkyBlade1978/MinecraftMineralogy/issues" +issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/issues" displayURL="https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy" logoFile="" credits="Cyanobacterium, SkyBlade1978, JRIwanek, FoxNekitsune, Proxy, the MMD Team, Forge, FML, and the mod authors" @@ -9,7 +9,7 @@ authors="Cyanobacterium, SkyBlade1978, JRIwanek" [[mods]] modId="mineralogy" -version="${file.jarVersion}" +version="${version}" displayName="Minecraft Mineralogy" description=''' Fills the world with real-world rocks. @@ -18,13 +18,20 @@ Fills the world with real-world rocks. [[dependencies.mineralogy]] modId="forge" mandatory=true - versionRange="[37,)" + versionRange="[36.2.34,37)" ordering="NONE" side="BOTH" +[[dependencies.mineralogy]] + modId="orespawn" + mandatory=true + versionRange="[4.0.6,5.0.0)" + ordering="AFTER" + side="BOTH" + [[dependencies.mineralogy]] modId="minecraft" mandatory=true - versionRange="[1.17.1,1.18)" + versionRange="[1.16.5]" ordering="NONE" side="BOTH" diff --git a/src/main/resources/assets/mineralogy/blockstates/crude_oil.json b/src/main/resources/assets/mineralogy/blockstates/crude_oil.json new file mode 100644 index 000000000..9b515f431 --- /dev/null +++ b/src/main/resources/assets/mineralogy/blockstates/crude_oil.json @@ -0,0 +1,20 @@ +{ + "variants": { + "level=0": { "model": "mineralogy:block/crude_oil" }, + "level=1": { "model": "mineralogy:block/crude_oil" }, + "level=2": { "model": "mineralogy:block/crude_oil" }, + "level=3": { "model": "mineralogy:block/crude_oil" }, + "level=4": { "model": "mineralogy:block/crude_oil" }, + "level=5": { "model": "mineralogy:block/crude_oil" }, + "level=6": { "model": "mineralogy:block/crude_oil" }, + "level=7": { "model": "mineralogy:block/crude_oil" }, + "level=8": { "model": "mineralogy:block/crude_oil" }, + "level=9": { "model": "mineralogy:block/crude_oil" }, + "level=10": { "model": "mineralogy:block/crude_oil" }, + "level=11": { "model": "mineralogy:block/crude_oil" }, + "level=12": { "model": "mineralogy:block/crude_oil" }, + "level=13": { "model": "mineralogy:block/crude_oil" }, + "level=14": { "model": "mineralogy:block/crude_oil" }, + "level=15": { "model": "mineralogy:block/crude_oil" } + } +} diff --git a/src/main/resources/assets/mineralogy/lang/de_au.json b/src/main/resources/assets/mineralogy/lang/de_au.json index 581c9281f..09373688a 100644 --- a/src/main/resources/assets/mineralogy/lang/de_au.json +++ b/src/main/resources/assets/mineralogy/lang/de_au.json @@ -1,202 +1,202 @@ { "block.mineralogy.andesite": "Andesit", - "block.mineralogy.andesite_stairs": "Andesit-Treppe", - "block.mineralogy.andesite_slab": "Andesit-Platte", - "block.mineralogy.andesite_brick": "Andesit-Ziegelstein", - "block.mineralogy.andesite_brick_stairs": "Andesit-Ziegelstein-Treppe", - "block.mineralogy.andesite_brick_slab": "Andesit-Ziegelsteinplatte", - "block.mineralogy.andesite_smooth": "Polierter Andesit", - "block.mineralogy.andesite_smooth_stairs": "Polierte Andesit-Treppe", - "block.mineralogy.andesite_smooth_slab": "Polierte Andesit-Platte", - "block.mineralogy.andesite_smooth_brick": "Polierter Andesit-Ziegelstein", - "block.mineralogy.andesite_smooth_brick_stairs": "Polierte Andesit-Ziegelstein-Treppe", - "block.mineralogy.andesite_smooth_brick_slab": "Polierte Andesit-Ziegelsteinplatte", + "block.mineralogy.andesite_stairs": "Treppe aus Andesit", + "block.mineralogy.andesite_slab": "Stufe aus Andesit", + "block.mineralogy.andesite_brick": "Ziegel aus Andesit", + "block.mineralogy.andesite_brick_stairs": "Ziegeltreppe aus Andesit", + "block.mineralogy.andesite_brick_slab": "Ziegelstufe aus Andesit", + "block.mineralogy.andesite_smooth": "Polierter Block aus Andesit", + "block.mineralogy.andesite_smooth_stairs": "Polierte Treppe aus Andesit", + "block.mineralogy.andesite_smooth_slab": "Polierte Stufe aus Andesit", + "block.mineralogy.andesite_smooth_brick": "Polierte Ziegel aus Andesit", + "block.mineralogy.andesite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Andesit", + "block.mineralogy.andesite_smooth_brick_slab": "Polierte Ziegelstufe aus Andesit", "block.mineralogy.basalt": "Basalt", - "block.mineralogy.basalt_stairs": "Basalt Treppen", - "block.mineralogy.basalt_slab": "Basaltplatte", - "block.mineralogy.basalt_brick": "Basaltstein", - "block.mineralogy.basalt_brick_stairs": "Basaltstein Treppen", - "block.mineralogy.basalt_brick_slab": "Basaltstein Platte", - "block.mineralogy.basalt_smooth": "Polierter Basalt", - "block.mineralogy.basalt_smooth_stairs": "Polierte Basalt Treppen", - "block.mineralogy.basalt_smooth_slab": "Polierte Basaltplatte", - "block.mineralogy.basalt_smooth_brick": "Polierter Basaltstein", - "block.mineralogy.basalt_smooth_brick_stairs": "Polierter Basaltstein-Treppen", - "block.mineralogy.basalt_smooth_brick_slab": "Polierter Basaltstein-Platte", + "block.mineralogy.basalt_stairs": "Treppe aus Basalt", + "block.mineralogy.basalt_slab": "Stufe aus Basalt", + "block.mineralogy.basalt_brick": "Ziegel aus Basalt", + "block.mineralogy.basalt_brick_stairs": "Ziegeltreppe aus Basalt", + "block.mineralogy.basalt_brick_slab": "Ziegelstufe aus Basalt", + "block.mineralogy.basalt_smooth": "Polierter Block aus Basalt", + "block.mineralogy.basalt_smooth_stairs": "Polierte Treppe aus Basalt", + "block.mineralogy.basalt_smooth_slab": "Polierte Stufe aus Basalt", + "block.mineralogy.basalt_smooth_brick": "Polierte Ziegel aus Basalt", + "block.mineralogy.basalt_smooth_brick_stairs": "Polierte Ziegeltreppe aus Basalt", + "block.mineralogy.basalt_smooth_brick_slab": "Polierte Ziegelstufe aus Basalt", "block.mineralogy.diorite": "Diorit", - "block.mineralogy.diorite_stairs": "Diorite Treppen", - "block.mineralogy.diorite_slab": "Dioritplatte", - "block.mineralogy.diorite_brick": "Dioritstein", - "block.mineralogy.diorite_brick_stairs": "Dioritstein Treppen", - "block.mineralogy.diorite_brick_slab": "Dioritstein Platte", - "block.mineralogy.diorite_smooth": "Polierter Diorit", - "block.mineralogy.diorite_smooth_stairs": "Polierte Diorit-Treppe", - "block.mineralogy.diorite_smooth_slab": "Polierte Dioritplatte", - "block.mineralogy.diorite_smooth_brick": "Polierter Diorit-Ziegelstein", - "block.mineralogy.diorite_smooth_brick_stairs": "Polierte Dioritstein-Treppe", - "block.mineralogy.diorite_smooth_brick_slab": "Polierte Dioritstein-Platte", + "block.mineralogy.diorite_stairs": "Treppe aus Diorit", + "block.mineralogy.diorite_slab": "Stufe aus Diorit", + "block.mineralogy.diorite_brick": "Ziegel aus Diorit", + "block.mineralogy.diorite_brick_stairs": "Ziegeltreppe aus Diorit", + "block.mineralogy.diorite_brick_slab": "Ziegelstufe aus Diorit", + "block.mineralogy.diorite_smooth": "Polierter Block aus Diorit", + "block.mineralogy.diorite_smooth_stairs": "Polierte Treppe aus Diorit", + "block.mineralogy.diorite_smooth_slab": "Polierte Stufe aus Diorit", + "block.mineralogy.diorite_smooth_brick": "Polierte Ziegel aus Diorit", + "block.mineralogy.diorite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Diorit", + "block.mineralogy.diorite_smooth_brick_slab": "Polierte Ziegelstufe aus Diorit", "block.mineralogy.granite": "Granit", - "block.mineralogy.granite_stairs": "Granit Treppe", - "block.mineralogy.granite_slab": "Granitplatte", - "block.mineralogy.granite_brick": "Granitstein", - "block.mineralogy.granite_brick_stairs": "Granitstein-Treppen", - "block.mineralogy.granite_brick_slab": "Granitstein-Platte", - "block.mineralogy.granite_smooth": "Polierter Granit", - "block.mineralogy.granite_smooth_stairs": "Polierte Granittreppe", - "block.mineralogy.granite_smooth_slab": "Polierte Granitplatte", - "block.mineralogy.granite_smooth_brick": "Polierter Granitstein", - "block.mineralogy.granite_smooth_brick_stairs": "Polierter Granitstein-Treppen", - "block.mineralogy.granite_smooth_brick_slab": "Polierter Granitstein-Platte", + "block.mineralogy.granite_stairs": "Treppe aus Granit", + "block.mineralogy.granite_slab": "Stufe aus Granit", + "block.mineralogy.granite_brick": "Ziegel aus Granit", + "block.mineralogy.granite_brick_stairs": "Ziegeltreppe aus Granit", + "block.mineralogy.granite_brick_slab": "Ziegelstufe aus Granit", + "block.mineralogy.granite_smooth": "Polierter Block aus Granit", + "block.mineralogy.granite_smooth_stairs": "Polierte Treppe aus Granit", + "block.mineralogy.granite_smooth_slab": "Polierte Stufe aus Granit", + "block.mineralogy.granite_smooth_brick": "Polierte Ziegel aus Granit", + "block.mineralogy.granite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Granit", + "block.mineralogy.granite_smooth_brick_slab": "Polierte Ziegelstufe aus Granit", "block.mineralogy.rhyolite": "Rhyolith", - "block.mineralogy.rhyolite_stairs": "Rhyolith Treppen", - "block.mineralogy.rhyolite_slab": "Rhyolithplatte", - "block.mineralogy.rhyolite_brick": "Rhyolith-Ziegelstein", - "block.mineralogy.rhyolite_brick_stairs": "Rhyolith-Ziegelstein-Treppen", - "block.mineralogy.rhyolite_brick_slab": "Rhyolith-Ziegelstein-Platte", - "block.mineralogy.rhyolite_smooth": "Polierter Rhyolith", - "block.mineralogy.rhyolite_smooth_stairs": "Polierte Rhyolith Treppen", - "block.mineralogy.rhyolite_smooth_slab": "Polierte Rhyolithplatte", - "block.mineralogy.rhyolite_smooth_brick": "Polierter Rhyolith-Ziegelstein", - "block.mineralogy.rhyolite_smooth_brick_stairs": "Polierte Rhyolith-Ziegelstein-Treppe", - "block.mineralogy.rhyolite_smooth_brick_slab": "Polierte Rhyolith-Ziegelstein-Platte", + "block.mineralogy.rhyolite_stairs": "Treppe aus Rhyolith", + "block.mineralogy.rhyolite_slab": "Stufe aus Rhyolith", + "block.mineralogy.rhyolite_brick": "Ziegel aus Rhyolith", + "block.mineralogy.rhyolite_brick_stairs": "Ziegeltreppe aus Rhyolith", + "block.mineralogy.rhyolite_brick_slab": "Ziegelstufe aus Rhyolith", + "block.mineralogy.rhyolite_smooth": "Polierter Block aus Rhyolith", + "block.mineralogy.rhyolite_smooth_stairs": "Polierte Treppe aus Rhyolith", + "block.mineralogy.rhyolite_smooth_slab": "Polierte Stufe aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick": "Polierte Ziegel aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_slab": "Polierte Ziegelstufe aus Rhyolith", "block.mineralogy.pegmatite": "Pegmatit", - "block.mineralogy.pegmatite_stairs": "Pegmatite-Treppen", - "block.mineralogy.pegmatite_slab": "Pegmatite-Platte", - "block.mineralogy.pegmatite_brick": "Pegmatit-Ziegelstein", - "block.mineralogy.pegmatite_brick_stairs": "Pegmatite-Ziegelstein-Treppe", - "block.mineralogy.pegmatite_brick_slab": "Pegmatite Ziegelsteinplatte", - "block.mineralogy.pegmatite_smooth": "Polierter Pegmatit", - "block.mineralogy.pegmatite_smooth_stairs": "Polierte Pegmatite Treppen", - "block.mineralogy.pegmatite_smooth_slab": "Polierte Pegmatite Platte", - "block.mineralogy.pegmatite_smooth_brick": "Polierter Pegmatit-Ziegelstein", - "block.mineralogy.pegmatite_smooth_brick_stairs": "Polierte Pegmatite-Ziegelstein-Treppe", - "block.mineralogy.pegmatite_smooth_brick_slab": "Polierte Pegmatite Ziegelsteinplatte", - "block.mineralogy.shale": "Schiefer", - "block.mineralogy.shale_stairs": "Schiefer Treppen", - "block.mineralogy.shale_slab": "Schieferplatte", - "block.mineralogy.shale_brick": "Schiefer-Ziegelstein", - "block.mineralogy.shale_brick_stairs": "Schiefer-Ziegelstein-Treppe", - "block.mineralogy.shale_brick_slab": "Schiefer-Ziegelstein-Platte", - "block.mineralogy.shale_smooth": "Polierter Schiefer", - "block.mineralogy.shale_smooth_stairs": "Polierte Schiefertreppe", - "block.mineralogy.shale_smooth_slab": "Polierte Schieferplatte", - "block.mineralogy.shale_smooth_brick": "Polierter Schiefer-Ziegelstein", - "block.mineralogy.shale_smooth_brick_stairs": "Polierte Schiefer-Ziegelstein-Treppe", - "block.mineralogy.shale_smooth_brick_slab": "Polierte Schiefer-Ziegelstein-Platte", + "block.mineralogy.pegmatite_stairs": "Treppe aus Pegmatit", + "block.mineralogy.pegmatite_slab": "Stufe aus Pegmatit", + "block.mineralogy.pegmatite_brick": "Ziegel aus Pegmatit", + "block.mineralogy.pegmatite_brick_stairs": "Ziegeltreppe aus Pegmatit", + "block.mineralogy.pegmatite_brick_slab": "Ziegelstufe aus Pegmatit", + "block.mineralogy.pegmatite_smooth": "Polierter Block aus Pegmatit", + "block.mineralogy.pegmatite_smooth_stairs": "Polierte Treppe aus Pegmatit", + "block.mineralogy.pegmatite_smooth_slab": "Polierte Stufe aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick": "Polierte Ziegel aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_slab": "Polierte Ziegelstufe aus Pegmatit", + "block.mineralogy.shale": "Tonschiefer", + "block.mineralogy.shale_stairs": "Treppe aus Tonschiefer", + "block.mineralogy.shale_slab": "Stufe aus Tonschiefer", + "block.mineralogy.shale_brick": "Ziegel aus Tonschiefer", + "block.mineralogy.shale_brick_stairs": "Ziegeltreppe aus Tonschiefer", + "block.mineralogy.shale_brick_slab": "Ziegelstufe aus Tonschiefer", + "block.mineralogy.shale_smooth": "Polierter Block aus Tonschiefer", + "block.mineralogy.shale_smooth_stairs": "Polierte Treppe aus Tonschiefer", + "block.mineralogy.shale_smooth_slab": "Polierte Stufe aus Tonschiefer", + "block.mineralogy.shale_smooth_brick": "Polierte Ziegel aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_stairs": "Polierte Ziegeltreppe aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_slab": "Polierte Ziegelstufe aus Tonschiefer", "block.mineralogy.conglomerate": "Konglomerat", - "block.mineralogy.conglomerate_stairs": "Konglomerat Treppen", - "block.mineralogy.conglomerate_slab": "Konglomeratplatte", - "block.mineralogy.conglomerate_brick": "Konglomerat-Ziegelstein", - "block.mineralogy.conglomerate_brick_stairs": "Konglomerat-Ziegelstein-Treppe", - "block.mineralogy.conglomerate_brick_slab": "Konglomerat-Ziegelstein-Platte", - "block.mineralogy.conglomerate_smooth": "Poliertes Konglomerat", - "block.mineralogy.conglomerate_smooth_stairs": "Polierte Konglomerat Treppen", - "block.mineralogy.conglomerate_smooth_slab": "Polierte Konglomeratplatte", - "block.mineralogy.conglomerate_smooth_brick": "Polierter Konglomerat-Ziegelstein", - "block.mineralogy.conglomerate_smooth_brick_stairs": "Polierter Konglomerat-Ziegelstein-Treppe", - "block.mineralogy.conglomerate_smooth_brick_slab": "Polierter Konglomerat-Ziegelstein-Platte", + "block.mineralogy.conglomerate_stairs": "Treppe aus Konglomerat", + "block.mineralogy.conglomerate_slab": "Stufe aus Konglomerat", + "block.mineralogy.conglomerate_brick": "Ziegel aus Konglomerat", + "block.mineralogy.conglomerate_brick_stairs": "Ziegeltreppe aus Konglomerat", + "block.mineralogy.conglomerate_brick_slab": "Ziegelstufe aus Konglomerat", + "block.mineralogy.conglomerate_smooth": "Polierter Block aus Konglomerat", + "block.mineralogy.conglomerate_smooth_stairs": "Polierte Treppe aus Konglomerat", + "block.mineralogy.conglomerate_smooth_slab": "Polierte Stufe aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick": "Polierte Ziegel aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Polierte Ziegeltreppe aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_slab": "Polierte Ziegelstufe aus Konglomerat", "block.mineralogy.dolomite": "Dolomit", - "block.mineralogy.dolomite_stairs": "Dolomit Treppen", - "block.mineralogy.dolomite_slab": "Dolomit-Platte", - "block.mineralogy.dolomite_brick": "Dolomit-Ziegelstein", - "block.mineralogy.dolomite_brick_stairs": "Dolomit-Ziegelstein-Treppe", - "block.mineralogy.dolomite_brick_slab": "Dolomit-Ziegelstein-Platte", - "block.mineralogy.dolomite_smooth": "Polierter Dolomit", - "block.mineralogy.dolomite_smooth_stairs": "Polierte Dolomitentreppe", - "block.mineralogy.dolomite_smooth_slab": "Polierte Dolomitplatte", - "block.mineralogy.dolomite_smooth_brick": "Polierter Dolomitstein", - "block.mineralogy.dolomite_smooth_brick_stairs": "Polierter Dolomit-Ziegelstein-Treppe", - "block.mineralogy.dolomite_smooth_brick_slab": "Polierter Dolomit-Ziegelstein-Platte", + "block.mineralogy.dolomite_stairs": "Treppe aus Dolomit", + "block.mineralogy.dolomite_slab": "Stufe aus Dolomit", + "block.mineralogy.dolomite_brick": "Ziegel aus Dolomit", + "block.mineralogy.dolomite_brick_stairs": "Ziegeltreppe aus Dolomit", + "block.mineralogy.dolomite_brick_slab": "Ziegelstufe aus Dolomit", + "block.mineralogy.dolomite_smooth": "Polierter Block aus Dolomit", + "block.mineralogy.dolomite_smooth_stairs": "Polierte Treppe aus Dolomit", + "block.mineralogy.dolomite_smooth_slab": "Polierte Stufe aus Dolomit", + "block.mineralogy.dolomite_smooth_brick": "Polierte Ziegel aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_slab": "Polierte Ziegelstufe aus Dolomit", "block.mineralogy.limestone": "Kalkstein", - "block.mineralogy.limestone_stairs": "Kalkstein-Treppen", - "block.mineralogy.limestone_slab": "Kalksteinplatte", - "block.mineralogy.limestone_brick": "Kalkstein-Ziegelstein", - "block.mineralogy.limestone_brick_stairs": "Kalkstein-Ziegelstein-Treppe", - "block.mineralogy.limestone_brick_slab": "Kalkstein-Ziegelstein-Platte", - "block.mineralogy.limestone_smooth": "Polierter Kalkstein", - "block.mineralogy.limestone_smooth_stairs": "Polierte Kalksteintreppe", - "block.mineralogy.limestone_smooth_slab": "Polierte Kalksteinplatte", - "block.mineralogy.limestone_smooth_brick": "Polierter Kalkstein-Ziegelstein", - "block.mineralogy.limestone_smooth_brick_stairs": "Polierter Kalkstein-Ziegelstein-Treppe", - "block.mineralogy.limestone_smooth_brick_slab": "Polierter Kalkstein-Ziegelstein-Platte", + "block.mineralogy.limestone_stairs": "Treppe aus Kalkstein", + "block.mineralogy.limestone_slab": "Stufe aus Kalkstein", + "block.mineralogy.limestone_brick": "Ziegel aus Kalkstein", + "block.mineralogy.limestone_brick_stairs": "Ziegeltreppe aus Kalkstein", + "block.mineralogy.limestone_brick_slab": "Ziegelstufe aus Kalkstein", + "block.mineralogy.limestone_smooth": "Polierter Block aus Kalkstein", + "block.mineralogy.limestone_smooth_stairs": "Polierte Treppe aus Kalkstein", + "block.mineralogy.limestone_smooth_slab": "Polierte Stufe aus Kalkstein", + "block.mineralogy.limestone_smooth_brick": "Polierte Ziegel aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_stairs": "Polierte Ziegeltreppe aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_slab": "Polierte Ziegelstufe aus Kalkstein", "block.mineralogy.slate": "Schiefer", - "block.mineralogy.slate_stairs": "Schiefer Treppen", - "block.mineralogy.slate_slab": "Schieferplatte", - "block.mineralogy.slate_brick": "Schiefer-Ziegelstein", - "block.mineralogy.slate_brick_stairs": "Schiefer-Ziegelstein-Treppe", - "block.mineralogy.slate_brick_slab": "Schiefer-Ziegelstein-Platte", - "block.mineralogy.slate_smooth": "Polierter Schiefer", - "block.mineralogy.slate_smooth_stairs": "Polierte Schiefertreppe", - "block.mineralogy.slate_smooth_slab": "Polierte Schieferplatte", - "block.mineralogy.slate_smooth_brick": "Polierter Schiefer-Ziegelstein", - "block.mineralogy.slate_smooth_brick_stairs": "Polierte Schiefer-Ziegelstein-Treppe", - "block.mineralogy.slate_smooth_brick_slab": "Polierte Schiefer-Ziegelstein-Platte", - "block.mineralogy.schist": "Schiefer", - "block.mineralogy.schist_stairs": "Schiefer Treppen", - "block.mineralogy.schist_slab": "Schieferplatte", - "block.mineralogy.schist_brick": "Schiefer-Ziegelstein", - "block.mineralogy.schist_brick_stairs": "Schiefer-Ziegelstein-Treppe", - "block.mineralogy.schist_brick_slab": "Schiefer-Ziegelstein-Platte", - "block.mineralogy.schist_smooth": "Polierter Schiefer", - "block.mineralogy.schist_smooth_stairs": "Polierte Schiefertreppe", - "block.mineralogy.schist_smooth_slab": "Polierte Schieferplatte", - "block.mineralogy.schist_smooth_brick": "Polierter Schiefer-Ziegelstein", - "block.mineralogy.schist_smooth_brick_stairs": "Polierte Schiefer-Ziegelstein-Treppe", - "block.mineralogy.schist_smooth_brick_slab": "Polierte Schiefer-Ziegelstein-Platte", + "block.mineralogy.slate_stairs": "Treppe aus Schiefer", + "block.mineralogy.slate_slab": "Stufe aus Schiefer", + "block.mineralogy.slate_brick": "Ziegel aus Schiefer", + "block.mineralogy.slate_brick_stairs": "Ziegeltreppe aus Schiefer", + "block.mineralogy.slate_brick_slab": "Ziegelstufe aus Schiefer", + "block.mineralogy.slate_smooth": "Polierter Block aus Schiefer", + "block.mineralogy.slate_smooth_stairs": "Polierte Treppe aus Schiefer", + "block.mineralogy.slate_smooth_slab": "Polierte Stufe aus Schiefer", + "block.mineralogy.slate_smooth_brick": "Polierte Ziegel aus Schiefer", + "block.mineralogy.slate_smooth_brick_stairs": "Polierte Ziegeltreppe aus Schiefer", + "block.mineralogy.slate_smooth_brick_slab": "Polierte Ziegelstufe aus Schiefer", + "block.mineralogy.schist": "Glimmerschiefer", + "block.mineralogy.schist_stairs": "Treppe aus Glimmerschiefer", + "block.mineralogy.schist_slab": "Stufe aus Glimmerschiefer", + "block.mineralogy.schist_brick": "Ziegel aus Glimmerschiefer", + "block.mineralogy.schist_brick_stairs": "Ziegeltreppe aus Glimmerschiefer", + "block.mineralogy.schist_brick_slab": "Ziegelstufe aus Glimmerschiefer", + "block.mineralogy.schist_smooth": "Polierter Block aus Glimmerschiefer", + "block.mineralogy.schist_smooth_stairs": "Polierte Treppe aus Glimmerschiefer", + "block.mineralogy.schist_smooth_slab": "Polierte Stufe aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick": "Polierte Ziegel aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_stairs": "Polierte Ziegeltreppe aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_slab": "Polierte Ziegelstufe aus Glimmerschiefer", "block.mineralogy.gneiss": "Gneis", - "block.mineralogy.gneiss_stairs": "Gneistreppe", - "block.mineralogy.gneiss_slab": "Gneisplatte", - "block.mineralogy.gneiss_brick": "Gneis Ziegel", - "block.mineralogy.gneiss_brick_stairs": "Gneis Ziegeltreppen", - "block.mineralogy.gneiss_brick_slab": "Gneissteinplatte", - "block.mineralogy.gneiss_smooth": "Polierter Gneis", - "block.mineralogy.gneiss_smooth_stairs": "Polierte Gneistreppe", - "block.mineralogy.gneiss_smooth_slab": "Polierte Gneisplatte", - "block.mineralogy.gneiss_smooth_brick": "Polierter Gneisstein", - "block.mineralogy.gneiss_smooth_brick_stairs": "Polierte Gneisziegeltreppen", - "block.mineralogy.gneiss_smooth_brick_slab": "Polierte Gneissteinplatte", + "block.mineralogy.gneiss_stairs": "Treppe aus Gneis", + "block.mineralogy.gneiss_slab": "Stufe aus Gneis", + "block.mineralogy.gneiss_brick": "Ziegel aus Gneis", + "block.mineralogy.gneiss_brick_stairs": "Ziegeltreppe aus Gneis", + "block.mineralogy.gneiss_brick_slab": "Ziegelstufe aus Gneis", + "block.mineralogy.gneiss_smooth": "Polierter Block aus Gneis", + "block.mineralogy.gneiss_smooth_stairs": "Polierte Treppe aus Gneis", + "block.mineralogy.gneiss_smooth_slab": "Polierte Stufe aus Gneis", + "block.mineralogy.gneiss_smooth_brick": "Polierte Ziegel aus Gneis", + "block.mineralogy.gneiss_smooth_brick_stairs": "Polierte Ziegeltreppe aus Gneis", + "block.mineralogy.gneiss_smooth_brick_slab": "Polierte Ziegelstufe aus Gneis", "block.mineralogy.marble": "Marmor", - "block.mineralogy.marble_stairs": "Marmortreppe", - "block.mineralogy.marble_slab": "Marmorplatte", - "block.mineralogy.marble_brick": "Marmor Backstein", - "block.mineralogy.marble_brick_stairs": "Marmor Backstein Treppe", - "block.mineralogy.marble_brick_slab": "Marmor Ziegelplatte", - "block.mineralogy.marble_smooth": "Polierter Marmor", - "block.mineralogy.marble_smooth_stairs": "Polierte Marmortreppe", - "block.mineralogy.marble_smooth_slab": "Polierte Marmorplatte", - "block.mineralogy.marble_smooth_brick": "Polierter Marmor Ziegelstein", - "block.mineralogy.marble_smooth_brick_stairs": "Polierte Marmor Ziegelstein Treppen", - "block.mineralogy.marble_smooth_brick_slab": "Polierte Marmor Ziegelstein Platte", + "block.mineralogy.marble_stairs": "Treppe aus Marmor", + "block.mineralogy.marble_slab": "Stufe aus Marmor", + "block.mineralogy.marble_brick": "Ziegel aus Marmor", + "block.mineralogy.marble_brick_stairs": "Ziegeltreppe aus Marmor", + "block.mineralogy.marble_brick_slab": "Ziegelstufe aus Marmor", + "block.mineralogy.marble_smooth": "Polierter Block aus Marmor", + "block.mineralogy.marble_smooth_stairs": "Polierte Treppe aus Marmor", + "block.mineralogy.marble_smooth_slab": "Polierte Stufe aus Marmor", + "block.mineralogy.marble_smooth_brick": "Polierte Ziegel aus Marmor", + "block.mineralogy.marble_smooth_brick_stairs": "Polierte Ziegeltreppe aus Marmor", + "block.mineralogy.marble_smooth_brick_slab": "Polierte Ziegelstufe aus Marmor", "block.mineralogy.phyllite": "Phyllit", - "block.mineralogy.phyllite_stairs": "Phyllit Treppen", - "block.mineralogy.phyllite_slab": "Phyllitplatte", - "block.mineralogy.phyllite_brick": "Phyllitstein", - "block.mineralogy.phyllite_brick_stairs": "Phyllite-Ziegelstein-Treppen", - "block.mineralogy.phyllite_brick_slab": "Phyllite-Ziegelstein-Platte", - "block.mineralogy.phyllite_smooth": "Polierter Phyllit", - "block.mineralogy.phyllite_smooth_stairs": "Polierte Phyllit Treppen", - "block.mineralogy.phyllite_smooth_slab": "Polierte Phyllitplatte", - "block.mineralogy.phyllite_smooth_brick": "Polierter Phyllit-Stein", - "block.mineralogy.phyllite_smooth_brick_stairs": "Polierte Phyllit-Ziegelstein-Treppe", - "block.mineralogy.phyllite_smooth_brick_slab": "Polierte Phyllit-Ziegelsteinplatte", + "block.mineralogy.phyllite_stairs": "Treppe aus Phyllit", + "block.mineralogy.phyllite_slab": "Stufe aus Phyllit", + "block.mineralogy.phyllite_brick": "Ziegel aus Phyllit", + "block.mineralogy.phyllite_brick_stairs": "Ziegeltreppe aus Phyllit", + "block.mineralogy.phyllite_brick_slab": "Ziegelstufe aus Phyllit", + "block.mineralogy.phyllite_smooth": "Polierter Block aus Phyllit", + "block.mineralogy.phyllite_smooth_stairs": "Polierte Treppe aus Phyllit", + "block.mineralogy.phyllite_smooth_slab": "Polierte Stufe aus Phyllit", + "block.mineralogy.phyllite_smooth_brick": "Polierte Ziegel aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_slab": "Polierte Ziegelstufe aus Phyllit", "block.mineralogy.amphibolite": "Amphibolit", - "block.mineralogy.amphibolite_stairs": "Amphibolit Treppen", - "block.mineralogy.amphibolite_slab": "Amphibolit-Platte", - "block.mineralogy.amphibolite_brick": "Amphibolitstein", - "block.mineralogy.amphibolite_brick_stairs": "Amphibolit-Ziegelstein-Treppe", - "block.mineralogy.amphibolite_brick_slab": "Amphibolit-Ziegelstein-Platte", - "block.mineralogy.amphibolite_smooth": "Polierter Amphibolit", - "block.mineralogy.amphibolite_smooth_stairs": "Polierte Amphibolit Treppen", - "block.mineralogy.amphibolite_smooth_slab": "Polierte Amphibolitplatte", - "block.mineralogy.amphibolite_smooth_brick": "Polierter Amphibolit-Stein", - "block.mineralogy.amphibolite_smooth_brick_stairs": "Polierte Amphibolit-Ziegelstein-Treppe", - "block.mineralogy.amphibolite_smooth_brick_slab": "Polierte Amphibolit-Ziegelstein-Platte", - "item.mineralogy.gypsum_dust": "Gips Staub", - "item.mineralogy.sulfur_dust": "Schwefel Staub", - "item.mineralogy.phosphorous_dust": "Phosphor Staub", - "item.mineralogy.nitrate_dust": "Nitrat Staub", + "block.mineralogy.amphibolite_stairs": "Treppe aus Amphibolit", + "block.mineralogy.amphibolite_slab": "Stufe aus Amphibolit", + "block.mineralogy.amphibolite_brick": "Ziegel aus Amphibolit", + "block.mineralogy.amphibolite_brick_stairs": "Ziegeltreppe aus Amphibolit", + "block.mineralogy.amphibolite_brick_slab": "Ziegelstufe aus Amphibolit", + "block.mineralogy.amphibolite_smooth": "Polierter Block aus Amphibolit", + "block.mineralogy.amphibolite_smooth_stairs": "Polierte Treppe aus Amphibolit", + "block.mineralogy.amphibolite_smooth_slab": "Polierte Stufe aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick": "Polierte Ziegel aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_slab": "Polierte Ziegelstufe aus Amphibolit", + "item.mineralogy.gypsum_dust": "Gipspulver", + "item.mineralogy.sulfur_dust": "Schwefelpulver", + "item.mineralogy.phosphorous_dust": "Phosphorpulver", + "item.mineralogy.nitrate_dust": "Nitratpulver", "item.mineralogy.mineral_fertilizer": "Mineraldünger", - "block.mineralogy.chert": "Chert", + "block.mineralogy.chert": "Hornstein", "block.mineralogy.gypsum": "Gips", "block.mineralogy.pumice": "Bimsstein", "block.mineralogy.sulfur_block": "Schwefel", @@ -204,727 +204,737 @@ "block.mineralogy.phosphorous_block": "Phosphor", "block.mineralogy.phosphorous_ore": "Phosphorerz", "block.mineralogy.nitrate_block": "Nitrat", - "block.mineralogy.nitrate_ore": "Nitrat-Erz", - "block.mineralogy.drywall_black": "Schwarzer Trockenbau", - "block.mineralogy.drywall_red": "Roter Trockenbau", - "block.mineralogy.drywall_green": "Grüner Trockenbau", - "block.mineralogy.drywall_brown": "Brauner Trockenbau", - "block.mineralogy.drywall_blue": "Blaue Trockenmauer", - "block.mineralogy.drywall_purple": "Lila Trockenbau", - "block.mineralogy.drywall_cyan": "Cyan Trockenbau", - "block.mineralogy.drywall_silver": "Silberner Trockenbau", - "block.mineralogy.drywall_gray": "Graue Trockenmauer", - "block.mineralogy.drywall_pink": "Rosa Trockenbau", - "block.mineralogy.drywall_lime": "Kalk Trockenbau", - "block.mineralogy.drywall_yellow": "Gelber Trockenbau", - "block.mineralogy.drywall_light_blue": "Hellblaue Trockenmauer", - "block.mineralogy.drywall_magenta": "Magenta Trockenbau", - "block.mineralogy.drywall_orange": "Orange Trockenbau", - "block.mineralogy.drywall_white": "Weißer Trockenbau", - "block.mineralogy.andesite_wall": "Andesit-Wand", - "block.mineralogy.andesite_brick_wall": "Andesit-Backsteinmauer", - "block.mineralogy.andesite_smooth_wall": "Andesite polierte Wand", - "block.mineralogy.andesite_smooth_brick_wall": "Andesite polierte Backsteinmauer", - "block.mineralogy.basalt_wall": "Basaltmauer", - "block.mineralogy.basalt_brick_wall": "Basalt-Backsteinmauer", - "block.mineralogy.basalt_smooth_wall": "Basalt polierte Wand", - "block.mineralogy.basalt_smooth_brick_wall": "Basalt polierte Backsteinmauer", - "block.mineralogy.diorite_wall": "Dioritwand", - "block.mineralogy.diorite_brick_wall": "Diorit-Ziegelmauer", - "block.mineralogy.diorite_smooth_wall": "Diorite polierte Wand", - "block.mineralogy.diorite_smooth_brick_wall": "Diorite polierte Backsteinmauer", - "block.mineralogy.granite_wall": "Granitwand", - "block.mineralogy.granite_brick_wall": "Granit-Backsteinmauer", - "block.mineralogy.granite_smooth_wall": "Granit poliert Wand", - "block.mineralogy.granite_smooth_brick_wall": "Granit poliert Ziegelmauer", - "block.mineralogy.rhyolite_wall": "Rhyolithwand", - "block.mineralogy.rhyolite_brick_wall": "Rhyolith-Backsteinmauer", - "block.mineralogy.rhyolite_smooth_wall": "Rhyolith poliert Wand", - "block.mineralogy.rhyolite_smooth_brick_wall": "Rhyolith polierte Backsteinmauer", - "block.mineralogy.pegmatite_wall": "Pegmatitwand", - "block.mineralogy.pegmatite_brick_wall": "Pegmatite-Ziegelmauer", - "block.mineralogy.pegmatite_smooth_wall": "Pegmatite polierte Wand", - "block.mineralogy.pegmatite_smooth_brick_wall": "Pegmatite polierte Backsteinmauer", - "block.mineralogy.shale_wall": "Schieferwand", - "block.mineralogy.shale_brick_wall": "Schiefer Ziegelwand", - "block.mineralogy.shale_smooth_wall": "Schiefer poliert Wand", - "block.mineralogy.shale_smooth_brick_wall": "Schiefer poliert Ziegelmauer", - "block.mineralogy.conglomerate_wall": "Konglomeratwand", - "block.mineralogy.conglomerate_brick_wall": "Konglomerat Ziegelwand", - "block.mineralogy.conglomerate_smooth_wall": "Konglomerat polierte Wand", - "block.mineralogy.conglomerate_smooth_brick_wall": "Konglomerat polierte Backsteinmauer", - "block.mineralogy.dolomite_wall": "Dolomitenwand", - "block.mineralogy.dolomite_brick_wall": "Dolomit-Ziegelmauer", - "block.mineralogy.dolomite_smooth_wall": "Dolomit polierte Wand", - "block.mineralogy.dolomite_smooth_brick_wall": "Dolomit polierte Ziegelmauer", - "block.mineralogy.limestone_wall": "Kalksteinmauer", - "block.mineralogy.limestone_brick_wall": "Kalkstein-Backsteinmauer", - "block.mineralogy.limestone_smooth_wall": "Kalkstein polierte Wand", - "block.mineralogy.limestone_smooth_brick_wall": "Kalkstein poliert Ziegelmauer", - "block.mineralogy.marble_wall": "Marmorwand", - "block.mineralogy.marble_brick_wall": "Marmor Backsteinmauer", - "block.mineralogy.marble_smooth_wall": "Marmor poliert Wand", - "block.mineralogy.marble_smooth_brick_wall": "Marmor poliert Ziegelmauer", - "block.mineralogy.slate_wall": "Schieferwand", - "block.mineralogy.slate_brick_wall": "Schiefer-Backsteinmauer", - "block.mineralogy.slate_smooth_wall": "Schiefer polierte Wand", - "block.mineralogy.slate_smooth_brick_wall": "Schiefer polierte Backsteinmauer", - "block.mineralogy.schist_wall": "Schieferwand", - "block.mineralogy.schist_brick_wall": "Schiefer-Backsteinmauer", - "block.mineralogy.schist_smooth_wall": "Schiefer polierte Wand", - "block.mineralogy.schist_smooth_brick_wall": "Schiefer polierte Backsteinmauer", - "block.mineralogy.gneiss_wall": "Gneismauer", - "block.mineralogy.gneiss_brick_wall": "Gneis-Backsteinmauer", - "block.mineralogy.gneiss_smooth_wall": "Gneis polierte Wand", - "block.mineralogy.gneiss_smooth_brick_wall": "Gneis polierte Backsteinmauer", - "block.mineralogy.phyllite_wall": "Phyllitwand", - "block.mineralogy.phyllite_brick_wall": "Phyllit-Ziegelmauer", - "block.mineralogy.phyllite_smooth_wall": "Phyllite polierte Wand", - "block.mineralogy.phyllite_smooth_brick_wall": "Phyllite polierte Backsteinmauer", - "block.mineralogy.amphibolite_wall": "Amphibolit Wand", - "block.mineralogy.amphibolite_brick_wall": "Amphibolit-Backsteinmauer", - "block.mineralogy.amphibolite_smooth_wall": "Amphibolit poliert Wand", - "block.mineralogy.amphibolite_smooth_brick_wall": "Amphibolite polierte Backsteinmauer", - "block.mineralogy.andesite_furnace": "Andesit-Ofen", - "block.mineralogy.andesite_brick_furnace": "Andesit-Ziegelofen", - "block.mineralogy.andesite_smooth_furnace": "Andesite polierte Ofen", - "block.mineralogy.andesite_smooth_brick_furnace": "Andesite polierte Ziegelofen", - "block.mineralogy.basalt_furnace": "Basaltmauer", - "block.mineralogy.basalt_brick_furnace": "Basalt-Ziegelofen", - "block.mineralogy.basalt_smooth_furnace": "Basalt polierte Ofen", - "block.mineralogy.basalt_smooth_brick_furnace": "Basalt polierte Ziegelofen", - "block.mineralogy.diorite_furnace": "Dioritwand", - "block.mineralogy.diorite_brick_furnace": "Diorit-Ziegelofen", - "block.mineralogy.diorite_smooth_furnace": "Diorite polierte Ofen", - "block.mineralogy.diorite_smooth_brick_furnace": "Diorite polierte Ziegelofen", - "block.mineralogy.granite_furnace": "Granitwand", - "block.mineralogy.granite_brick_furnace": "Granit-Ziegelofen", - "block.mineralogy.granite_smooth_furnace": "Granit poliert Ofen", - "block.mineralogy.granite_smooth_brick_furnace": "Granit poliert Ziegelofen", - "block.mineralogy.rhyolite_furnace": "Rhyolithwand", - "block.mineralogy.rhyolite_brick_furnace": "Rhyolith-Ziegelofen", - "block.mineralogy.rhyolite_smooth_furnace": "Rhyolith poliert Ofen", - "block.mineralogy.rhyolite_smooth_brick_furnace": "Rhyolith polierte Ziegelofen", - "block.mineralogy.pegmatite_furnace": "Pegmatitwand", - "block.mineralogy.pegmatite_brick_furnace": "Pegmatite-Ziegelofen", - "block.mineralogy.pegmatite_smooth_furnace": "Pegmatite polierte Ofen", - "block.mineralogy.pegmatite_smooth_brick_furnace": "Pegmatite polierte Ziegelofen", - "block.mineralogy.shale_furnace": "Schieferwand", - "block.mineralogy.shale_brick_furnace": "Schiefer Ziegelwand", - "block.mineralogy.shale_smooth_furnace": "Schiefer poliert Ofen", - "block.mineralogy.shale_smooth_brick_furnace": "Schiefer poliert Ziegelofen", - "block.mineralogy.conglomerate_furnace": "Konglomeratwand", - "block.mineralogy.conglomerate_brick_furnace": "Konglomerat Ziegelwand", - "block.mineralogy.conglomerate_smooth_furnace": "Konglomerat polierte Ofen", - "block.mineralogy.conglomerate_smooth_brick_furnace": "Konglomerat polierte Ziegelofen", - "block.mineralogy.dolomite_furnace": "Dolomitenwand", - "block.mineralogy.dolomite_brick_furnace": "Dolomit-Ziegelofen", - "block.mineralogy.dolomite_smooth_furnace": "Dolomit polierte Ofen", - "block.mineralogy.dolomite_smooth_brick_furnace": "Dolomit polierte Ziegelofen", - "block.mineralogy.limestone_furnace": "Kalksteinmauer", - "block.mineralogy.limestone_brick_furnace": "Kalkstein-Ziegelofen", - "block.mineralogy.limestone_smooth_furnace": "Kalkstein polierte Ofen", - "block.mineralogy.limestone_smooth_brick_furnace": "Kalkstein poliert Ziegelofen", - "block.mineralogy.marble_furnace": "Marmorwand", - "block.mineralogy.marble_brick_furnace": "Marmor Ziegelofen", - "block.mineralogy.marble_smooth_furnace": "Marmor poliert Ofen", - "block.mineralogy.marble_smooth_brick_furnace": "Marmor poliert Ziegelofen", - "block.mineralogy.slate_furnace": "Schieferwand", - "block.mineralogy.slate_brick_furnace": "Schiefer-Ziegelofen", - "block.mineralogy.slate_smooth_furnace": "Schiefer polierte Ofen", - "block.mineralogy.slate_smooth_brick_furnace": "Schiefer polierte Ziegelofen", - "block.mineralogy.schist_furnace": "Schieferwand", - "block.mineralogy.schist_brick_furnace": "Schiefer-Ziegelofen", - "block.mineralogy.schist_smooth_furnace": "Schiefer polierte Ofen", - "block.mineralogy.schist_smooth_brick_furnace": "Schiefer polierte Ziegelofen", - "block.mineralogy.gneiss_furnace": "Gneismauer", - "block.mineralogy.gneiss_brick_furnace": "Gneis-Ziegelofen", - "block.mineralogy.gneiss_smooth_furnace": "Gneis polierte Ofen", - "block.mineralogy.gneiss_smooth_brick_furnace": "Gneis polierte Ziegelofen", - "block.mineralogy.phyllite_furnace": "Phyllitwand", - "block.mineralogy.phyllite_brick_furnace": "Phyllit-Ziegelofen", - "block.mineralogy.phyllite_smooth_furnace": "Phyllite polierte Ofen", - "block.mineralogy.phyllite_smooth_brick_furnace": "Phyllite polierte Ziegelofen", - "block.mineralogy.amphibolite_furnace": "Amphibolit Ofen", - "block.mineralogy.amphibolite_brick_furnace": "Amphibolit-Ziegelofen", - "block.mineralogy.amphibolite_smooth_furnace": "Amphibolit poliert Ofen", - "block.mineralogy.amphibolite_smooth_brick_furnace": "Amphibolite polierte Ziegelofen", + "block.mineralogy.nitrate_ore": "Nitraterz", + "block.mineralogy.drywall_black": "Gipskartonplatte (Schwarz)", + "block.mineralogy.drywall_red": "Gipskartonplatte (Rot)", + "block.mineralogy.drywall_green": "Gipskartonplatte (Grün)", + "block.mineralogy.drywall_brown": "Gipskartonplatte (Braun)", + "block.mineralogy.drywall_blue": "Gipskartonplatte (Blau)", + "block.mineralogy.drywall_purple": "Gipskartonplatte (Violett)", + "block.mineralogy.drywall_cyan": "Gipskartonplatte (Türkis)", + "block.mineralogy.drywall_silver": "Gipskartonplatte (Hellgrau)", + "block.mineralogy.drywall_gray": "Gipskartonplatte (Grau)", + "block.mineralogy.drywall_pink": "Gipskartonplatte (Rosa)", + "block.mineralogy.drywall_lime": "Gipskartonplatte (Hellgrün)", + "block.mineralogy.drywall_yellow": "Gipskartonplatte (Gelb)", + "block.mineralogy.drywall_light_blue": "Gipskartonplatte (Hellblau)", + "block.mineralogy.drywall_magenta": "Gipskartonplatte (Magenta)", + "block.mineralogy.drywall_orange": "Gipskartonplatte (Orange)", + "block.mineralogy.drywall_white": "Gipskartonplatte (Weiß)", + "block.mineralogy.andesite_wall": "Mauer aus Andesit", + "block.mineralogy.andesite_brick_wall": "Ziegelmauer aus Andesit", + "block.mineralogy.andesite_smooth_wall": "Polierte Mauer aus Andesit", + "block.mineralogy.andesite_smooth_brick_wall": "Polierte Ziegelmauer aus Andesit", + "block.mineralogy.basalt_wall": "Mauer aus Basalt", + "block.mineralogy.basalt_brick_wall": "Ziegelmauer aus Basalt", + "block.mineralogy.basalt_smooth_wall": "Polierte Mauer aus Basalt", + "block.mineralogy.basalt_smooth_brick_wall": "Polierte Ziegelmauer aus Basalt", + "block.mineralogy.diorite_wall": "Mauer aus Diorit", + "block.mineralogy.diorite_brick_wall": "Ziegelmauer aus Diorit", + "block.mineralogy.diorite_smooth_wall": "Polierte Mauer aus Diorit", + "block.mineralogy.diorite_smooth_brick_wall": "Polierte Ziegelmauer aus Diorit", + "block.mineralogy.granite_wall": "Mauer aus Granit", + "block.mineralogy.granite_brick_wall": "Ziegelmauer aus Granit", + "block.mineralogy.granite_smooth_wall": "Polierte Mauer aus Granit", + "block.mineralogy.granite_smooth_brick_wall": "Polierte Ziegelmauer aus Granit", + "block.mineralogy.rhyolite_wall": "Mauer aus Rhyolith", + "block.mineralogy.rhyolite_brick_wall": "Ziegelmauer aus Rhyolith", + "block.mineralogy.rhyolite_smooth_wall": "Polierte Mauer aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_wall": "Polierte Ziegelmauer aus Rhyolith", + "block.mineralogy.pegmatite_wall": "Mauer aus Pegmatit", + "block.mineralogy.pegmatite_brick_wall": "Ziegelmauer aus Pegmatit", + "block.mineralogy.pegmatite_smooth_wall": "Polierte Mauer aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_wall": "Polierte Ziegelmauer aus Pegmatit", + "block.mineralogy.shale_wall": "Mauer aus Tonschiefer", + "block.mineralogy.shale_brick_wall": "Ziegelmauer aus Tonschiefer", + "block.mineralogy.shale_smooth_wall": "Polierte Mauer aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_wall": "Polierte Ziegelmauer aus Tonschiefer", + "block.mineralogy.conglomerate_wall": "Mauer aus Konglomerat", + "block.mineralogy.conglomerate_brick_wall": "Ziegelmauer aus Konglomerat", + "block.mineralogy.conglomerate_smooth_wall": "Polierte Mauer aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_wall": "Polierte Ziegelmauer aus Konglomerat", + "block.mineralogy.dolomite_wall": "Mauer aus Dolomit", + "block.mineralogy.dolomite_brick_wall": "Ziegelmauer aus Dolomit", + "block.mineralogy.dolomite_smooth_wall": "Polierte Mauer aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_wall": "Polierte Ziegelmauer aus Dolomit", + "block.mineralogy.limestone_wall": "Mauer aus Kalkstein", + "block.mineralogy.limestone_brick_wall": "Ziegelmauer aus Kalkstein", + "block.mineralogy.limestone_smooth_wall": "Polierte Mauer aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_wall": "Polierte Ziegelmauer aus Kalkstein", + "block.mineralogy.marble_wall": "Mauer aus Marmor", + "block.mineralogy.marble_brick_wall": "Ziegelmauer aus Marmor", + "block.mineralogy.marble_smooth_wall": "Polierte Mauer aus Marmor", + "block.mineralogy.marble_smooth_brick_wall": "Polierte Ziegelmauer aus Marmor", + "block.mineralogy.slate_wall": "Mauer aus Schiefer", + "block.mineralogy.slate_brick_wall": "Ziegelmauer aus Schiefer", + "block.mineralogy.slate_smooth_wall": "Polierte Mauer aus Schiefer", + "block.mineralogy.slate_smooth_brick_wall": "Polierte Ziegelmauer aus Schiefer", + "block.mineralogy.schist_wall": "Mauer aus Glimmerschiefer", + "block.mineralogy.schist_brick_wall": "Ziegelmauer aus Glimmerschiefer", + "block.mineralogy.schist_smooth_wall": "Polierte Mauer aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_wall": "Polierte Ziegelmauer aus Glimmerschiefer", + "block.mineralogy.gneiss_wall": "Mauer aus Gneis", + "block.mineralogy.gneiss_brick_wall": "Ziegelmauer aus Gneis", + "block.mineralogy.gneiss_smooth_wall": "Polierte Mauer aus Gneis", + "block.mineralogy.gneiss_smooth_brick_wall": "Polierte Ziegelmauer aus Gneis", + "block.mineralogy.phyllite_wall": "Mauer aus Phyllit", + "block.mineralogy.phyllite_brick_wall": "Ziegelmauer aus Phyllit", + "block.mineralogy.phyllite_smooth_wall": "Polierte Mauer aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_wall": "Polierte Ziegelmauer aus Phyllit", + "block.mineralogy.amphibolite_wall": "Mauer aus Amphibolit", + "block.mineralogy.amphibolite_brick_wall": "Ziegelmauer aus Amphibolit", + "block.mineralogy.amphibolite_smooth_wall": "Polierte Mauer aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_wall": "Polierte Ziegelmauer aus Amphibolit", + "block.mineralogy.andesite_furnace": "Ofen aus Andesit", + "block.mineralogy.andesite_brick_furnace": "Ziegelofen aus Andesit", + "block.mineralogy.andesite_smooth_furnace": "Polierter Ofen aus Andesit", + "block.mineralogy.andesite_smooth_brick_furnace": "Polierter Ziegelofen aus Andesit", + "block.mineralogy.basalt_furnace": "Ofen aus Basalt", + "block.mineralogy.basalt_brick_furnace": "Ziegelofen aus Basalt", + "block.mineralogy.basalt_smooth_furnace": "Polierter Ofen aus Basalt", + "block.mineralogy.basalt_smooth_brick_furnace": "Polierter Ziegelofen aus Basalt", + "block.mineralogy.diorite_furnace": "Ofen aus Diorit", + "block.mineralogy.diorite_brick_furnace": "Ziegelofen aus Diorit", + "block.mineralogy.diorite_smooth_furnace": "Polierter Ofen aus Diorit", + "block.mineralogy.diorite_smooth_brick_furnace": "Polierter Ziegelofen aus Diorit", + "block.mineralogy.granite_furnace": "Ofen aus Granit", + "block.mineralogy.granite_brick_furnace": "Ziegelofen aus Granit", + "block.mineralogy.granite_smooth_furnace": "Polierter Ofen aus Granit", + "block.mineralogy.granite_smooth_brick_furnace": "Polierter Ziegelofen aus Granit", + "block.mineralogy.rhyolite_furnace": "Ofen aus Rhyolith", + "block.mineralogy.rhyolite_brick_furnace": "Ziegelofen aus Rhyolith", + "block.mineralogy.rhyolite_smooth_furnace": "Polierter Ofen aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Polierter Ziegelofen aus Rhyolith", + "block.mineralogy.pegmatite_furnace": "Ofen aus Pegmatit", + "block.mineralogy.pegmatite_brick_furnace": "Ziegelofen aus Pegmatit", + "block.mineralogy.pegmatite_smooth_furnace": "Polierter Ofen aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Polierter Ziegelofen aus Pegmatit", + "block.mineralogy.shale_furnace": "Ofen aus Tonschiefer", + "block.mineralogy.shale_brick_furnace": "Ziegelofen aus Tonschiefer", + "block.mineralogy.shale_smooth_furnace": "Polierter Ofen aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_furnace": "Polierter Ziegelofen aus Tonschiefer", + "block.mineralogy.conglomerate_furnace": "Ofen aus Konglomerat", + "block.mineralogy.conglomerate_brick_furnace": "Ziegelofen aus Konglomerat", + "block.mineralogy.conglomerate_smooth_furnace": "Polierter Ofen aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Polierter Ziegelofen aus Konglomerat", + "block.mineralogy.dolomite_furnace": "Ofen aus Dolomit", + "block.mineralogy.dolomite_brick_furnace": "Ziegelofen aus Dolomit", + "block.mineralogy.dolomite_smooth_furnace": "Polierter Ofen aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_furnace": "Polierter Ziegelofen aus Dolomit", + "block.mineralogy.limestone_furnace": "Ofen aus Kalkstein", + "block.mineralogy.limestone_brick_furnace": "Ziegelofen aus Kalkstein", + "block.mineralogy.limestone_smooth_furnace": "Polierter Ofen aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_furnace": "Polierter Ziegelofen aus Kalkstein", + "block.mineralogy.marble_furnace": "Ofen aus Marmor", + "block.mineralogy.marble_brick_furnace": "Ziegelofen aus Marmor", + "block.mineralogy.marble_smooth_furnace": "Polierter Ofen aus Marmor", + "block.mineralogy.marble_smooth_brick_furnace": "Polierter Ziegelofen aus Marmor", + "block.mineralogy.slate_furnace": "Ofen aus Schiefer", + "block.mineralogy.slate_brick_furnace": "Ziegelofen aus Schiefer", + "block.mineralogy.slate_smooth_furnace": "Polierter Ofen aus Schiefer", + "block.mineralogy.slate_smooth_brick_furnace": "Polierter Ziegelofen aus Schiefer", + "block.mineralogy.schist_furnace": "Ofen aus Glimmerschiefer", + "block.mineralogy.schist_brick_furnace": "Ziegelofen aus Glimmerschiefer", + "block.mineralogy.schist_smooth_furnace": "Polierter Ofen aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_furnace": "Polierter Ziegelofen aus Glimmerschiefer", + "block.mineralogy.gneiss_furnace": "Ofen aus Gneis", + "block.mineralogy.gneiss_brick_furnace": "Ziegelofen aus Gneis", + "block.mineralogy.gneiss_smooth_furnace": "Polierter Ofen aus Gneis", + "block.mineralogy.gneiss_smooth_brick_furnace": "Polierter Ziegelofen aus Gneis", + "block.mineralogy.phyllite_furnace": "Ofen aus Phyllit", + "block.mineralogy.phyllite_brick_furnace": "Ziegelofen aus Phyllit", + "block.mineralogy.phyllite_smooth_furnace": "Polierter Ofen aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_furnace": "Polierter Ziegelofen aus Phyllit", + "block.mineralogy.amphibolite_furnace": "Ofen aus Amphibolit", + "block.mineralogy.amphibolite_brick_furnace": "Ziegelofen aus Amphibolit", + "block.mineralogy.amphibolite_smooth_furnace": "Polierter Ofen aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Polierter Ziegelofen aus Amphibolit", "block.mineralogy.diabase": "Diabas", - "block.mineralogy.diabase_stairs": "Diabas Treppe", - "block.mineralogy.diabase_slab": "Diabas Platte", - "block.mineralogy.diabase_brick": "Diabas Backstein", - "block.mineralogy.diabase_brick_stairs": "Diabas Ziegelsteintreppen", - "block.mineralogy.diabase_brick_slab": "Diabas Ziegelplatte", - "block.mineralogy.diabase_smooth": "Polished Diabas", - "block.mineralogy.diabase_smooth_stairs": "Diabas Polierte Treppe", - "block.mineralogy.diabase_smooth_slab": "Diabas Polierte Platte", - "block.mineralogy.diabase_smooth_brick": "Diabas Polierter Ziegelstein", - "block.mineralogy.diabase_smooth_brick_stairs": "Diabas Polierte Ziegelsteintreppen", - "block.mineralogy.diabase_smooth_brick_slab": "Diabas Polierte Ziegelplatte", - "block.mineralogy.diabase_wall": "Diabas Wand", - "block.mineralogy.diabase_brick_wall": "Diabas Ziegelwand", - "block.mineralogy.diabase_smooth_wall": "Diabas Polierte Wand", - "block.mineralogy.diabase_smooth_brick_wall": "Diabas Polierte Backsteinmauer", - "block.mineralogy.diabase_furnace": "Diabas Ofen", - "block.mineralogy.diabase_brick_furnace": "Diabas Ziegelofen", - "block.mineralogy.diabase_smooth_furnace": "Diabas Polierter Ofen", - "block.mineralogy.diabase_smooth_brick_furnace": "Diabas Polierter Ziegelofen", + "block.mineralogy.diabase_stairs": "Treppe aus Diabas", + "block.mineralogy.diabase_slab": "Stufe aus Diabas", + "block.mineralogy.diabase_brick": "Ziegel aus Diabas", + "block.mineralogy.diabase_brick_stairs": "Ziegeltreppe aus Diabas", + "block.mineralogy.diabase_brick_slab": "Ziegelstufe aus Diabas", + "block.mineralogy.diabase_smooth": "Polierter Block aus Diabas", + "block.mineralogy.diabase_smooth_stairs": "Polierte Treppe aus Diabas", + "block.mineralogy.diabase_smooth_slab": "Polierte Stufe aus Diabas", + "block.mineralogy.diabase_smooth_brick": "Polierte Ziegel aus Diabas", + "block.mineralogy.diabase_smooth_brick_stairs": "Polierte Ziegeltreppe aus Diabas", + "block.mineralogy.diabase_smooth_brick_slab": "Polierte Ziegelstufe aus Diabas", + "block.mineralogy.diabase_wall": "Mauer aus Diabas", + "block.mineralogy.diabase_brick_wall": "Ziegelmauer aus Diabas", + "block.mineralogy.diabase_smooth_wall": "Polierte Mauer aus Diabas", + "block.mineralogy.diabase_smooth_brick_wall": "Polierte Ziegelmauer aus Diabas", + "block.mineralogy.diabase_furnace": "Ofen aus Diabas", + "block.mineralogy.diabase_brick_furnace": "Ziegelofen aus Diabas", + "block.mineralogy.diabase_smooth_furnace": "Polierter Ofen aus Diabas", + "block.mineralogy.diabase_smooth_brick_furnace": "Polierter Ziegelofen aus Diabas", "block.mineralogy.gabbro": "Gabbro", - "block.mineralogy.gabbro_stairs": "Gabbro Treppe", - "block.mineralogy.gabbro_slab": "Gabbro Platte", - "block.mineralogy.gabbro_brick": "Gabbro Backstein", - "block.mineralogy.gabbro_brick_stairs": "Gabbro Ziegelsteintreppen", - "block.mineralogy.gabbro_brick_slab": "Gabbro Ziegelplatte", - "block.mineralogy.gabbro_smooth": "Polished Gabbro", - "block.mineralogy.gabbro_smooth_stairs": "Gabbro Polierte Treppe", - "block.mineralogy.gabbro_smooth_slab": "Gabbro Polierte Platte", - "block.mineralogy.gabbro_smooth_brick": "Gabbro Polierter Ziegelstein", - "block.mineralogy.gabbro_smooth_brick_stairs": "Gabbro Polierte Ziegelsteintreppen", - "block.mineralogy.gabbro_smooth_brick_slab": "Gabbro Polierte Ziegelplatte", - "block.mineralogy.gabbro_wall": "Gabbro Wand", - "block.mineralogy.gabbro_brick_wall": "Gabbro Ziegelwand", - "block.mineralogy.gabbro_smooth_wall": "Gabbro Polierte Wand", - "block.mineralogy.gabbro_smooth_brick_wall": "Gabbro Polierte Backsteinmauer", - "block.mineralogy.gabbro_furnace": "Gabbro Ofen", - "block.mineralogy.gabbro_brick_furnace": "Gabbro Ziegelofen", - "block.mineralogy.gabbro_smooth_furnace": "Gabbro Polierter Ofen", - "block.mineralogy.gabbro_smooth_brick_furnace": "Gabbro Polierter Ziegelofen", + "block.mineralogy.gabbro_stairs": "Treppe aus Gabbro", + "block.mineralogy.gabbro_slab": "Stufe aus Gabbro", + "block.mineralogy.gabbro_brick": "Ziegel aus Gabbro", + "block.mineralogy.gabbro_brick_stairs": "Ziegeltreppe aus Gabbro", + "block.mineralogy.gabbro_brick_slab": "Ziegelstufe aus Gabbro", + "block.mineralogy.gabbro_smooth": "Polierter Block aus Gabbro", + "block.mineralogy.gabbro_smooth_stairs": "Polierte Treppe aus Gabbro", + "block.mineralogy.gabbro_smooth_slab": "Polierte Stufe aus Gabbro", + "block.mineralogy.gabbro_smooth_brick": "Polierte Ziegel aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Polierte Ziegeltreppe aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_slab": "Polierte Ziegelstufe aus Gabbro", + "block.mineralogy.gabbro_wall": "Mauer aus Gabbro", + "block.mineralogy.gabbro_brick_wall": "Ziegelmauer aus Gabbro", + "block.mineralogy.gabbro_smooth_wall": "Polierte Mauer aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_wall": "Polierte Ziegelmauer aus Gabbro", + "block.mineralogy.gabbro_furnace": "Ofen aus Gabbro", + "block.mineralogy.gabbro_brick_furnace": "Ziegelofen aus Gabbro", + "block.mineralogy.gabbro_smooth_furnace": "Polierter Ofen aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Polierter Ziegelofen aus Gabbro", "block.mineralogy.peridotite": "Peridotit", - "block.mineralogy.peridotite_stairs": "Peridotit Treppe", - "block.mineralogy.peridotite_slab": "Peridotit Platte", - "block.mineralogy.peridotite_brick": "Peridotit Backstein", - "block.mineralogy.peridotite_brick_stairs": "Peridotit Ziegelsteintreppen", - "block.mineralogy.peridotite_brick_slab": "Peridotit Ziegelplatte", - "block.mineralogy.peridotite_smooth": "Polished Peridotit", - "block.mineralogy.peridotite_smooth_stairs": "Peridotit Polierte Treppe", - "block.mineralogy.peridotite_smooth_slab": "Peridotit Polierte Platte", - "block.mineralogy.peridotite_smooth_brick": "Peridotit Polierter Ziegelstein", - "block.mineralogy.peridotite_smooth_brick_stairs": "Peridotit Polierte Ziegelsteintreppen", - "block.mineralogy.peridotite_smooth_brick_slab": "Peridotit Polierte Ziegelplatte", - "block.mineralogy.peridotite_wall": "Peridotit Wand", - "block.mineralogy.peridotite_brick_wall": "Peridotit Ziegelwand", - "block.mineralogy.peridotite_smooth_wall": "Peridotit Polierte Wand", - "block.mineralogy.peridotite_smooth_brick_wall": "Peridotit Polierte Backsteinmauer", - "block.mineralogy.peridotite_furnace": "Peridotit Ofen", - "block.mineralogy.peridotite_brick_furnace": "Peridotit Ziegelofen", - "block.mineralogy.peridotite_smooth_furnace": "Peridotit Polierter Ofen", - "block.mineralogy.peridotite_smooth_brick_furnace": "Peridotit Polierter Ziegelofen", + "block.mineralogy.peridotite_stairs": "Treppe aus Peridotit", + "block.mineralogy.peridotite_slab": "Stufe aus Peridotit", + "block.mineralogy.peridotite_brick": "Ziegel aus Peridotit", + "block.mineralogy.peridotite_brick_stairs": "Ziegeltreppe aus Peridotit", + "block.mineralogy.peridotite_brick_slab": "Ziegelstufe aus Peridotit", + "block.mineralogy.peridotite_smooth": "Polierter Block aus Peridotit", + "block.mineralogy.peridotite_smooth_stairs": "Polierte Treppe aus Peridotit", + "block.mineralogy.peridotite_smooth_slab": "Polierte Stufe aus Peridotit", + "block.mineralogy.peridotite_smooth_brick": "Polierte Ziegel aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_slab": "Polierte Ziegelstufe aus Peridotit", + "block.mineralogy.peridotite_wall": "Mauer aus Peridotit", + "block.mineralogy.peridotite_brick_wall": "Ziegelmauer aus Peridotit", + "block.mineralogy.peridotite_smooth_wall": "Polierte Mauer aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_wall": "Polierte Ziegelmauer aus Peridotit", + "block.mineralogy.peridotite_furnace": "Ofen aus Peridotit", + "block.mineralogy.peridotite_brick_furnace": "Ziegelofen aus Peridotit", + "block.mineralogy.peridotite_smooth_furnace": "Polierter Ofen aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_furnace": "Polierter Ziegelofen aus Peridotit", "block.mineralogy.basaltic_glass": "Basaltglas", - "block.mineralogy.basaltic_glass_stairs": "Basaltglas Treppe", - "block.mineralogy.basaltic_glass_slab": "Basaltglas Platte", - "block.mineralogy.basaltic_glass_brick": "Basaltglas Backstein", - "block.mineralogy.basaltic_glass_brick_stairs": "Basaltglas Ziegelsteintreppen", - "block.mineralogy.basaltic_glass_brick_slab": "Basaltglas Ziegelplatte", - "block.mineralogy.basaltic_glass_smooth": "Polished Basaltglas", - "block.mineralogy.basaltic_glass_smooth_stairs": "Basaltglas Polierte Treppe", - "block.mineralogy.basaltic_glass_smooth_slab": "Basaltglas Polierte Platte", - "block.mineralogy.basaltic_glass_smooth_brick": "Basaltglas Polierter Ziegelstein", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Basaltglas Polierte Ziegelsteintreppen", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "Basaltglas Polierte Ziegelplatte", - "block.mineralogy.basaltic_glass_wall": "Basaltglas Wand", - "block.mineralogy.basaltic_glass_brick_wall": "Basaltglas Ziegelwand", - "block.mineralogy.basaltic_glass_smooth_wall": "Basaltglas Polierte Wand", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "Basaltglas Polierte Backsteinmauer", - "block.mineralogy.basaltic_glass_furnace": "Basaltglas Ofen", - "block.mineralogy.basaltic_glass_brick_furnace": "Basaltglas Ziegelofen", - "block.mineralogy.basaltic_glass_smooth_furnace": "Basaltglas Polierter Ofen", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Basaltglas Polierter Ziegelofen", - "block.mineralogy.scoria": "Schlacke", - "block.mineralogy.scoria_stairs": "Schlacke Treppe", - "block.mineralogy.scoria_slab": "Schlacke Platte", - "block.mineralogy.scoria_brick": "Schlacke Backstein", - "block.mineralogy.scoria_brick_stairs": "Schlacke Ziegelsteintreppen", - "block.mineralogy.scoria_brick_slab": "Schlacke Ziegelplatte", - "block.mineralogy.scoria_smooth": "Polished Schlacke", - "block.mineralogy.scoria_smooth_stairs": "Schlacke Polierte Treppe", - "block.mineralogy.scoria_smooth_slab": "Schlacke Polierte Platte", - "block.mineralogy.scoria_smooth_brick": "Schlacke Polierter Ziegelstein", - "block.mineralogy.scoria_smooth_brick_stairs": "Schlacke Polierte Ziegelsteintreppen", - "block.mineralogy.scoria_smooth_brick_slab": "Schlacke Polierte Ziegelplatte", - "block.mineralogy.scoria_wall": "Schlacke Wand", - "block.mineralogy.scoria_brick_wall": "Schlacke Ziegelwand", - "block.mineralogy.scoria_smooth_wall": "Schlacke Polierte Wand", - "block.mineralogy.scoria_smooth_brick_wall": "Schlacke Polierte Backsteinmauer", - "block.mineralogy.scoria_furnace": "Schlacke Ofen", - "block.mineralogy.scoria_brick_furnace": "Schlacke Ziegelofen", - "block.mineralogy.scoria_smooth_furnace": "Schlacke Polierter Ofen", - "block.mineralogy.scoria_smooth_brick_furnace": "Schlacke Polierter Ziegelofen", - "block.mineralogy.tuff": "Tuff", - "block.mineralogy.tuff_stairs": "Tuff Treppe", - "block.mineralogy.tuff_slab": "Tuff Platte", - "block.mineralogy.tuff_brick": "Tuff Backstein", - "block.mineralogy.tuff_brick_stairs": "Tuff Ziegelsteintreppen", - "block.mineralogy.tuff_brick_slab": "Tuff Ziegelplatte", - "block.mineralogy.tuff_smooth": "Polished Tuff", - "block.mineralogy.tuff_smooth_stairs": "Tuff Polierte Treppe", - "block.mineralogy.tuff_smooth_slab": "Tuff Polierte Platte", - "block.mineralogy.tuff_smooth_brick": "Tuff Polierter Ziegelstein", - "block.mineralogy.tuff_smooth_brick_stairs": "Tuff Polierte Ziegelsteintreppen", - "block.mineralogy.tuff_smooth_brick_slab": "Tuff Polierte Ziegelplatte", - "block.mineralogy.tuff_wall": "Tuff Wand", - "block.mineralogy.tuff_brick_wall": "Tuff Ziegelwand", - "block.mineralogy.tuff_smooth_wall": "Tuff Polierte Wand", - "block.mineralogy.tuff_smooth_brick_wall": "Tuff Polierte Backsteinmauer", - "block.mineralogy.tuff_furnace": "Tuff Ofen", - "block.mineralogy.tuff_brick_furnace": "Tuff Ziegelofen", - "block.mineralogy.tuff_smooth_furnace": "Tuff Polierter Ofen", - "block.mineralogy.tuff_smooth_brick_furnace": "Tuff Polierter Ziegelofen", + "block.mineralogy.basaltic_glass_stairs": "Treppe aus Basaltglas", + "block.mineralogy.basaltic_glass_slab": "Stufe aus Basaltglas", + "block.mineralogy.basaltic_glass_brick": "Ziegel aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_stairs": "Ziegeltreppe aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_slab": "Ziegelstufe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth": "Polierter Block aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_stairs": "Polierte Treppe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_slab": "Polierte Stufe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick": "Polierte Ziegel aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Polierte Ziegeltreppe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Polierte Ziegelstufe aus Basaltglas", + "block.mineralogy.basaltic_glass_wall": "Mauer aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_wall": "Ziegelmauer aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_wall": "Polierte Mauer aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Polierte Ziegelmauer aus Basaltglas", + "block.mineralogy.basaltic_glass_furnace": "Ofen aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_furnace": "Ziegelofen aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_furnace": "Polierter Ofen aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Polierter Ziegelofen aus Basaltglas", + "block.mineralogy.scoria": "Skoria", + "block.mineralogy.scoria_stairs": "Treppe aus Skoria", + "block.mineralogy.scoria_slab": "Stufe aus Skoria", + "block.mineralogy.scoria_brick": "Ziegel aus Skoria", + "block.mineralogy.scoria_brick_stairs": "Ziegeltreppe aus Skoria", + "block.mineralogy.scoria_brick_slab": "Ziegelstufe aus Skoria", + "block.mineralogy.scoria_smooth": "Polierter Block aus Skoria", + "block.mineralogy.scoria_smooth_stairs": "Polierte Treppe aus Skoria", + "block.mineralogy.scoria_smooth_slab": "Polierte Stufe aus Skoria", + "block.mineralogy.scoria_smooth_brick": "Polierte Ziegel aus Skoria", + "block.mineralogy.scoria_smooth_brick_stairs": "Polierte Ziegeltreppe aus Skoria", + "block.mineralogy.scoria_smooth_brick_slab": "Polierte Ziegelstufe aus Skoria", + "block.mineralogy.scoria_wall": "Mauer aus Skoria", + "block.mineralogy.scoria_brick_wall": "Ziegelmauer aus Skoria", + "block.mineralogy.scoria_smooth_wall": "Polierte Mauer aus Skoria", + "block.mineralogy.scoria_smooth_brick_wall": "Polierte Ziegelmauer aus Skoria", + "block.mineralogy.scoria_furnace": "Ofen aus Skoria", + "block.mineralogy.scoria_brick_furnace": "Ziegelofen aus Skoria", + "block.mineralogy.scoria_smooth_furnace": "Polierter Ofen aus Skoria", + "block.mineralogy.scoria_smooth_brick_furnace": "Polierter Ziegelofen aus Skoria", + "block.mineralogy.tuff": "Tuffstein", + "block.mineralogy.tuff_stairs": "Treppe aus Tuffstein", + "block.mineralogy.tuff_slab": "Stufe aus Tuffstein", + "block.mineralogy.tuff_brick": "Ziegel aus Tuffstein", + "block.mineralogy.tuff_brick_stairs": "Ziegeltreppe aus Tuffstein", + "block.mineralogy.tuff_brick_slab": "Ziegelstufe aus Tuffstein", + "block.mineralogy.tuff_smooth": "Polierter Block aus Tuffstein", + "block.mineralogy.tuff_smooth_stairs": "Polierte Treppe aus Tuffstein", + "block.mineralogy.tuff_smooth_slab": "Polierte Stufe aus Tuffstein", + "block.mineralogy.tuff_smooth_brick": "Polierte Ziegel aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_stairs": "Polierte Ziegeltreppe aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_slab": "Polierte Ziegelstufe aus Tuffstein", + "block.mineralogy.tuff_wall": "Mauer aus Tuffstein", + "block.mineralogy.tuff_brick_wall": "Ziegelmauer aus Tuffstein", + "block.mineralogy.tuff_smooth_wall": "Polierte Mauer aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_wall": "Polierte Ziegelmauer aus Tuffstein", + "block.mineralogy.tuff_furnace": "Ofen aus Tuffstein", + "block.mineralogy.tuff_brick_furnace": "Ziegelofen aus Tuffstein", + "block.mineralogy.tuff_smooth_furnace": "Polierter Ofen aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_furnace": "Polierter Ziegelofen aus Tuffstein", "block.mineralogy.siltstone": "Schluffstein", - "block.mineralogy.siltstone_stairs": "Schluffstein Treppe", - "block.mineralogy.siltstone_slab": "Schluffstein Platte", - "block.mineralogy.siltstone_brick": "Schluffstein Backstein", - "block.mineralogy.siltstone_brick_stairs": "Schluffstein Ziegelsteintreppen", - "block.mineralogy.siltstone_brick_slab": "Schluffstein Ziegelplatte", - "block.mineralogy.siltstone_smooth": "Polished Schluffstein", - "block.mineralogy.siltstone_smooth_stairs": "Schluffstein Polierte Treppe", - "block.mineralogy.siltstone_smooth_slab": "Schluffstein Polierte Platte", - "block.mineralogy.siltstone_smooth_brick": "Schluffstein Polierter Ziegelstein", - "block.mineralogy.siltstone_smooth_brick_stairs": "Schluffstein Polierte Ziegelsteintreppen", - "block.mineralogy.siltstone_smooth_brick_slab": "Schluffstein Polierte Ziegelplatte", - "block.mineralogy.siltstone_wall": "Schluffstein Wand", - "block.mineralogy.siltstone_brick_wall": "Schluffstein Ziegelwand", - "block.mineralogy.siltstone_smooth_wall": "Schluffstein Polierte Wand", - "block.mineralogy.siltstone_smooth_brick_wall": "Schluffstein Polierte Backsteinmauer", - "block.mineralogy.siltstone_furnace": "Schluffstein Ofen", - "block.mineralogy.siltstone_brick_furnace": "Schluffstein Ziegelofen", - "block.mineralogy.siltstone_smooth_furnace": "Schluffstein Polierter Ofen", - "block.mineralogy.siltstone_smooth_brick_furnace": "Schluffstein Polierter Ziegelofen", + "block.mineralogy.siltstone_stairs": "Treppe aus Schluffstein", + "block.mineralogy.siltstone_slab": "Stufe aus Schluffstein", + "block.mineralogy.siltstone_brick": "Ziegel aus Schluffstein", + "block.mineralogy.siltstone_brick_stairs": "Ziegeltreppe aus Schluffstein", + "block.mineralogy.siltstone_brick_slab": "Ziegelstufe aus Schluffstein", + "block.mineralogy.siltstone_smooth": "Polierter Block aus Schluffstein", + "block.mineralogy.siltstone_smooth_stairs": "Polierte Treppe aus Schluffstein", + "block.mineralogy.siltstone_smooth_slab": "Polierte Stufe aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick": "Polierte Ziegel aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_stairs": "Polierte Ziegeltreppe aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_slab": "Polierte Ziegelstufe aus Schluffstein", + "block.mineralogy.siltstone_wall": "Mauer aus Schluffstein", + "block.mineralogy.siltstone_brick_wall": "Ziegelmauer aus Schluffstein", + "block.mineralogy.siltstone_smooth_wall": "Polierte Mauer aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_wall": "Polierte Ziegelmauer aus Schluffstein", + "block.mineralogy.siltstone_furnace": "Ofen aus Schluffstein", + "block.mineralogy.siltstone_brick_furnace": "Ziegelofen aus Schluffstein", + "block.mineralogy.siltstone_smooth_furnace": "Polierter Ofen aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_furnace": "Polierter Ziegelofen aus Schluffstein", "block.mineralogy.rock_salt": "Steinsalz", - "block.mineralogy.rock_salt_stairs": "Steinsalz Treppe", - "block.mineralogy.rock_salt_slab": "Steinsalz Platte", - "block.mineralogy.rock_salt_brick": "Steinsalz Backstein", - "block.mineralogy.rock_salt_brick_stairs": "Steinsalz Ziegelsteintreppen", - "block.mineralogy.rock_salt_brick_slab": "Steinsalz Ziegelplatte", - "block.mineralogy.rock_salt_smooth": "Polished Steinsalz", - "block.mineralogy.rock_salt_smooth_stairs": "Steinsalz Polierte Treppe", - "block.mineralogy.rock_salt_smooth_slab": "Steinsalz Polierte Platte", - "block.mineralogy.rock_salt_smooth_brick": "Steinsalz Polierter Ziegelstein", - "block.mineralogy.rock_salt_smooth_brick_stairs": "Steinsalz Polierte Ziegelsteintreppen", - "block.mineralogy.rock_salt_smooth_brick_slab": "Steinsalz Polierte Ziegelplatte", - "block.mineralogy.rock_salt_wall": "Steinsalz Wand", - "block.mineralogy.rock_salt_brick_wall": "Steinsalz Ziegelwand", - "block.mineralogy.rock_salt_smooth_wall": "Steinsalz Polierte Wand", - "block.mineralogy.rock_salt_smooth_brick_wall": "Steinsalz Polierte Backsteinmauer", - "block.mineralogy.rock_salt_furnace": "Steinsalz Ofen", - "block.mineralogy.rock_salt_brick_furnace": "Steinsalz Ziegelofen", - "block.mineralogy.rock_salt_smooth_furnace": "Steinsalz Polierter Ofen", - "block.mineralogy.rock_salt_smooth_brick_furnace": "Steinsalz Polierter Ziegelofen", + "block.mineralogy.rock_salt_stairs": "Treppe aus Steinsalz", + "block.mineralogy.rock_salt_slab": "Stufe aus Steinsalz", + "block.mineralogy.rock_salt_brick": "Ziegel aus Steinsalz", + "block.mineralogy.rock_salt_brick_stairs": "Ziegeltreppe aus Steinsalz", + "block.mineralogy.rock_salt_brick_slab": "Ziegelstufe aus Steinsalz", + "block.mineralogy.rock_salt_smooth": "Polierter Block aus Steinsalz", + "block.mineralogy.rock_salt_smooth_stairs": "Polierte Treppe aus Steinsalz", + "block.mineralogy.rock_salt_smooth_slab": "Polierte Stufe aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick": "Polierte Ziegel aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Polierte Ziegeltreppe aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_slab": "Polierte Ziegelstufe aus Steinsalz", + "block.mineralogy.rock_salt_wall": "Mauer aus Steinsalz", + "block.mineralogy.rock_salt_brick_wall": "Ziegelmauer aus Steinsalz", + "block.mineralogy.rock_salt_smooth_wall": "Polierte Mauer aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_wall": "Polierte Ziegelmauer aus Steinsalz", + "block.mineralogy.rock_salt_furnace": "Ofen aus Steinsalz", + "block.mineralogy.rock_salt_brick_furnace": "Ziegelofen aus Steinsalz", + "block.mineralogy.rock_salt_smooth_furnace": "Polierter Ofen aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Polierter Ziegelofen aus Steinsalz", "block.mineralogy.hornfels": "Hornfels", - "block.mineralogy.hornfels_stairs": "Hornfels Treppe", - "block.mineralogy.hornfels_slab": "Hornfels Platte", - "block.mineralogy.hornfels_brick": "Hornfels Backstein", - "block.mineralogy.hornfels_brick_stairs": "Hornfels Ziegelsteintreppen", - "block.mineralogy.hornfels_brick_slab": "Hornfels Ziegelplatte", - "block.mineralogy.hornfels_smooth": "Polished Hornfels", - "block.mineralogy.hornfels_smooth_stairs": "Hornfels Polierte Treppe", - "block.mineralogy.hornfels_smooth_slab": "Hornfels Polierte Platte", - "block.mineralogy.hornfels_smooth_brick": "Hornfels Polierter Ziegelstein", - "block.mineralogy.hornfels_smooth_brick_stairs": "Hornfels Polierte Ziegelsteintreppen", - "block.mineralogy.hornfels_smooth_brick_slab": "Hornfels Polierte Ziegelplatte", - "block.mineralogy.hornfels_wall": "Hornfels Wand", - "block.mineralogy.hornfels_brick_wall": "Hornfels Ziegelwand", - "block.mineralogy.hornfels_smooth_wall": "Hornfels Polierte Wand", - "block.mineralogy.hornfels_smooth_brick_wall": "Hornfels Polierte Backsteinmauer", - "block.mineralogy.hornfels_furnace": "Hornfels Ofen", - "block.mineralogy.hornfels_brick_furnace": "Hornfels Ziegelofen", - "block.mineralogy.hornfels_smooth_furnace": "Hornfels Polierter Ofen", - "block.mineralogy.hornfels_smooth_brick_furnace": "Hornfels Polierter Ziegelofen", + "block.mineralogy.hornfels_stairs": "Treppe aus Hornfels", + "block.mineralogy.hornfels_slab": "Stufe aus Hornfels", + "block.mineralogy.hornfels_brick": "Ziegel aus Hornfels", + "block.mineralogy.hornfels_brick_stairs": "Ziegeltreppe aus Hornfels", + "block.mineralogy.hornfels_brick_slab": "Ziegelstufe aus Hornfels", + "block.mineralogy.hornfels_smooth": "Polierter Block aus Hornfels", + "block.mineralogy.hornfels_smooth_stairs": "Polierte Treppe aus Hornfels", + "block.mineralogy.hornfels_smooth_slab": "Polierte Stufe aus Hornfels", + "block.mineralogy.hornfels_smooth_brick": "Polierte Ziegel aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_stairs": "Polierte Ziegeltreppe aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_slab": "Polierte Ziegelstufe aus Hornfels", + "block.mineralogy.hornfels_wall": "Mauer aus Hornfels", + "block.mineralogy.hornfels_brick_wall": "Ziegelmauer aus Hornfels", + "block.mineralogy.hornfels_smooth_wall": "Polierte Mauer aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_wall": "Polierte Ziegelmauer aus Hornfels", + "block.mineralogy.hornfels_furnace": "Ofen aus Hornfels", + "block.mineralogy.hornfels_brick_furnace": "Ziegelofen aus Hornfels", + "block.mineralogy.hornfels_smooth_furnace": "Polierter Ofen aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_furnace": "Polierter Ziegelofen aus Hornfels", "block.mineralogy.quartzite": "Quarzit", - "block.mineralogy.quartzite_stairs": "Quarzit Treppe", - "block.mineralogy.quartzite_slab": "Quarzit Platte", - "block.mineralogy.quartzite_brick": "Quarzit Backstein", - "block.mineralogy.quartzite_brick_stairs": "Quarzit Ziegelsteintreppen", - "block.mineralogy.quartzite_brick_slab": "Quarzit Ziegelplatte", - "block.mineralogy.quartzite_smooth": "Polished Quarzit", - "block.mineralogy.quartzite_smooth_stairs": "Quarzit Polierte Treppe", - "block.mineralogy.quartzite_smooth_slab": "Quarzit Polierte Platte", - "block.mineralogy.quartzite_smooth_brick": "Quarzit Polierter Ziegelstein", - "block.mineralogy.quartzite_smooth_brick_stairs": "Quarzit Polierte Ziegelsteintreppen", - "block.mineralogy.quartzite_smooth_brick_slab": "Quarzit Polierte Ziegelplatte", - "block.mineralogy.quartzite_wall": "Quarzit Wand", - "block.mineralogy.quartzite_brick_wall": "Quarzit Ziegelwand", - "block.mineralogy.quartzite_smooth_wall": "Quarzit Polierte Wand", - "block.mineralogy.quartzite_smooth_brick_wall": "Quarzit Polierte Backsteinmauer", - "block.mineralogy.quartzite_furnace": "Quarzit Ofen", - "block.mineralogy.quartzite_brick_furnace": "Quarzit Ziegelofen", - "block.mineralogy.quartzite_smooth_furnace": "Quarzit Polierter Ofen", - "block.mineralogy.quartzite_smooth_brick_furnace": "Quarzit Polierter Ziegelofen", - "block.mineralogy.novaculite": "Novaculite", - "block.mineralogy.novaculite_stairs": "Novaculite Treppe", - "block.mineralogy.novaculite_slab": "Novaculite Platte", - "block.mineralogy.novaculite_brick": "Novaculite Backstein", - "block.mineralogy.novaculite_brick_stairs": "Novaculite Ziegelsteintreppen", - "block.mineralogy.novaculite_brick_slab": "Novaculite Ziegelplatte", - "block.mineralogy.novaculite_smooth": "Polished Novaculite", - "block.mineralogy.novaculite_smooth_stairs": "Novaculite Polierte Treppe", - "block.mineralogy.novaculite_smooth_slab": "Novaculite Polierte Platte", - "block.mineralogy.novaculite_smooth_brick": "Novaculite Polierter Ziegelstein", - "block.mineralogy.novaculite_smooth_brick_stairs": "Novaculite Polierte Ziegelsteintreppen", - "block.mineralogy.novaculite_smooth_brick_slab": "Novaculite Polierte Ziegelplatte", - "block.mineralogy.novaculite_wall": "Novaculite Wand", - "block.mineralogy.novaculite_brick_wall": "Novaculite Ziegelwand", - "block.mineralogy.novaculite_smooth_wall": "Novaculite Polierte Wand", - "block.mineralogy.novaculite_smooth_brick_wall": "Novaculite Polierte Backsteinmauer", - "block.mineralogy.novaculite_furnace": "Novaculite Ofen", - "block.mineralogy.novaculite_brick_furnace": "Novaculite Ziegelofen", - "block.mineralogy.novaculite_smooth_furnace": "Novaculite Polierter Ofen", - "block.mineralogy.novaculite_smooth_brick_furnace": "Novaculite Polierter Ziegelofen", + "block.mineralogy.quartzite_stairs": "Treppe aus Quarzit", + "block.mineralogy.quartzite_slab": "Stufe aus Quarzit", + "block.mineralogy.quartzite_brick": "Ziegel aus Quarzit", + "block.mineralogy.quartzite_brick_stairs": "Ziegeltreppe aus Quarzit", + "block.mineralogy.quartzite_brick_slab": "Ziegelstufe aus Quarzit", + "block.mineralogy.quartzite_smooth": "Polierter Block aus Quarzit", + "block.mineralogy.quartzite_smooth_stairs": "Polierte Treppe aus Quarzit", + "block.mineralogy.quartzite_smooth_slab": "Polierte Stufe aus Quarzit", + "block.mineralogy.quartzite_smooth_brick": "Polierte Ziegel aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_slab": "Polierte Ziegelstufe aus Quarzit", + "block.mineralogy.quartzite_wall": "Mauer aus Quarzit", + "block.mineralogy.quartzite_brick_wall": "Ziegelmauer aus Quarzit", + "block.mineralogy.quartzite_smooth_wall": "Polierte Mauer aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_wall": "Polierte Ziegelmauer aus Quarzit", + "block.mineralogy.quartzite_furnace": "Ofen aus Quarzit", + "block.mineralogy.quartzite_brick_furnace": "Ziegelofen aus Quarzit", + "block.mineralogy.quartzite_smooth_furnace": "Polierter Ofen aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_furnace": "Polierter Ziegelofen aus Quarzit", + "block.mineralogy.novaculite": "Novakulit", + "block.mineralogy.novaculite_stairs": "Treppe aus Novakulit", + "block.mineralogy.novaculite_slab": "Stufe aus Novakulit", + "block.mineralogy.novaculite_brick": "Ziegel aus Novakulit", + "block.mineralogy.novaculite_brick_stairs": "Ziegeltreppe aus Novakulit", + "block.mineralogy.novaculite_brick_slab": "Ziegelstufe aus Novakulit", + "block.mineralogy.novaculite_smooth": "Polierter Block aus Novakulit", + "block.mineralogy.novaculite_smooth_stairs": "Polierte Treppe aus Novakulit", + "block.mineralogy.novaculite_smooth_slab": "Polierte Stufe aus Novakulit", + "block.mineralogy.novaculite_smooth_brick": "Polierte Ziegel aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_slab": "Polierte Ziegelstufe aus Novakulit", + "block.mineralogy.novaculite_wall": "Mauer aus Novakulit", + "block.mineralogy.novaculite_brick_wall": "Ziegelmauer aus Novakulit", + "block.mineralogy.novaculite_smooth_wall": "Polierte Mauer aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_wall": "Polierte Ziegelmauer aus Novakulit", + "block.mineralogy.novaculite_furnace": "Ofen aus Novakulit", + "block.mineralogy.novaculite_brick_furnace": "Ziegelofen aus Novakulit", + "block.mineralogy.novaculite_smooth_furnace": "Polierter Ofen aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_furnace": "Polierter Ziegelofen aus Novakulit", "block.mineralogy.chalk": "Kreide", - "item.mineralogy.chalk_dust": "Kreide Pulver", + "item.mineralogy.chalk_dust": "Kreidepulver", "item.mineralogy.salt_dust": "Salz", - "item.mineralogy.rock_salt_dust": "Steinsalz-Kristalle", - "block.mineralogy.rocksaltlamp": "Steinsalz-Lampe", + "item.mineralogy.rock_salt_dust": "Steinsalzkristalle", + "block.mineralogy.rocksaltlamp": "Steinsalzlampe", "block.mineralogy.rocksaltstreetlamp": "Steinsalz-Straßenlaterne", - "block.mineralogy.andesite_relief_axe": "Andesit Axe Relief", - "block.mineralogy.andesite_relief_blank": "Andesit Leere Erleichterung", - "block.mineralogy.andesite_relief_cross": "Andesit Cross Relief", - "block.mineralogy.andesite_relief_hammer": "Andesit Hammer Relief", - "block.mineralogy.andesite_relief_hoe": "Andesit Hacke Erleichterung", - "block.mineralogy.andesite_relief_horizontal": "Andesit Horizontales Relief", - "block.mineralogy.andesite_relief_i": "Andesit I Relief", - "block.mineralogy.andesite_relief_left": "Andesit Relief links", - "block.mineralogy.andesite_relief_pickaxe": "Andesit Spitzhacke Relief", - "block.mineralogy.andesite_relief_plus": "Andesit Plus Relief", - "block.mineralogy.andesite_relief_right": "Andesit Rechte Erleichterung", - "block.mineralogy.andesite_relief_sword": "Andesit Schwert Relief", - "block.mineralogy.andesite_relief_vertical": "Andesit Vertikales Relief", - "block.mineralogy.basalt_relief_axe": "Basalt Axe Relief", - "block.mineralogy.basalt_relief_blank": "Basalt Leere Erleichterung", - "block.mineralogy.basalt_relief_cross": "Basalt Cross Relief", - "block.mineralogy.basalt_relief_hammer": "Basalt Hammer Relief", - "block.mineralogy.basalt_relief_hoe": "Basalt Hacke Erleichterung", - "block.mineralogy.basalt_relief_horizontal": "Basalt Horizontales Relief", - "block.mineralogy.basalt_relief_i": "Basalt I Relief", - "block.mineralogy.basalt_relief_left": "Basalt Relief links", - "block.mineralogy.basalt_relief_pickaxe": "Basalt Spitzhacke Relief", - "block.mineralogy.basalt_relief_plus": "Basalt Plus Relief", - "block.mineralogy.basalt_relief_right": "Basalt Rechte Erleichterung", - "block.mineralogy.basalt_relief_sword": "Basalt Schwert Relief", - "block.mineralogy.basalt_relief_vertical": "Basalt Vertikales Relief", - "block.mineralogy.diorite_relief_axe": "Diorit Axe Relief", - "block.mineralogy.diorite_relief_blank": "Diorit Leere Erleichterung", - "block.mineralogy.diorite_relief_cross": "Diorit Cross Relief", - "block.mineralogy.diorite_relief_hammer": "Diorit Hammer Relief", - "block.mineralogy.diorite_relief_hoe": "Diorit Hacke Erleichterung", - "block.mineralogy.diorite_relief_horizontal": "Diorit Horizontales Relief", - "block.mineralogy.diorite_relief_i": "Diorit I Relief", - "block.mineralogy.diorite_relief_left": "Diorit Relief links", - "block.mineralogy.diorite_relief_pickaxe": "Diorit Spitzhacke Relief", - "block.mineralogy.diorite_relief_plus": "Diorit Plus Relief", - "block.mineralogy.diorite_relief_right": "Diorit Rechte Erleichterung", - "block.mineralogy.diorite_relief_sword": "Diorit Schwert Relief", - "block.mineralogy.diorite_relief_vertical": "Diorit Vertikales Relief", - "block.mineralogy.granite_relief_axe": "Granit Axe Relief", - "block.mineralogy.granite_relief_blank": "Granit Leere Erleichterung", - "block.mineralogy.granite_relief_cross": "Granit Cross Relief", - "block.mineralogy.granite_relief_hammer": "Granit Hammer Relief", - "block.mineralogy.granite_relief_hoe": "Granit Hacke Erleichterung", - "block.mineralogy.granite_relief_horizontal": "Granit Horizontales Relief", - "block.mineralogy.granite_relief_i": "Granit I Relief", - "block.mineralogy.granite_relief_left": "Granit Relief links", - "block.mineralogy.granite_relief_pickaxe": "Granit Spitzhacke Relief", - "block.mineralogy.granite_relief_plus": "Granit Plus Relief", - "block.mineralogy.granite_relief_right": "Granit Rechte Erleichterung", - "block.mineralogy.granite_relief_sword": "Granit Schwert Relief", - "block.mineralogy.granite_relief_vertical": "Granit Vertikales Relief", - "block.mineralogy.rhyolite_relief_axe": "Rhyolith Axe Relief", - "block.mineralogy.rhyolite_relief_blank": "Rhyolith Leere Erleichterung", - "block.mineralogy.rhyolite_relief_cross": "Rhyolith Cross Relief", - "block.mineralogy.rhyolite_relief_hammer": "Rhyolith Hammer Relief", - "block.mineralogy.rhyolite_relief_hoe": "Rhyolith Hacke Erleichterung", - "block.mineralogy.rhyolite_relief_horizontal": "Rhyolith Horizontales Relief", - "block.mineralogy.rhyolite_relief_i": "Rhyolith I Relief", - "block.mineralogy.rhyolite_relief_left": "Rhyolith Relief links", - "block.mineralogy.rhyolite_relief_pickaxe": "Rhyolith Spitzhacke Relief", - "block.mineralogy.rhyolite_relief_plus": "Rhyolith Plus Relief", - "block.mineralogy.rhyolite_relief_right": "Rhyolith Rechte Erleichterung", - "block.mineralogy.rhyolite_relief_sword": "Rhyolith Schwert Relief", - "block.mineralogy.rhyolite_relief_vertical": "Rhyolith Vertikales Relief", - "block.mineralogy.pegmatite_relief_axe": "Pegmatit Axe Relief", - "block.mineralogy.pegmatite_relief_blank": "Pegmatit Leere Erleichterung", - "block.mineralogy.pegmatite_relief_cross": "Pegmatit Cross Relief", - "block.mineralogy.pegmatite_relief_hammer": "Pegmatit Hammer Relief", - "block.mineralogy.pegmatite_relief_hoe": "Pegmatit Hacke Erleichterung", - "block.mineralogy.pegmatite_relief_horizontal": "Pegmatit Horizontales Relief", - "block.mineralogy.pegmatite_relief_i": "Pegmatit I Relief", - "block.mineralogy.pegmatite_relief_left": "Pegmatit Relief links", - "block.mineralogy.pegmatite_relief_pickaxe": "Pegmatit Spitzhacke Relief", - "block.mineralogy.pegmatite_relief_plus": "Pegmatit Plus Relief", - "block.mineralogy.pegmatite_relief_right": "Pegmatit Rechte Erleichterung", - "block.mineralogy.pegmatite_relief_sword": "Pegmatit Schwert Relief", - "block.mineralogy.pegmatite_relief_vertical": "Pegmatit Vertikales Relief", - "block.mineralogy.shale_relief_axe": "Schiefer Axe Relief", - "block.mineralogy.shale_relief_blank": "Schiefer Leere Erleichterung", - "block.mineralogy.shale_relief_cross": "Schiefer Cross Relief", - "block.mineralogy.shale_relief_hammer": "Schiefer Hammer Relief", - "block.mineralogy.shale_relief_hoe": "Schiefer Hacke Erleichterung", - "block.mineralogy.shale_relief_horizontal": "Schiefer Horizontales Relief", - "block.mineralogy.shale_relief_i": "Schiefer I Relief", - "block.mineralogy.shale_relief_left": "Schiefer Relief links", - "block.mineralogy.shale_relief_pickaxe": "Schiefer Spitzhacke Relief", - "block.mineralogy.shale_relief_plus": "Schiefer Plus Relief", - "block.mineralogy.shale_relief_right": "Schiefer Rechte Erleichterung", - "block.mineralogy.shale_relief_sword": "Schiefer Schwert Relief", - "block.mineralogy.shale_relief_vertical": "Schiefer Vertikales Relief", - "block.mineralogy.conglomerate_relief_axe": "Konglomerat Axe Relief", - "block.mineralogy.conglomerate_relief_blank": "Konglomerat Leere Erleichterung", - "block.mineralogy.conglomerate_relief_cross": "Konglomerat Cross Relief", - "block.mineralogy.conglomerate_relief_hammer": "Konglomerat Hammer Relief", - "block.mineralogy.conglomerate_relief_hoe": "Konglomerat Hacke Erleichterung", - "block.mineralogy.conglomerate_relief_horizontal": "Konglomerat Horizontales Relief", - "block.mineralogy.conglomerate_relief_i": "Konglomerat I Relief", - "block.mineralogy.conglomerate_relief_left": "Konglomerat Relief links", - "block.mineralogy.conglomerate_relief_pickaxe": "Konglomerat Spitzhacke Relief", - "block.mineralogy.conglomerate_relief_plus": "Konglomerat Plus Relief", - "block.mineralogy.conglomerate_relief_right": "Konglomerat Rechte Erleichterung", - "block.mineralogy.conglomerate_relief_sword": "Konglomerat Schwert Relief", - "block.mineralogy.conglomerate_relief_vertical": "Konglomerat Vertikales Relief", - "block.mineralogy.dolomite_relief_axe": "Dolomit Axe Relief", - "block.mineralogy.dolomite_relief_blank": "Dolomit Leere Erleichterung", - "block.mineralogy.dolomite_relief_cross": "Dolomit Cross Relief", - "block.mineralogy.dolomite_relief_hammer": "Dolomit Hammer Relief", - "block.mineralogy.dolomite_relief_hoe": "Dolomit Hacke Erleichterung", - "block.mineralogy.dolomite_relief_horizontal": "Dolomit Horizontales Relief", - "block.mineralogy.dolomite_relief_i": "Dolomit I Relief", - "block.mineralogy.dolomite_relief_left": "Dolomit Relief links", - "block.mineralogy.dolomite_relief_pickaxe": "Dolomit Spitzhacke Relief", - "block.mineralogy.dolomite_relief_plus": "Dolomit Plus Relief", - "block.mineralogy.dolomite_relief_right": "Dolomit Rechte Erleichterung", - "block.mineralogy.dolomite_relief_sword": "Dolomit Schwert Relief", - "block.mineralogy.dolomite_relief_vertical": "Dolomit Vertikales Relief", - "block.mineralogy.limestone_relief_axe": "Kalkstein Axe Relief", - "block.mineralogy.limestone_relief_blank": "Kalkstein Leere Erleichterung", - "block.mineralogy.limestone_relief_cross": "Kalkstein Cross Relief", - "block.mineralogy.limestone_relief_hammer": "Kalkstein Hammer Relief", - "block.mineralogy.limestone_relief_hoe": "Kalkstein Hacke Erleichterung", - "block.mineralogy.limestone_relief_horizontal": "Kalkstein Horizontales Relief", - "block.mineralogy.limestone_relief_i": "Kalkstein I Relief", - "block.mineralogy.limestone_relief_left": "Kalkstein Relief links", - "block.mineralogy.limestone_relief_pickaxe": "Kalkstein Spitzhacke Relief", - "block.mineralogy.limestone_relief_plus": "Kalkstein Plus Relief", - "block.mineralogy.limestone_relief_right": "Kalkstein Rechte Erleichterung", - "block.mineralogy.limestone_relief_sword": "Kalkstein Schwert Relief", - "block.mineralogy.limestone_relief_vertical": "Kalkstein Vertikales Relief", - "block.mineralogy.marble_relief_axe": "Marmor Axe Relief", - "block.mineralogy.marble_relief_blank": "Marmor Leere Erleichterung", - "block.mineralogy.marble_relief_cross": "Marmor Cross Relief", - "block.mineralogy.marble_relief_hammer": "Marmor Hammer Relief", - "block.mineralogy.marble_relief_hoe": "Marmor Hacke Erleichterung", - "block.mineralogy.marble_relief_horizontal": "Marmor Horizontales Relief", - "block.mineralogy.marble_relief_i": "Marmor I Relief", - "block.mineralogy.marble_relief_left": "Marmor Relief links", - "block.mineralogy.marble_relief_pickaxe": "Marmor Spitzhacke Relief", - "block.mineralogy.marble_relief_plus": "Marmor Plus Relief", - "block.mineralogy.marble_relief_right": "Marmor Rechte Erleichterung", - "block.mineralogy.marble_relief_sword": "Marmor Schwert Relief", - "block.mineralogy.marble_relief_vertical": "Marmor Vertikales Relief", - "block.mineralogy.slate_relief_axe": "Schiefer Axe Relief", - "block.mineralogy.slate_relief_blank": "Schiefer Leere Erleichterung", - "block.mineralogy.slate_relief_cross": "Schiefer Cross Relief", - "block.mineralogy.slate_relief_hammer": "Schiefer Hammer Relief", - "block.mineralogy.slate_relief_hoe": "Schiefer Hacke Erleichterung", - "block.mineralogy.slate_relief_horizontal": "Schiefer Horizontales Relief", - "block.mineralogy.slate_relief_i": "Schiefer I Relief", - "block.mineralogy.slate_relief_left": "Schiefer Relief links", - "block.mineralogy.slate_relief_pickaxe": "Schiefer Spitzhacke Relief", - "block.mineralogy.slate_relief_plus": "Schiefer Plus Relief", - "block.mineralogy.slate_relief_right": "Schiefer Rechte Erleichterung", - "block.mineralogy.slate_relief_sword": "Schiefer Schwert Relief", - "block.mineralogy.slate_relief_vertical": "Schiefer Vertikales Relief", - "block.mineralogy.schist_relief_axe": "Schiefer Axe Relief", - "block.mineralogy.schist_relief_blank": "Schiefer Leere Erleichterung", - "block.mineralogy.schist_relief_cross": "Schiefer Cross Relief", - "block.mineralogy.schist_relief_hammer": "Schiefer Hammer Relief", - "block.mineralogy.schist_relief_hoe": "Schiefer Hacke Erleichterung", - "block.mineralogy.schist_relief_horizontal": "Schiefer Horizontales Relief", - "block.mineralogy.schist_relief_i": "Schiefer I Relief", - "block.mineralogy.schist_relief_left": "Schiefer Relief links", - "block.mineralogy.schist_relief_pickaxe": "Schiefer Spitzhacke Relief", - "block.mineralogy.schist_relief_plus": "Schiefer Plus Relief", - "block.mineralogy.schist_relief_right": "Schiefer Rechte Erleichterung", - "block.mineralogy.schist_relief_sword": "Schiefer Schwert Relief", - "block.mineralogy.schist_relief_vertical": "Schiefer Vertikales Relief", - "block.mineralogy.gneiss_relief_axe": "Gneis Axe Relief", - "block.mineralogy.gneiss_relief_blank": "Gneis Leere Erleichterung", - "block.mineralogy.gneiss_relief_cross": "Gneis Cross Relief", - "block.mineralogy.gneiss_relief_hammer": "Gneis Hammer Relief", - "block.mineralogy.gneiss_relief_hoe": "Gneis Hacke Erleichterung", - "block.mineralogy.gneiss_relief_horizontal": "Gneis Horizontales Relief", - "block.mineralogy.gneiss_relief_i": "Gneis I Relief", - "block.mineralogy.gneiss_relief_left": "Gneis Relief links", - "block.mineralogy.gneiss_relief_pickaxe": "Gneis Spitzhacke Relief", - "block.mineralogy.gneiss_relief_plus": "Gneis Plus Relief", - "block.mineralogy.gneiss_relief_right": "Gneis Rechte Erleichterung", - "block.mineralogy.gneiss_relief_sword": "Gneis Schwert Relief", - "block.mineralogy.gneiss_relief_vertical": "Gneis Vertikales Relief", - "block.mineralogy.phyllite_relief_axe": "Phyllite Axe Relief", - "block.mineralogy.phyllite_relief_blank": "Phyllite Leere Erleichterung", - "block.mineralogy.phyllite_relief_cross": "Phyllite Cross Relief", - "block.mineralogy.phyllite_relief_hammer": "Phyllite Hammer Relief", - "block.mineralogy.phyllite_relief_hoe": "Phyllite Hacke Erleichterung", - "block.mineralogy.phyllite_relief_horizontal": "Phyllite Horizontales Relief", - "block.mineralogy.phyllite_relief_i": "Phyllite I Relief", - "block.mineralogy.phyllite_relief_left": "Phyllite Relief links", - "block.mineralogy.phyllite_relief_pickaxe": "Phyllite Spitzhacke Relief", - "block.mineralogy.phyllite_relief_plus": "Phyllite Plus Relief", - "block.mineralogy.phyllite_relief_right": "Phyllite Rechte Erleichterung", - "block.mineralogy.phyllite_relief_sword": "Phyllite Schwert Relief", - "block.mineralogy.phyllite_relief_vertical": "Phyllite Vertikales Relief", - "block.mineralogy.amphibolite_relief_axe": "Amphibolith Axe Relief", - "block.mineralogy.amphibolite_relief_blank": "Amphibolith Leere Erleichterung", - "block.mineralogy.amphibolite_relief_cross": "Amphibolith Cross Relief", - "block.mineralogy.amphibolite_relief_hammer": "Amphibolith Hammer Relief", - "block.mineralogy.amphibolite_relief_hoe": "Amphibolith Hacke Erleichterung", - "block.mineralogy.amphibolite_relief_horizontal": "Amphibolith Horizontales Relief", - "block.mineralogy.amphibolite_relief_i": "Amphibolith I Relief", - "block.mineralogy.amphibolite_relief_left": "Amphibolith Relief links", - "block.mineralogy.amphibolite_relief_pickaxe": "Amphibolith Spitzhacke Relief", - "block.mineralogy.amphibolite_relief_plus": "Amphibolith Plus Relief", - "block.mineralogy.amphibolite_relief_right": "Amphibolith Rechte Erleichterung", - "block.mineralogy.amphibolite_relief_sword": "Amphibolith Schwert Relief", - "block.mineralogy.amphibolite_relief_vertical": "Amphibolith Vertikales Relief", - "block.mineralogy.diabase_relief_axe": "Diabas Axe Relief", - "block.mineralogy.diabase_relief_blank": "Diabas Leere Erleichterung", - "block.mineralogy.diabase_relief_cross": "Diabas Cross Relief", - "block.mineralogy.diabase_relief_hammer": "Diabas Hammer Relief", - "block.mineralogy.diabase_relief_hoe": "Diabas Hacke Erleichterung", - "block.mineralogy.diabase_relief_horizontal": "Diabas Horizontales Relief", - "block.mineralogy.diabase_relief_i": "Diabas I Relief", - "block.mineralogy.diabase_relief_left": "Diabas Relief links", - "block.mineralogy.diabase_relief_pickaxe": "Diabas Spitzhacke Relief", - "block.mineralogy.diabase_relief_plus": "Diabas Plus Relief", - "block.mineralogy.diabase_relief_right": "Diabas Rechte Erleichterung", - "block.mineralogy.diabase_relief_sword": "Diabas Schwert Relief", - "block.mineralogy.diabase_relief_vertical": "Diabas Vertikales Relief", - "block.mineralogy.gabbro_relief_axe": "Gabbro Axe Relief", - "block.mineralogy.gabbro_relief_blank": "Gabbro Leere Erleichterung", - "block.mineralogy.gabbro_relief_cross": "Gabbro Cross Relief", - "block.mineralogy.gabbro_relief_hammer": "Gabbro Hammer Relief", - "block.mineralogy.gabbro_relief_hoe": "Gabbro Hacke Erleichterung", - "block.mineralogy.gabbro_relief_horizontal": "Gabbro Horizontales Relief", - "block.mineralogy.gabbro_relief_i": "Gabbro I Relief", - "block.mineralogy.gabbro_relief_left": "Gabbro Relief links", - "block.mineralogy.gabbro_relief_pickaxe": "Gabbro Spitzhacke Relief", - "block.mineralogy.gabbro_relief_plus": "Gabbro Plus Relief", - "block.mineralogy.gabbro_relief_right": "Gabbro Rechte Erleichterung", - "block.mineralogy.gabbro_relief_sword": "Gabbro Schwert Relief", - "block.mineralogy.gabbro_relief_vertical": "Gabbro Vertikales Relief", - "block.mineralogy.peridotite_relief_axe": "Peridotit Axe Relief", - "block.mineralogy.peridotite_relief_blank": "Peridotit Leere Erleichterung", - "block.mineralogy.peridotite_relief_cross": "Peridotit Cross Relief", - "block.mineralogy.peridotite_relief_hammer": "Peridotit Hammer Relief", - "block.mineralogy.peridotite_relief_hoe": "Peridotit Hacke Erleichterung", - "block.mineralogy.peridotite_relief_horizontal": "Peridotit Horizontales Relief", - "block.mineralogy.peridotite_relief_i": "Peridotit I Relief", - "block.mineralogy.peridotite_relief_left": "Peridotit Relief links", - "block.mineralogy.peridotite_relief_pickaxe": "Peridotit Spitzhacke Relief", - "block.mineralogy.peridotite_relief_plus": "Peridotit Plus Relief", - "block.mineralogy.peridotite_relief_right": "Peridotit Rechte Erleichterung", - "block.mineralogy.peridotite_relief_sword": "Peridotit Schwert Relief", - "block.mineralogy.peridotite_relief_vertical": "Peridotit Vertikales Relief", - "block.mineralogy.basaltic_glass_relief_axe": "Basaltglas Axe Relief", - "block.mineralogy.basaltic_glass_relief_blank": "Basaltglas Leere Erleichterung", - "block.mineralogy.basaltic_glass_relief_cross": "Basaltglas Cross Relief", - "block.mineralogy.basaltic_glass_relief_hammer": "Basaltglas Hammer Relief", - "block.mineralogy.basaltic_glass_relief_hoe": "Basaltglas Hacke Erleichterung", - "block.mineralogy.basaltic_glass_relief_horizontal": "Basaltglas Horizontales Relief", - "block.mineralogy.basaltic_glass_relief_i": "Basaltglas I Relief", - "block.mineralogy.basaltic_glass_relief_left": "Basaltglas Relief links", - "block.mineralogy.basaltic_glass_relief_pickaxe": "Basaltglas Spitzhacke Relief", - "block.mineralogy.basaltic_glass_relief_plus": "Basaltglas Plus Relief", - "block.mineralogy.basaltic_glass_relief_right": "Basaltglas Rechte Erleichterung", - "block.mineralogy.basaltic_glass_relief_sword": "Basaltglas Schwert Relief", - "block.mineralogy.basaltic_glass_relief_vertical": "Basaltglas Vertikales Relief", - "block.mineralogy.scoria_relief_axe": "Schlacke Axe Relief", - "block.mineralogy.scoria_relief_blank": "Schlacke Leere Erleichterung", - "block.mineralogy.scoria_relief_cross": "Schlacke Cross Relief", - "block.mineralogy.scoria_relief_hammer": "Schlacke Hammer Relief", - "block.mineralogy.scoria_relief_hoe": "Schlacke Hacke Erleichterung", - "block.mineralogy.scoria_relief_horizontal": "Schlacke Horizontales Relief", - "block.mineralogy.scoria_relief_i": "Schlacke I Relief", - "block.mineralogy.scoria_relief_left": "Schlacke Relief links", - "block.mineralogy.scoria_relief_pickaxe": "Schlacke Spitzhacke Relief", - "block.mineralogy.scoria_relief_plus": "Schlacke Plus Relief", - "block.mineralogy.scoria_relief_right": "Schlacke Rechte Erleichterung", - "block.mineralogy.scoria_relief_sword": "Schlacke Schwert Relief", - "block.mineralogy.scoria_relief_vertical": "Schlacke Vertikales Relief", - "block.mineralogy.tuff_relief_axe": "Tuff Axe Relief", - "block.mineralogy.tuff_relief_blank": "Tuff Leere Erleichterung", - "block.mineralogy.tuff_relief_cross": "Tuff Cross Relief", - "block.mineralogy.tuff_relief_hammer": "Tuff Hammer Relief", - "block.mineralogy.tuff_relief_hoe": "Tuff Hacke Erleichterung", - "block.mineralogy.tuff_relief_horizontal": "Tuff Horizontales Relief", - "block.mineralogy.tuff_relief_i": "Tuff I Relief", - "block.mineralogy.tuff_relief_left": "Tuff Relief links", - "block.mineralogy.tuff_relief_pickaxe": "Tuff Spitzhacke Relief", - "block.mineralogy.tuff_relief_plus": "Tuff Plus Relief", - "block.mineralogy.tuff_relief_right": "Tuff Rechte Erleichterung", - "block.mineralogy.tuff_relief_sword": "Tuff Schwert Relief", - "block.mineralogy.tuff_relief_vertical": "Tuff Vertikales Relief", - "block.mineralogy.siltstone_relief_axe": "Schluffstein Axe Relief", - "block.mineralogy.siltstone_relief_blank": "Schluffstein Leere Erleichterung", - "block.mineralogy.siltstone_relief_cross": "Schluffstein Cross Relief", - "block.mineralogy.siltstone_relief_hammer": "Schluffstein Hammer Relief", - "block.mineralogy.siltstone_relief_hoe": "Schluffstein Hacke Erleichterung", - "block.mineralogy.siltstone_relief_horizontal": "Schluffstein Horizontales Relief", - "block.mineralogy.siltstone_relief_i": "Schluffstein I Relief", - "block.mineralogy.siltstone_relief_left": "Schluffstein Relief links", - "block.mineralogy.siltstone_relief_pickaxe": "Schluffstein Spitzhacke Relief", - "block.mineralogy.siltstone_relief_plus": "Schluffstein Plus Relief", - "block.mineralogy.siltstone_relief_right": "Schluffstein Rechte Erleichterung", - "block.mineralogy.siltstone_relief_sword": "Schluffstein Schwert Relief", - "block.mineralogy.siltstone_relief_vertical": "Schluffstein Vertikales Relief", - "block.mineralogy.rock_salt_relief_axe": "Steinsalz Axe Relief", - "block.mineralogy.rock_salt_relief_blank": "Steinsalz Leere Erleichterung", - "block.mineralogy.rock_salt_relief_cross": "Steinsalz Cross Relief", - "block.mineralogy.rock_salt_relief_hammer": "Steinsalz Hammer Relief", - "block.mineralogy.rock_salt_relief_hoe": "Steinsalz Hacke Erleichterung", - "block.mineralogy.rock_salt_relief_horizontal": "Steinsalz Horizontales Relief", - "block.mineralogy.rock_salt_relief_i": "Steinsalz I Relief", - "block.mineralogy.rock_salt_relief_left": "Steinsalz Relief links", - "block.mineralogy.rock_salt_relief_pickaxe": "Steinsalz Spitzhacke Relief", - "block.mineralogy.rock_salt_relief_plus": "Steinsalz Plus Relief", - "block.mineralogy.rock_salt_relief_right": "Steinsalz Rechte Erleichterung", - "block.mineralogy.rock_salt_relief_sword": "Steinsalz Schwert Relief", - "block.mineralogy.rock_salt_relief_vertical": "Steinsalz Vertikales Relief", - "block.mineralogy.hornfels_relief_axe": "Hornfels Axe Relief", - "block.mineralogy.hornfels_relief_blank": "Hornfels Leere Erleichterung", - "block.mineralogy.hornfels_relief_cross": "Hornfels Cross Relief", - "block.mineralogy.hornfels_relief_hammer": "Hornfels Hammer Relief", - "block.mineralogy.hornfels_relief_hoe": "Hornfels Hacke Erleichterung", - "block.mineralogy.hornfels_relief_horizontal": "Hornfels Horizontales Relief", - "block.mineralogy.hornfels_relief_i": "Hornfels I Relief", - "block.mineralogy.hornfels_relief_left": "Hornfels Relief links", - "block.mineralogy.hornfels_relief_pickaxe": "Hornfels Spitzhacke Relief", - "block.mineralogy.hornfels_relief_plus": "Hornfels Plus Relief", - "block.mineralogy.hornfels_relief_right": "Hornfels Rechte Erleichterung", - "block.mineralogy.hornfels_relief_sword": "Hornfels Schwert Relief", - "block.mineralogy.hornfels_relief_vertical": "Hornfels Vertikales Relief", - "block.mineralogy.quartzite_relief_axe": "Quarzit Axe Relief", - "block.mineralogy.quartzite_relief_blank": "Quarzit Leere Erleichterung", - "block.mineralogy.quartzite_relief_cross": "Quarzit Cross Relief", - "block.mineralogy.quartzite_relief_hammer": "Quarzit Hammer Relief", - "block.mineralogy.quartzite_relief_hoe": "Quarzit Hacke Erleichterung", - "block.mineralogy.quartzite_relief_horizontal": "Quarzit Horizontales Relief", - "block.mineralogy.quartzite_relief_i": "Quarzit I Relief", - "block.mineralogy.quartzite_relief_left": "Quarzit Relief links", - "block.mineralogy.quartzite_relief_pickaxe": "Quarzit Spitzhacke Relief", - "block.mineralogy.quartzite_relief_plus": "Quarzit Plus Relief", - "block.mineralogy.quartzite_relief_right": "Quarzit Rechte Erleichterung", - "block.mineralogy.quartzite_relief_sword": "Quarzit Schwert Relief", - "block.mineralogy.quartzite_relief_vertical": "Quarzit Vertikales Relief", - "block.mineralogy.novaculite_relief_axe": "Novaculite Axe Relief", - "block.mineralogy.novaculite_relief_blank": "Novaculite Leere Erleichterung", - "block.mineralogy.novaculite_relief_cross": "Novaculite Cross Relief", - "block.mineralogy.novaculite_relief_hammer": "Novaculite Hammer Relief", - "block.mineralogy.novaculite_relief_hoe": "Novaculite Hacke Erleichterung", - "block.mineralogy.novaculite_relief_horizontal": "Novaculite Horizontales Relief", - "block.mineralogy.novaculite_relief_i": "Novaculite I Relief", - "block.mineralogy.novaculite_relief_left": "Novaculite Relief links", - "block.mineralogy.novaculite_relief_pickaxe": "Novaculite Spitzhacke Relief", - "block.mineralogy.novaculite_relief_plus": "Novaculite Plus Relief", - "block.mineralogy.novaculite_relief_right": "Novaculite Rechte Erleichterung", - "block.mineralogy.novaculite_relief_sword": "Novaculite Schwert Relief", - "block.mineralogy.novaculite_relief_vertical": "Novaculite Vertikales Relief", - "itemGroup.mineralogy.mineralogy": "Mineralogie" + "block.mineralogy.andesite_relief_axe": "Relief aus Andesit (Axt)", + "block.mineralogy.andesite_relief_blank": "Relief aus Andesit (ohne Motiv)", + "block.mineralogy.andesite_relief_cross": "Relief aus Andesit (Kreuz)", + "block.mineralogy.andesite_relief_hammer": "Relief aus Andesit (Hammer)", + "block.mineralogy.andesite_relief_hoe": "Relief aus Andesit (Hacke)", + "block.mineralogy.andesite_relief_horizontal": "Relief aus Andesit (waagerecht)", + "block.mineralogy.andesite_relief_i": "Relief aus Andesit (I)", + "block.mineralogy.andesite_relief_left": "Relief aus Andesit (links)", + "block.mineralogy.andesite_relief_pickaxe": "Relief aus Andesit (Spitzhacke)", + "block.mineralogy.andesite_relief_plus": "Relief aus Andesit (Pluszeichen)", + "block.mineralogy.andesite_relief_right": "Relief aus Andesit (rechts)", + "block.mineralogy.andesite_relief_sword": "Relief aus Andesit (Schwert)", + "block.mineralogy.andesite_relief_vertical": "Relief aus Andesit (senkrecht)", + "block.mineralogy.basalt_relief_axe": "Relief aus Basalt (Axt)", + "block.mineralogy.basalt_relief_blank": "Relief aus Basalt (ohne Motiv)", + "block.mineralogy.basalt_relief_cross": "Relief aus Basalt (Kreuz)", + "block.mineralogy.basalt_relief_hammer": "Relief aus Basalt (Hammer)", + "block.mineralogy.basalt_relief_hoe": "Relief aus Basalt (Hacke)", + "block.mineralogy.basalt_relief_horizontal": "Relief aus Basalt (waagerecht)", + "block.mineralogy.basalt_relief_i": "Relief aus Basalt (I)", + "block.mineralogy.basalt_relief_left": "Relief aus Basalt (links)", + "block.mineralogy.basalt_relief_pickaxe": "Relief aus Basalt (Spitzhacke)", + "block.mineralogy.basalt_relief_plus": "Relief aus Basalt (Pluszeichen)", + "block.mineralogy.basalt_relief_right": "Relief aus Basalt (rechts)", + "block.mineralogy.basalt_relief_sword": "Relief aus Basalt (Schwert)", + "block.mineralogy.basalt_relief_vertical": "Relief aus Basalt (senkrecht)", + "block.mineralogy.diorite_relief_axe": "Relief aus Diorit (Axt)", + "block.mineralogy.diorite_relief_blank": "Relief aus Diorit (ohne Motiv)", + "block.mineralogy.diorite_relief_cross": "Relief aus Diorit (Kreuz)", + "block.mineralogy.diorite_relief_hammer": "Relief aus Diorit (Hammer)", + "block.mineralogy.diorite_relief_hoe": "Relief aus Diorit (Hacke)", + "block.mineralogy.diorite_relief_horizontal": "Relief aus Diorit (waagerecht)", + "block.mineralogy.diorite_relief_i": "Relief aus Diorit (I)", + "block.mineralogy.diorite_relief_left": "Relief aus Diorit (links)", + "block.mineralogy.diorite_relief_pickaxe": "Relief aus Diorit (Spitzhacke)", + "block.mineralogy.diorite_relief_plus": "Relief aus Diorit (Pluszeichen)", + "block.mineralogy.diorite_relief_right": "Relief aus Diorit (rechts)", + "block.mineralogy.diorite_relief_sword": "Relief aus Diorit (Schwert)", + "block.mineralogy.diorite_relief_vertical": "Relief aus Diorit (senkrecht)", + "block.mineralogy.granite_relief_axe": "Relief aus Granit (Axt)", + "block.mineralogy.granite_relief_blank": "Relief aus Granit (ohne Motiv)", + "block.mineralogy.granite_relief_cross": "Relief aus Granit (Kreuz)", + "block.mineralogy.granite_relief_hammer": "Relief aus Granit (Hammer)", + "block.mineralogy.granite_relief_hoe": "Relief aus Granit (Hacke)", + "block.mineralogy.granite_relief_horizontal": "Relief aus Granit (waagerecht)", + "block.mineralogy.granite_relief_i": "Relief aus Granit (I)", + "block.mineralogy.granite_relief_left": "Relief aus Granit (links)", + "block.mineralogy.granite_relief_pickaxe": "Relief aus Granit (Spitzhacke)", + "block.mineralogy.granite_relief_plus": "Relief aus Granit (Pluszeichen)", + "block.mineralogy.granite_relief_right": "Relief aus Granit (rechts)", + "block.mineralogy.granite_relief_sword": "Relief aus Granit (Schwert)", + "block.mineralogy.granite_relief_vertical": "Relief aus Granit (senkrecht)", + "block.mineralogy.rhyolite_relief_axe": "Relief aus Rhyolith (Axt)", + "block.mineralogy.rhyolite_relief_blank": "Relief aus Rhyolith (ohne Motiv)", + "block.mineralogy.rhyolite_relief_cross": "Relief aus Rhyolith (Kreuz)", + "block.mineralogy.rhyolite_relief_hammer": "Relief aus Rhyolith (Hammer)", + "block.mineralogy.rhyolite_relief_hoe": "Relief aus Rhyolith (Hacke)", + "block.mineralogy.rhyolite_relief_horizontal": "Relief aus Rhyolith (waagerecht)", + "block.mineralogy.rhyolite_relief_i": "Relief aus Rhyolith (I)", + "block.mineralogy.rhyolite_relief_left": "Relief aus Rhyolith (links)", + "block.mineralogy.rhyolite_relief_pickaxe": "Relief aus Rhyolith (Spitzhacke)", + "block.mineralogy.rhyolite_relief_plus": "Relief aus Rhyolith (Pluszeichen)", + "block.mineralogy.rhyolite_relief_right": "Relief aus Rhyolith (rechts)", + "block.mineralogy.rhyolite_relief_sword": "Relief aus Rhyolith (Schwert)", + "block.mineralogy.rhyolite_relief_vertical": "Relief aus Rhyolith (senkrecht)", + "block.mineralogy.pegmatite_relief_axe": "Relief aus Pegmatit (Axt)", + "block.mineralogy.pegmatite_relief_blank": "Relief aus Pegmatit (ohne Motiv)", + "block.mineralogy.pegmatite_relief_cross": "Relief aus Pegmatit (Kreuz)", + "block.mineralogy.pegmatite_relief_hammer": "Relief aus Pegmatit (Hammer)", + "block.mineralogy.pegmatite_relief_hoe": "Relief aus Pegmatit (Hacke)", + "block.mineralogy.pegmatite_relief_horizontal": "Relief aus Pegmatit (waagerecht)", + "block.mineralogy.pegmatite_relief_i": "Relief aus Pegmatit (I)", + "block.mineralogy.pegmatite_relief_left": "Relief aus Pegmatit (links)", + "block.mineralogy.pegmatite_relief_pickaxe": "Relief aus Pegmatit (Spitzhacke)", + "block.mineralogy.pegmatite_relief_plus": "Relief aus Pegmatit (Pluszeichen)", + "block.mineralogy.pegmatite_relief_right": "Relief aus Pegmatit (rechts)", + "block.mineralogy.pegmatite_relief_sword": "Relief aus Pegmatit (Schwert)", + "block.mineralogy.pegmatite_relief_vertical": "Relief aus Pegmatit (senkrecht)", + "block.mineralogy.shale_relief_axe": "Relief aus Tonschiefer (Axt)", + "block.mineralogy.shale_relief_blank": "Relief aus Tonschiefer (ohne Motiv)", + "block.mineralogy.shale_relief_cross": "Relief aus Tonschiefer (Kreuz)", + "block.mineralogy.shale_relief_hammer": "Relief aus Tonschiefer (Hammer)", + "block.mineralogy.shale_relief_hoe": "Relief aus Tonschiefer (Hacke)", + "block.mineralogy.shale_relief_horizontal": "Relief aus Tonschiefer (waagerecht)", + "block.mineralogy.shale_relief_i": "Relief aus Tonschiefer (I)", + "block.mineralogy.shale_relief_left": "Relief aus Tonschiefer (links)", + "block.mineralogy.shale_relief_pickaxe": "Relief aus Tonschiefer (Spitzhacke)", + "block.mineralogy.shale_relief_plus": "Relief aus Tonschiefer (Pluszeichen)", + "block.mineralogy.shale_relief_right": "Relief aus Tonschiefer (rechts)", + "block.mineralogy.shale_relief_sword": "Relief aus Tonschiefer (Schwert)", + "block.mineralogy.shale_relief_vertical": "Relief aus Tonschiefer (senkrecht)", + "block.mineralogy.conglomerate_relief_axe": "Relief aus Konglomerat (Axt)", + "block.mineralogy.conglomerate_relief_blank": "Relief aus Konglomerat (ohne Motiv)", + "block.mineralogy.conglomerate_relief_cross": "Relief aus Konglomerat (Kreuz)", + "block.mineralogy.conglomerate_relief_hammer": "Relief aus Konglomerat (Hammer)", + "block.mineralogy.conglomerate_relief_hoe": "Relief aus Konglomerat (Hacke)", + "block.mineralogy.conglomerate_relief_horizontal": "Relief aus Konglomerat (waagerecht)", + "block.mineralogy.conglomerate_relief_i": "Relief aus Konglomerat (I)", + "block.mineralogy.conglomerate_relief_left": "Relief aus Konglomerat (links)", + "block.mineralogy.conglomerate_relief_pickaxe": "Relief aus Konglomerat (Spitzhacke)", + "block.mineralogy.conglomerate_relief_plus": "Relief aus Konglomerat (Pluszeichen)", + "block.mineralogy.conglomerate_relief_right": "Relief aus Konglomerat (rechts)", + "block.mineralogy.conglomerate_relief_sword": "Relief aus Konglomerat (Schwert)", + "block.mineralogy.conglomerate_relief_vertical": "Relief aus Konglomerat (senkrecht)", + "block.mineralogy.dolomite_relief_axe": "Relief aus Dolomit (Axt)", + "block.mineralogy.dolomite_relief_blank": "Relief aus Dolomit (ohne Motiv)", + "block.mineralogy.dolomite_relief_cross": "Relief aus Dolomit (Kreuz)", + "block.mineralogy.dolomite_relief_hammer": "Relief aus Dolomit (Hammer)", + "block.mineralogy.dolomite_relief_hoe": "Relief aus Dolomit (Hacke)", + "block.mineralogy.dolomite_relief_horizontal": "Relief aus Dolomit (waagerecht)", + "block.mineralogy.dolomite_relief_i": "Relief aus Dolomit (I)", + "block.mineralogy.dolomite_relief_left": "Relief aus Dolomit (links)", + "block.mineralogy.dolomite_relief_pickaxe": "Relief aus Dolomit (Spitzhacke)", + "block.mineralogy.dolomite_relief_plus": "Relief aus Dolomit (Pluszeichen)", + "block.mineralogy.dolomite_relief_right": "Relief aus Dolomit (rechts)", + "block.mineralogy.dolomite_relief_sword": "Relief aus Dolomit (Schwert)", + "block.mineralogy.dolomite_relief_vertical": "Relief aus Dolomit (senkrecht)", + "block.mineralogy.limestone_relief_axe": "Relief aus Kalkstein (Axt)", + "block.mineralogy.limestone_relief_blank": "Relief aus Kalkstein (ohne Motiv)", + "block.mineralogy.limestone_relief_cross": "Relief aus Kalkstein (Kreuz)", + "block.mineralogy.limestone_relief_hammer": "Relief aus Kalkstein (Hammer)", + "block.mineralogy.limestone_relief_hoe": "Relief aus Kalkstein (Hacke)", + "block.mineralogy.limestone_relief_horizontal": "Relief aus Kalkstein (waagerecht)", + "block.mineralogy.limestone_relief_i": "Relief aus Kalkstein (I)", + "block.mineralogy.limestone_relief_left": "Relief aus Kalkstein (links)", + "block.mineralogy.limestone_relief_pickaxe": "Relief aus Kalkstein (Spitzhacke)", + "block.mineralogy.limestone_relief_plus": "Relief aus Kalkstein (Pluszeichen)", + "block.mineralogy.limestone_relief_right": "Relief aus Kalkstein (rechts)", + "block.mineralogy.limestone_relief_sword": "Relief aus Kalkstein (Schwert)", + "block.mineralogy.limestone_relief_vertical": "Relief aus Kalkstein (senkrecht)", + "block.mineralogy.marble_relief_axe": "Relief aus Marmor (Axt)", + "block.mineralogy.marble_relief_blank": "Relief aus Marmor (ohne Motiv)", + "block.mineralogy.marble_relief_cross": "Relief aus Marmor (Kreuz)", + "block.mineralogy.marble_relief_hammer": "Relief aus Marmor (Hammer)", + "block.mineralogy.marble_relief_hoe": "Relief aus Marmor (Hacke)", + "block.mineralogy.marble_relief_horizontal": "Relief aus Marmor (waagerecht)", + "block.mineralogy.marble_relief_i": "Relief aus Marmor (I)", + "block.mineralogy.marble_relief_left": "Relief aus Marmor (links)", + "block.mineralogy.marble_relief_pickaxe": "Relief aus Marmor (Spitzhacke)", + "block.mineralogy.marble_relief_plus": "Relief aus Marmor (Pluszeichen)", + "block.mineralogy.marble_relief_right": "Relief aus Marmor (rechts)", + "block.mineralogy.marble_relief_sword": "Relief aus Marmor (Schwert)", + "block.mineralogy.marble_relief_vertical": "Relief aus Marmor (senkrecht)", + "block.mineralogy.slate_relief_axe": "Relief aus Schiefer (Axt)", + "block.mineralogy.slate_relief_blank": "Relief aus Schiefer (ohne Motiv)", + "block.mineralogy.slate_relief_cross": "Relief aus Schiefer (Kreuz)", + "block.mineralogy.slate_relief_hammer": "Relief aus Schiefer (Hammer)", + "block.mineralogy.slate_relief_hoe": "Relief aus Schiefer (Hacke)", + "block.mineralogy.slate_relief_horizontal": "Relief aus Schiefer (waagerecht)", + "block.mineralogy.slate_relief_i": "Relief aus Schiefer (I)", + "block.mineralogy.slate_relief_left": "Relief aus Schiefer (links)", + "block.mineralogy.slate_relief_pickaxe": "Relief aus Schiefer (Spitzhacke)", + "block.mineralogy.slate_relief_plus": "Relief aus Schiefer (Pluszeichen)", + "block.mineralogy.slate_relief_right": "Relief aus Schiefer (rechts)", + "block.mineralogy.slate_relief_sword": "Relief aus Schiefer (Schwert)", + "block.mineralogy.slate_relief_vertical": "Relief aus Schiefer (senkrecht)", + "block.mineralogy.schist_relief_axe": "Relief aus Glimmerschiefer (Axt)", + "block.mineralogy.schist_relief_blank": "Relief aus Glimmerschiefer (ohne Motiv)", + "block.mineralogy.schist_relief_cross": "Relief aus Glimmerschiefer (Kreuz)", + "block.mineralogy.schist_relief_hammer": "Relief aus Glimmerschiefer (Hammer)", + "block.mineralogy.schist_relief_hoe": "Relief aus Glimmerschiefer (Hacke)", + "block.mineralogy.schist_relief_horizontal": "Relief aus Glimmerschiefer (waagerecht)", + "block.mineralogy.schist_relief_i": "Relief aus Glimmerschiefer (I)", + "block.mineralogy.schist_relief_left": "Relief aus Glimmerschiefer (links)", + "block.mineralogy.schist_relief_pickaxe": "Relief aus Glimmerschiefer (Spitzhacke)", + "block.mineralogy.schist_relief_plus": "Relief aus Glimmerschiefer (Pluszeichen)", + "block.mineralogy.schist_relief_right": "Relief aus Glimmerschiefer (rechts)", + "block.mineralogy.schist_relief_sword": "Relief aus Glimmerschiefer (Schwert)", + "block.mineralogy.schist_relief_vertical": "Relief aus Glimmerschiefer (senkrecht)", + "block.mineralogy.gneiss_relief_axe": "Relief aus Gneis (Axt)", + "block.mineralogy.gneiss_relief_blank": "Relief aus Gneis (ohne Motiv)", + "block.mineralogy.gneiss_relief_cross": "Relief aus Gneis (Kreuz)", + "block.mineralogy.gneiss_relief_hammer": "Relief aus Gneis (Hammer)", + "block.mineralogy.gneiss_relief_hoe": "Relief aus Gneis (Hacke)", + "block.mineralogy.gneiss_relief_horizontal": "Relief aus Gneis (waagerecht)", + "block.mineralogy.gneiss_relief_i": "Relief aus Gneis (I)", + "block.mineralogy.gneiss_relief_left": "Relief aus Gneis (links)", + "block.mineralogy.gneiss_relief_pickaxe": "Relief aus Gneis (Spitzhacke)", + "block.mineralogy.gneiss_relief_plus": "Relief aus Gneis (Pluszeichen)", + "block.mineralogy.gneiss_relief_right": "Relief aus Gneis (rechts)", + "block.mineralogy.gneiss_relief_sword": "Relief aus Gneis (Schwert)", + "block.mineralogy.gneiss_relief_vertical": "Relief aus Gneis (senkrecht)", + "block.mineralogy.phyllite_relief_axe": "Relief aus Phyllit (Axt)", + "block.mineralogy.phyllite_relief_blank": "Relief aus Phyllit (ohne Motiv)", + "block.mineralogy.phyllite_relief_cross": "Relief aus Phyllit (Kreuz)", + "block.mineralogy.phyllite_relief_hammer": "Relief aus Phyllit (Hammer)", + "block.mineralogy.phyllite_relief_hoe": "Relief aus Phyllit (Hacke)", + "block.mineralogy.phyllite_relief_horizontal": "Relief aus Phyllit (waagerecht)", + "block.mineralogy.phyllite_relief_i": "Relief aus Phyllit (I)", + "block.mineralogy.phyllite_relief_left": "Relief aus Phyllit (links)", + "block.mineralogy.phyllite_relief_pickaxe": "Relief aus Phyllit (Spitzhacke)", + "block.mineralogy.phyllite_relief_plus": "Relief aus Phyllit (Pluszeichen)", + "block.mineralogy.phyllite_relief_right": "Relief aus Phyllit (rechts)", + "block.mineralogy.phyllite_relief_sword": "Relief aus Phyllit (Schwert)", + "block.mineralogy.phyllite_relief_vertical": "Relief aus Phyllit (senkrecht)", + "block.mineralogy.amphibolite_relief_axe": "Relief aus Amphibolit (Axt)", + "block.mineralogy.amphibolite_relief_blank": "Relief aus Amphibolit (ohne Motiv)", + "block.mineralogy.amphibolite_relief_cross": "Relief aus Amphibolit (Kreuz)", + "block.mineralogy.amphibolite_relief_hammer": "Relief aus Amphibolit (Hammer)", + "block.mineralogy.amphibolite_relief_hoe": "Relief aus Amphibolit (Hacke)", + "block.mineralogy.amphibolite_relief_horizontal": "Relief aus Amphibolit (waagerecht)", + "block.mineralogy.amphibolite_relief_i": "Relief aus Amphibolit (I)", + "block.mineralogy.amphibolite_relief_left": "Relief aus Amphibolit (links)", + "block.mineralogy.amphibolite_relief_pickaxe": "Relief aus Amphibolit (Spitzhacke)", + "block.mineralogy.amphibolite_relief_plus": "Relief aus Amphibolit (Pluszeichen)", + "block.mineralogy.amphibolite_relief_right": "Relief aus Amphibolit (rechts)", + "block.mineralogy.amphibolite_relief_sword": "Relief aus Amphibolit (Schwert)", + "block.mineralogy.amphibolite_relief_vertical": "Relief aus Amphibolit (senkrecht)", + "block.mineralogy.diabase_relief_axe": "Relief aus Diabas (Axt)", + "block.mineralogy.diabase_relief_blank": "Relief aus Diabas (ohne Motiv)", + "block.mineralogy.diabase_relief_cross": "Relief aus Diabas (Kreuz)", + "block.mineralogy.diabase_relief_hammer": "Relief aus Diabas (Hammer)", + "block.mineralogy.diabase_relief_hoe": "Relief aus Diabas (Hacke)", + "block.mineralogy.diabase_relief_horizontal": "Relief aus Diabas (waagerecht)", + "block.mineralogy.diabase_relief_i": "Relief aus Diabas (I)", + "block.mineralogy.diabase_relief_left": "Relief aus Diabas (links)", + "block.mineralogy.diabase_relief_pickaxe": "Relief aus Diabas (Spitzhacke)", + "block.mineralogy.diabase_relief_plus": "Relief aus Diabas (Pluszeichen)", + "block.mineralogy.diabase_relief_right": "Relief aus Diabas (rechts)", + "block.mineralogy.diabase_relief_sword": "Relief aus Diabas (Schwert)", + "block.mineralogy.diabase_relief_vertical": "Relief aus Diabas (senkrecht)", + "block.mineralogy.gabbro_relief_axe": "Relief aus Gabbro (Axt)", + "block.mineralogy.gabbro_relief_blank": "Relief aus Gabbro (ohne Motiv)", + "block.mineralogy.gabbro_relief_cross": "Relief aus Gabbro (Kreuz)", + "block.mineralogy.gabbro_relief_hammer": "Relief aus Gabbro (Hammer)", + "block.mineralogy.gabbro_relief_hoe": "Relief aus Gabbro (Hacke)", + "block.mineralogy.gabbro_relief_horizontal": "Relief aus Gabbro (waagerecht)", + "block.mineralogy.gabbro_relief_i": "Relief aus Gabbro (I)", + "block.mineralogy.gabbro_relief_left": "Relief aus Gabbro (links)", + "block.mineralogy.gabbro_relief_pickaxe": "Relief aus Gabbro (Spitzhacke)", + "block.mineralogy.gabbro_relief_plus": "Relief aus Gabbro (Pluszeichen)", + "block.mineralogy.gabbro_relief_right": "Relief aus Gabbro (rechts)", + "block.mineralogy.gabbro_relief_sword": "Relief aus Gabbro (Schwert)", + "block.mineralogy.gabbro_relief_vertical": "Relief aus Gabbro (senkrecht)", + "block.mineralogy.peridotite_relief_axe": "Relief aus Peridotit (Axt)", + "block.mineralogy.peridotite_relief_blank": "Relief aus Peridotit (ohne Motiv)", + "block.mineralogy.peridotite_relief_cross": "Relief aus Peridotit (Kreuz)", + "block.mineralogy.peridotite_relief_hammer": "Relief aus Peridotit (Hammer)", + "block.mineralogy.peridotite_relief_hoe": "Relief aus Peridotit (Hacke)", + "block.mineralogy.peridotite_relief_horizontal": "Relief aus Peridotit (waagerecht)", + "block.mineralogy.peridotite_relief_i": "Relief aus Peridotit (I)", + "block.mineralogy.peridotite_relief_left": "Relief aus Peridotit (links)", + "block.mineralogy.peridotite_relief_pickaxe": "Relief aus Peridotit (Spitzhacke)", + "block.mineralogy.peridotite_relief_plus": "Relief aus Peridotit (Pluszeichen)", + "block.mineralogy.peridotite_relief_right": "Relief aus Peridotit (rechts)", + "block.mineralogy.peridotite_relief_sword": "Relief aus Peridotit (Schwert)", + "block.mineralogy.peridotite_relief_vertical": "Relief aus Peridotit (senkrecht)", + "block.mineralogy.basaltic_glass_relief_axe": "Relief aus Basaltglas (Axt)", + "block.mineralogy.basaltic_glass_relief_blank": "Relief aus Basaltglas (ohne Motiv)", + "block.mineralogy.basaltic_glass_relief_cross": "Relief aus Basaltglas (Kreuz)", + "block.mineralogy.basaltic_glass_relief_hammer": "Relief aus Basaltglas (Hammer)", + "block.mineralogy.basaltic_glass_relief_hoe": "Relief aus Basaltglas (Hacke)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Relief aus Basaltglas (waagerecht)", + "block.mineralogy.basaltic_glass_relief_i": "Relief aus Basaltglas (I)", + "block.mineralogy.basaltic_glass_relief_left": "Relief aus Basaltglas (links)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Relief aus Basaltglas (Spitzhacke)", + "block.mineralogy.basaltic_glass_relief_plus": "Relief aus Basaltglas (Pluszeichen)", + "block.mineralogy.basaltic_glass_relief_right": "Relief aus Basaltglas (rechts)", + "block.mineralogy.basaltic_glass_relief_sword": "Relief aus Basaltglas (Schwert)", + "block.mineralogy.basaltic_glass_relief_vertical": "Relief aus Basaltglas (senkrecht)", + "block.mineralogy.scoria_relief_axe": "Relief aus Skoria (Axt)", + "block.mineralogy.scoria_relief_blank": "Relief aus Skoria (ohne Motiv)", + "block.mineralogy.scoria_relief_cross": "Relief aus Skoria (Kreuz)", + "block.mineralogy.scoria_relief_hammer": "Relief aus Skoria (Hammer)", + "block.mineralogy.scoria_relief_hoe": "Relief aus Skoria (Hacke)", + "block.mineralogy.scoria_relief_horizontal": "Relief aus Skoria (waagerecht)", + "block.mineralogy.scoria_relief_i": "Relief aus Skoria (I)", + "block.mineralogy.scoria_relief_left": "Relief aus Skoria (links)", + "block.mineralogy.scoria_relief_pickaxe": "Relief aus Skoria (Spitzhacke)", + "block.mineralogy.scoria_relief_plus": "Relief aus Skoria (Pluszeichen)", + "block.mineralogy.scoria_relief_right": "Relief aus Skoria (rechts)", + "block.mineralogy.scoria_relief_sword": "Relief aus Skoria (Schwert)", + "block.mineralogy.scoria_relief_vertical": "Relief aus Skoria (senkrecht)", + "block.mineralogy.tuff_relief_axe": "Relief aus Tuffstein (Axt)", + "block.mineralogy.tuff_relief_blank": "Relief aus Tuffstein (ohne Motiv)", + "block.mineralogy.tuff_relief_cross": "Relief aus Tuffstein (Kreuz)", + "block.mineralogy.tuff_relief_hammer": "Relief aus Tuffstein (Hammer)", + "block.mineralogy.tuff_relief_hoe": "Relief aus Tuffstein (Hacke)", + "block.mineralogy.tuff_relief_horizontal": "Relief aus Tuffstein (waagerecht)", + "block.mineralogy.tuff_relief_i": "Relief aus Tuffstein (I)", + "block.mineralogy.tuff_relief_left": "Relief aus Tuffstein (links)", + "block.mineralogy.tuff_relief_pickaxe": "Relief aus Tuffstein (Spitzhacke)", + "block.mineralogy.tuff_relief_plus": "Relief aus Tuffstein (Pluszeichen)", + "block.mineralogy.tuff_relief_right": "Relief aus Tuffstein (rechts)", + "block.mineralogy.tuff_relief_sword": "Relief aus Tuffstein (Schwert)", + "block.mineralogy.tuff_relief_vertical": "Relief aus Tuffstein (senkrecht)", + "block.mineralogy.siltstone_relief_axe": "Relief aus Schluffstein (Axt)", + "block.mineralogy.siltstone_relief_blank": "Relief aus Schluffstein (ohne Motiv)", + "block.mineralogy.siltstone_relief_cross": "Relief aus Schluffstein (Kreuz)", + "block.mineralogy.siltstone_relief_hammer": "Relief aus Schluffstein (Hammer)", + "block.mineralogy.siltstone_relief_hoe": "Relief aus Schluffstein (Hacke)", + "block.mineralogy.siltstone_relief_horizontal": "Relief aus Schluffstein (waagerecht)", + "block.mineralogy.siltstone_relief_i": "Relief aus Schluffstein (I)", + "block.mineralogy.siltstone_relief_left": "Relief aus Schluffstein (links)", + "block.mineralogy.siltstone_relief_pickaxe": "Relief aus Schluffstein (Spitzhacke)", + "block.mineralogy.siltstone_relief_plus": "Relief aus Schluffstein (Pluszeichen)", + "block.mineralogy.siltstone_relief_right": "Relief aus Schluffstein (rechts)", + "block.mineralogy.siltstone_relief_sword": "Relief aus Schluffstein (Schwert)", + "block.mineralogy.siltstone_relief_vertical": "Relief aus Schluffstein (senkrecht)", + "block.mineralogy.rock_salt_relief_axe": "Relief aus Steinsalz (Axt)", + "block.mineralogy.rock_salt_relief_blank": "Relief aus Steinsalz (ohne Motiv)", + "block.mineralogy.rock_salt_relief_cross": "Relief aus Steinsalz (Kreuz)", + "block.mineralogy.rock_salt_relief_hammer": "Relief aus Steinsalz (Hammer)", + "block.mineralogy.rock_salt_relief_hoe": "Relief aus Steinsalz (Hacke)", + "block.mineralogy.rock_salt_relief_horizontal": "Relief aus Steinsalz (waagerecht)", + "block.mineralogy.rock_salt_relief_i": "Relief aus Steinsalz (I)", + "block.mineralogy.rock_salt_relief_left": "Relief aus Steinsalz (links)", + "block.mineralogy.rock_salt_relief_pickaxe": "Relief aus Steinsalz (Spitzhacke)", + "block.mineralogy.rock_salt_relief_plus": "Relief aus Steinsalz (Pluszeichen)", + "block.mineralogy.rock_salt_relief_right": "Relief aus Steinsalz (rechts)", + "block.mineralogy.rock_salt_relief_sword": "Relief aus Steinsalz (Schwert)", + "block.mineralogy.rock_salt_relief_vertical": "Relief aus Steinsalz (senkrecht)", + "block.mineralogy.hornfels_relief_axe": "Relief aus Hornfels (Axt)", + "block.mineralogy.hornfels_relief_blank": "Relief aus Hornfels (ohne Motiv)", + "block.mineralogy.hornfels_relief_cross": "Relief aus Hornfels (Kreuz)", + "block.mineralogy.hornfels_relief_hammer": "Relief aus Hornfels (Hammer)", + "block.mineralogy.hornfels_relief_hoe": "Relief aus Hornfels (Hacke)", + "block.mineralogy.hornfels_relief_horizontal": "Relief aus Hornfels (waagerecht)", + "block.mineralogy.hornfels_relief_i": "Relief aus Hornfels (I)", + "block.mineralogy.hornfels_relief_left": "Relief aus Hornfels (links)", + "block.mineralogy.hornfels_relief_pickaxe": "Relief aus Hornfels (Spitzhacke)", + "block.mineralogy.hornfels_relief_plus": "Relief aus Hornfels (Pluszeichen)", + "block.mineralogy.hornfels_relief_right": "Relief aus Hornfels (rechts)", + "block.mineralogy.hornfels_relief_sword": "Relief aus Hornfels (Schwert)", + "block.mineralogy.hornfels_relief_vertical": "Relief aus Hornfels (senkrecht)", + "block.mineralogy.quartzite_relief_axe": "Relief aus Quarzit (Axt)", + "block.mineralogy.quartzite_relief_blank": "Relief aus Quarzit (ohne Motiv)", + "block.mineralogy.quartzite_relief_cross": "Relief aus Quarzit (Kreuz)", + "block.mineralogy.quartzite_relief_hammer": "Relief aus Quarzit (Hammer)", + "block.mineralogy.quartzite_relief_hoe": "Relief aus Quarzit (Hacke)", + "block.mineralogy.quartzite_relief_horizontal": "Relief aus Quarzit (waagerecht)", + "block.mineralogy.quartzite_relief_i": "Relief aus Quarzit (I)", + "block.mineralogy.quartzite_relief_left": "Relief aus Quarzit (links)", + "block.mineralogy.quartzite_relief_pickaxe": "Relief aus Quarzit (Spitzhacke)", + "block.mineralogy.quartzite_relief_plus": "Relief aus Quarzit (Pluszeichen)", + "block.mineralogy.quartzite_relief_right": "Relief aus Quarzit (rechts)", + "block.mineralogy.quartzite_relief_sword": "Relief aus Quarzit (Schwert)", + "block.mineralogy.quartzite_relief_vertical": "Relief aus Quarzit (senkrecht)", + "block.mineralogy.novaculite_relief_axe": "Relief aus Novakulit (Axt)", + "block.mineralogy.novaculite_relief_blank": "Relief aus Novakulit (ohne Motiv)", + "block.mineralogy.novaculite_relief_cross": "Relief aus Novakulit (Kreuz)", + "block.mineralogy.novaculite_relief_hammer": "Relief aus Novakulit (Hammer)", + "block.mineralogy.novaculite_relief_hoe": "Relief aus Novakulit (Hacke)", + "block.mineralogy.novaculite_relief_horizontal": "Relief aus Novakulit (waagerecht)", + "block.mineralogy.novaculite_relief_i": "Relief aus Novakulit (I)", + "block.mineralogy.novaculite_relief_left": "Relief aus Novakulit (links)", + "block.mineralogy.novaculite_relief_pickaxe": "Relief aus Novakulit (Spitzhacke)", + "block.mineralogy.novaculite_relief_plus": "Relief aus Novakulit (Pluszeichen)", + "block.mineralogy.novaculite_relief_right": "Relief aus Novakulit (rechts)", + "block.mineralogy.novaculite_relief_sword": "Relief aus Novakulit (Schwert)", + "block.mineralogy.novaculite_relief_vertical": "Relief aus Novakulit (senkrecht)", + "itemGroup.mineralogy.mineralogy": "Mineralogie", + "itemGroup.mineralogy.rock": "Mineralogische Gesteine", + "itemGroup.mineralogy.stair": "Mineralogie-Treppen", + "itemGroup.mineralogy.slab": "Mineralogie-Stufen", + "itemGroup.mineralogy.wall": "Mineralogie-Mauern", + "itemGroup.mineralogy.item": "Mineralogie-Gegenstände", + "block.mineralogy.crude_oil": "Rohöl", + "item.mineralogy.crude_oil_bucket": "Rohöleimer", + "fluid.mineralogy.crude_oil": "Rohöl", + "advancements.mineralogy.all_the_rocks.title": "Alle Gesteine", + "advancements.mineralogy.all_the_rocks.description": "Du hast alle Standardgesteine in Mineralogy gefunden!" } diff --git a/src/main/resources/assets/mineralogy/lang/de_de.json b/src/main/resources/assets/mineralogy/lang/de_de.json index 581c9281f..09373688a 100644 --- a/src/main/resources/assets/mineralogy/lang/de_de.json +++ b/src/main/resources/assets/mineralogy/lang/de_de.json @@ -1,202 +1,202 @@ { "block.mineralogy.andesite": "Andesit", - "block.mineralogy.andesite_stairs": "Andesit-Treppe", - "block.mineralogy.andesite_slab": "Andesit-Platte", - "block.mineralogy.andesite_brick": "Andesit-Ziegelstein", - "block.mineralogy.andesite_brick_stairs": "Andesit-Ziegelstein-Treppe", - "block.mineralogy.andesite_brick_slab": "Andesit-Ziegelsteinplatte", - "block.mineralogy.andesite_smooth": "Polierter Andesit", - "block.mineralogy.andesite_smooth_stairs": "Polierte Andesit-Treppe", - "block.mineralogy.andesite_smooth_slab": "Polierte Andesit-Platte", - "block.mineralogy.andesite_smooth_brick": "Polierter Andesit-Ziegelstein", - "block.mineralogy.andesite_smooth_brick_stairs": "Polierte Andesit-Ziegelstein-Treppe", - "block.mineralogy.andesite_smooth_brick_slab": "Polierte Andesit-Ziegelsteinplatte", + "block.mineralogy.andesite_stairs": "Treppe aus Andesit", + "block.mineralogy.andesite_slab": "Stufe aus Andesit", + "block.mineralogy.andesite_brick": "Ziegel aus Andesit", + "block.mineralogy.andesite_brick_stairs": "Ziegeltreppe aus Andesit", + "block.mineralogy.andesite_brick_slab": "Ziegelstufe aus Andesit", + "block.mineralogy.andesite_smooth": "Polierter Block aus Andesit", + "block.mineralogy.andesite_smooth_stairs": "Polierte Treppe aus Andesit", + "block.mineralogy.andesite_smooth_slab": "Polierte Stufe aus Andesit", + "block.mineralogy.andesite_smooth_brick": "Polierte Ziegel aus Andesit", + "block.mineralogy.andesite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Andesit", + "block.mineralogy.andesite_smooth_brick_slab": "Polierte Ziegelstufe aus Andesit", "block.mineralogy.basalt": "Basalt", - "block.mineralogy.basalt_stairs": "Basalt Treppen", - "block.mineralogy.basalt_slab": "Basaltplatte", - "block.mineralogy.basalt_brick": "Basaltstein", - "block.mineralogy.basalt_brick_stairs": "Basaltstein Treppen", - "block.mineralogy.basalt_brick_slab": "Basaltstein Platte", - "block.mineralogy.basalt_smooth": "Polierter Basalt", - "block.mineralogy.basalt_smooth_stairs": "Polierte Basalt Treppen", - "block.mineralogy.basalt_smooth_slab": "Polierte Basaltplatte", - "block.mineralogy.basalt_smooth_brick": "Polierter Basaltstein", - "block.mineralogy.basalt_smooth_brick_stairs": "Polierter Basaltstein-Treppen", - "block.mineralogy.basalt_smooth_brick_slab": "Polierter Basaltstein-Platte", + "block.mineralogy.basalt_stairs": "Treppe aus Basalt", + "block.mineralogy.basalt_slab": "Stufe aus Basalt", + "block.mineralogy.basalt_brick": "Ziegel aus Basalt", + "block.mineralogy.basalt_brick_stairs": "Ziegeltreppe aus Basalt", + "block.mineralogy.basalt_brick_slab": "Ziegelstufe aus Basalt", + "block.mineralogy.basalt_smooth": "Polierter Block aus Basalt", + "block.mineralogy.basalt_smooth_stairs": "Polierte Treppe aus Basalt", + "block.mineralogy.basalt_smooth_slab": "Polierte Stufe aus Basalt", + "block.mineralogy.basalt_smooth_brick": "Polierte Ziegel aus Basalt", + "block.mineralogy.basalt_smooth_brick_stairs": "Polierte Ziegeltreppe aus Basalt", + "block.mineralogy.basalt_smooth_brick_slab": "Polierte Ziegelstufe aus Basalt", "block.mineralogy.diorite": "Diorit", - "block.mineralogy.diorite_stairs": "Diorite Treppen", - "block.mineralogy.diorite_slab": "Dioritplatte", - "block.mineralogy.diorite_brick": "Dioritstein", - "block.mineralogy.diorite_brick_stairs": "Dioritstein Treppen", - "block.mineralogy.diorite_brick_slab": "Dioritstein Platte", - "block.mineralogy.diorite_smooth": "Polierter Diorit", - "block.mineralogy.diorite_smooth_stairs": "Polierte Diorit-Treppe", - "block.mineralogy.diorite_smooth_slab": "Polierte Dioritplatte", - "block.mineralogy.diorite_smooth_brick": "Polierter Diorit-Ziegelstein", - "block.mineralogy.diorite_smooth_brick_stairs": "Polierte Dioritstein-Treppe", - "block.mineralogy.diorite_smooth_brick_slab": "Polierte Dioritstein-Platte", + "block.mineralogy.diorite_stairs": "Treppe aus Diorit", + "block.mineralogy.diorite_slab": "Stufe aus Diorit", + "block.mineralogy.diorite_brick": "Ziegel aus Diorit", + "block.mineralogy.diorite_brick_stairs": "Ziegeltreppe aus Diorit", + "block.mineralogy.diorite_brick_slab": "Ziegelstufe aus Diorit", + "block.mineralogy.diorite_smooth": "Polierter Block aus Diorit", + "block.mineralogy.diorite_smooth_stairs": "Polierte Treppe aus Diorit", + "block.mineralogy.diorite_smooth_slab": "Polierte Stufe aus Diorit", + "block.mineralogy.diorite_smooth_brick": "Polierte Ziegel aus Diorit", + "block.mineralogy.diorite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Diorit", + "block.mineralogy.diorite_smooth_brick_slab": "Polierte Ziegelstufe aus Diorit", "block.mineralogy.granite": "Granit", - "block.mineralogy.granite_stairs": "Granit Treppe", - "block.mineralogy.granite_slab": "Granitplatte", - "block.mineralogy.granite_brick": "Granitstein", - "block.mineralogy.granite_brick_stairs": "Granitstein-Treppen", - "block.mineralogy.granite_brick_slab": "Granitstein-Platte", - "block.mineralogy.granite_smooth": "Polierter Granit", - "block.mineralogy.granite_smooth_stairs": "Polierte Granittreppe", - "block.mineralogy.granite_smooth_slab": "Polierte Granitplatte", - "block.mineralogy.granite_smooth_brick": "Polierter Granitstein", - "block.mineralogy.granite_smooth_brick_stairs": "Polierter Granitstein-Treppen", - "block.mineralogy.granite_smooth_brick_slab": "Polierter Granitstein-Platte", + "block.mineralogy.granite_stairs": "Treppe aus Granit", + "block.mineralogy.granite_slab": "Stufe aus Granit", + "block.mineralogy.granite_brick": "Ziegel aus Granit", + "block.mineralogy.granite_brick_stairs": "Ziegeltreppe aus Granit", + "block.mineralogy.granite_brick_slab": "Ziegelstufe aus Granit", + "block.mineralogy.granite_smooth": "Polierter Block aus Granit", + "block.mineralogy.granite_smooth_stairs": "Polierte Treppe aus Granit", + "block.mineralogy.granite_smooth_slab": "Polierte Stufe aus Granit", + "block.mineralogy.granite_smooth_brick": "Polierte Ziegel aus Granit", + "block.mineralogy.granite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Granit", + "block.mineralogy.granite_smooth_brick_slab": "Polierte Ziegelstufe aus Granit", "block.mineralogy.rhyolite": "Rhyolith", - "block.mineralogy.rhyolite_stairs": "Rhyolith Treppen", - "block.mineralogy.rhyolite_slab": "Rhyolithplatte", - "block.mineralogy.rhyolite_brick": "Rhyolith-Ziegelstein", - "block.mineralogy.rhyolite_brick_stairs": "Rhyolith-Ziegelstein-Treppen", - "block.mineralogy.rhyolite_brick_slab": "Rhyolith-Ziegelstein-Platte", - "block.mineralogy.rhyolite_smooth": "Polierter Rhyolith", - "block.mineralogy.rhyolite_smooth_stairs": "Polierte Rhyolith Treppen", - "block.mineralogy.rhyolite_smooth_slab": "Polierte Rhyolithplatte", - "block.mineralogy.rhyolite_smooth_brick": "Polierter Rhyolith-Ziegelstein", - "block.mineralogy.rhyolite_smooth_brick_stairs": "Polierte Rhyolith-Ziegelstein-Treppe", - "block.mineralogy.rhyolite_smooth_brick_slab": "Polierte Rhyolith-Ziegelstein-Platte", + "block.mineralogy.rhyolite_stairs": "Treppe aus Rhyolith", + "block.mineralogy.rhyolite_slab": "Stufe aus Rhyolith", + "block.mineralogy.rhyolite_brick": "Ziegel aus Rhyolith", + "block.mineralogy.rhyolite_brick_stairs": "Ziegeltreppe aus Rhyolith", + "block.mineralogy.rhyolite_brick_slab": "Ziegelstufe aus Rhyolith", + "block.mineralogy.rhyolite_smooth": "Polierter Block aus Rhyolith", + "block.mineralogy.rhyolite_smooth_stairs": "Polierte Treppe aus Rhyolith", + "block.mineralogy.rhyolite_smooth_slab": "Polierte Stufe aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick": "Polierte Ziegel aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_slab": "Polierte Ziegelstufe aus Rhyolith", "block.mineralogy.pegmatite": "Pegmatit", - "block.mineralogy.pegmatite_stairs": "Pegmatite-Treppen", - "block.mineralogy.pegmatite_slab": "Pegmatite-Platte", - "block.mineralogy.pegmatite_brick": "Pegmatit-Ziegelstein", - "block.mineralogy.pegmatite_brick_stairs": "Pegmatite-Ziegelstein-Treppe", - "block.mineralogy.pegmatite_brick_slab": "Pegmatite Ziegelsteinplatte", - "block.mineralogy.pegmatite_smooth": "Polierter Pegmatit", - "block.mineralogy.pegmatite_smooth_stairs": "Polierte Pegmatite Treppen", - "block.mineralogy.pegmatite_smooth_slab": "Polierte Pegmatite Platte", - "block.mineralogy.pegmatite_smooth_brick": "Polierter Pegmatit-Ziegelstein", - "block.mineralogy.pegmatite_smooth_brick_stairs": "Polierte Pegmatite-Ziegelstein-Treppe", - "block.mineralogy.pegmatite_smooth_brick_slab": "Polierte Pegmatite Ziegelsteinplatte", - "block.mineralogy.shale": "Schiefer", - "block.mineralogy.shale_stairs": "Schiefer Treppen", - "block.mineralogy.shale_slab": "Schieferplatte", - "block.mineralogy.shale_brick": "Schiefer-Ziegelstein", - "block.mineralogy.shale_brick_stairs": "Schiefer-Ziegelstein-Treppe", - "block.mineralogy.shale_brick_slab": "Schiefer-Ziegelstein-Platte", - "block.mineralogy.shale_smooth": "Polierter Schiefer", - "block.mineralogy.shale_smooth_stairs": "Polierte Schiefertreppe", - "block.mineralogy.shale_smooth_slab": "Polierte Schieferplatte", - "block.mineralogy.shale_smooth_brick": "Polierter Schiefer-Ziegelstein", - "block.mineralogy.shale_smooth_brick_stairs": "Polierte Schiefer-Ziegelstein-Treppe", - "block.mineralogy.shale_smooth_brick_slab": "Polierte Schiefer-Ziegelstein-Platte", + "block.mineralogy.pegmatite_stairs": "Treppe aus Pegmatit", + "block.mineralogy.pegmatite_slab": "Stufe aus Pegmatit", + "block.mineralogy.pegmatite_brick": "Ziegel aus Pegmatit", + "block.mineralogy.pegmatite_brick_stairs": "Ziegeltreppe aus Pegmatit", + "block.mineralogy.pegmatite_brick_slab": "Ziegelstufe aus Pegmatit", + "block.mineralogy.pegmatite_smooth": "Polierter Block aus Pegmatit", + "block.mineralogy.pegmatite_smooth_stairs": "Polierte Treppe aus Pegmatit", + "block.mineralogy.pegmatite_smooth_slab": "Polierte Stufe aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick": "Polierte Ziegel aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_slab": "Polierte Ziegelstufe aus Pegmatit", + "block.mineralogy.shale": "Tonschiefer", + "block.mineralogy.shale_stairs": "Treppe aus Tonschiefer", + "block.mineralogy.shale_slab": "Stufe aus Tonschiefer", + "block.mineralogy.shale_brick": "Ziegel aus Tonschiefer", + "block.mineralogy.shale_brick_stairs": "Ziegeltreppe aus Tonschiefer", + "block.mineralogy.shale_brick_slab": "Ziegelstufe aus Tonschiefer", + "block.mineralogy.shale_smooth": "Polierter Block aus Tonschiefer", + "block.mineralogy.shale_smooth_stairs": "Polierte Treppe aus Tonschiefer", + "block.mineralogy.shale_smooth_slab": "Polierte Stufe aus Tonschiefer", + "block.mineralogy.shale_smooth_brick": "Polierte Ziegel aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_stairs": "Polierte Ziegeltreppe aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_slab": "Polierte Ziegelstufe aus Tonschiefer", "block.mineralogy.conglomerate": "Konglomerat", - "block.mineralogy.conglomerate_stairs": "Konglomerat Treppen", - "block.mineralogy.conglomerate_slab": "Konglomeratplatte", - "block.mineralogy.conglomerate_brick": "Konglomerat-Ziegelstein", - "block.mineralogy.conglomerate_brick_stairs": "Konglomerat-Ziegelstein-Treppe", - "block.mineralogy.conglomerate_brick_slab": "Konglomerat-Ziegelstein-Platte", - "block.mineralogy.conglomerate_smooth": "Poliertes Konglomerat", - "block.mineralogy.conglomerate_smooth_stairs": "Polierte Konglomerat Treppen", - "block.mineralogy.conglomerate_smooth_slab": "Polierte Konglomeratplatte", - "block.mineralogy.conglomerate_smooth_brick": "Polierter Konglomerat-Ziegelstein", - "block.mineralogy.conglomerate_smooth_brick_stairs": "Polierter Konglomerat-Ziegelstein-Treppe", - "block.mineralogy.conglomerate_smooth_brick_slab": "Polierter Konglomerat-Ziegelstein-Platte", + "block.mineralogy.conglomerate_stairs": "Treppe aus Konglomerat", + "block.mineralogy.conglomerate_slab": "Stufe aus Konglomerat", + "block.mineralogy.conglomerate_brick": "Ziegel aus Konglomerat", + "block.mineralogy.conglomerate_brick_stairs": "Ziegeltreppe aus Konglomerat", + "block.mineralogy.conglomerate_brick_slab": "Ziegelstufe aus Konglomerat", + "block.mineralogy.conglomerate_smooth": "Polierter Block aus Konglomerat", + "block.mineralogy.conglomerate_smooth_stairs": "Polierte Treppe aus Konglomerat", + "block.mineralogy.conglomerate_smooth_slab": "Polierte Stufe aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick": "Polierte Ziegel aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Polierte Ziegeltreppe aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_slab": "Polierte Ziegelstufe aus Konglomerat", "block.mineralogy.dolomite": "Dolomit", - "block.mineralogy.dolomite_stairs": "Dolomit Treppen", - "block.mineralogy.dolomite_slab": "Dolomit-Platte", - "block.mineralogy.dolomite_brick": "Dolomit-Ziegelstein", - "block.mineralogy.dolomite_brick_stairs": "Dolomit-Ziegelstein-Treppe", - "block.mineralogy.dolomite_brick_slab": "Dolomit-Ziegelstein-Platte", - "block.mineralogy.dolomite_smooth": "Polierter Dolomit", - "block.mineralogy.dolomite_smooth_stairs": "Polierte Dolomitentreppe", - "block.mineralogy.dolomite_smooth_slab": "Polierte Dolomitplatte", - "block.mineralogy.dolomite_smooth_brick": "Polierter Dolomitstein", - "block.mineralogy.dolomite_smooth_brick_stairs": "Polierter Dolomit-Ziegelstein-Treppe", - "block.mineralogy.dolomite_smooth_brick_slab": "Polierter Dolomit-Ziegelstein-Platte", + "block.mineralogy.dolomite_stairs": "Treppe aus Dolomit", + "block.mineralogy.dolomite_slab": "Stufe aus Dolomit", + "block.mineralogy.dolomite_brick": "Ziegel aus Dolomit", + "block.mineralogy.dolomite_brick_stairs": "Ziegeltreppe aus Dolomit", + "block.mineralogy.dolomite_brick_slab": "Ziegelstufe aus Dolomit", + "block.mineralogy.dolomite_smooth": "Polierter Block aus Dolomit", + "block.mineralogy.dolomite_smooth_stairs": "Polierte Treppe aus Dolomit", + "block.mineralogy.dolomite_smooth_slab": "Polierte Stufe aus Dolomit", + "block.mineralogy.dolomite_smooth_brick": "Polierte Ziegel aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_slab": "Polierte Ziegelstufe aus Dolomit", "block.mineralogy.limestone": "Kalkstein", - "block.mineralogy.limestone_stairs": "Kalkstein-Treppen", - "block.mineralogy.limestone_slab": "Kalksteinplatte", - "block.mineralogy.limestone_brick": "Kalkstein-Ziegelstein", - "block.mineralogy.limestone_brick_stairs": "Kalkstein-Ziegelstein-Treppe", - "block.mineralogy.limestone_brick_slab": "Kalkstein-Ziegelstein-Platte", - "block.mineralogy.limestone_smooth": "Polierter Kalkstein", - "block.mineralogy.limestone_smooth_stairs": "Polierte Kalksteintreppe", - "block.mineralogy.limestone_smooth_slab": "Polierte Kalksteinplatte", - "block.mineralogy.limestone_smooth_brick": "Polierter Kalkstein-Ziegelstein", - "block.mineralogy.limestone_smooth_brick_stairs": "Polierter Kalkstein-Ziegelstein-Treppe", - "block.mineralogy.limestone_smooth_brick_slab": "Polierter Kalkstein-Ziegelstein-Platte", + "block.mineralogy.limestone_stairs": "Treppe aus Kalkstein", + "block.mineralogy.limestone_slab": "Stufe aus Kalkstein", + "block.mineralogy.limestone_brick": "Ziegel aus Kalkstein", + "block.mineralogy.limestone_brick_stairs": "Ziegeltreppe aus Kalkstein", + "block.mineralogy.limestone_brick_slab": "Ziegelstufe aus Kalkstein", + "block.mineralogy.limestone_smooth": "Polierter Block aus Kalkstein", + "block.mineralogy.limestone_smooth_stairs": "Polierte Treppe aus Kalkstein", + "block.mineralogy.limestone_smooth_slab": "Polierte Stufe aus Kalkstein", + "block.mineralogy.limestone_smooth_brick": "Polierte Ziegel aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_stairs": "Polierte Ziegeltreppe aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_slab": "Polierte Ziegelstufe aus Kalkstein", "block.mineralogy.slate": "Schiefer", - "block.mineralogy.slate_stairs": "Schiefer Treppen", - "block.mineralogy.slate_slab": "Schieferplatte", - "block.mineralogy.slate_brick": "Schiefer-Ziegelstein", - "block.mineralogy.slate_brick_stairs": "Schiefer-Ziegelstein-Treppe", - "block.mineralogy.slate_brick_slab": "Schiefer-Ziegelstein-Platte", - "block.mineralogy.slate_smooth": "Polierter Schiefer", - "block.mineralogy.slate_smooth_stairs": "Polierte Schiefertreppe", - "block.mineralogy.slate_smooth_slab": "Polierte Schieferplatte", - "block.mineralogy.slate_smooth_brick": "Polierter Schiefer-Ziegelstein", - "block.mineralogy.slate_smooth_brick_stairs": "Polierte Schiefer-Ziegelstein-Treppe", - "block.mineralogy.slate_smooth_brick_slab": "Polierte Schiefer-Ziegelstein-Platte", - "block.mineralogy.schist": "Schiefer", - "block.mineralogy.schist_stairs": "Schiefer Treppen", - "block.mineralogy.schist_slab": "Schieferplatte", - "block.mineralogy.schist_brick": "Schiefer-Ziegelstein", - "block.mineralogy.schist_brick_stairs": "Schiefer-Ziegelstein-Treppe", - "block.mineralogy.schist_brick_slab": "Schiefer-Ziegelstein-Platte", - "block.mineralogy.schist_smooth": "Polierter Schiefer", - "block.mineralogy.schist_smooth_stairs": "Polierte Schiefertreppe", - "block.mineralogy.schist_smooth_slab": "Polierte Schieferplatte", - "block.mineralogy.schist_smooth_brick": "Polierter Schiefer-Ziegelstein", - "block.mineralogy.schist_smooth_brick_stairs": "Polierte Schiefer-Ziegelstein-Treppe", - "block.mineralogy.schist_smooth_brick_slab": "Polierte Schiefer-Ziegelstein-Platte", + "block.mineralogy.slate_stairs": "Treppe aus Schiefer", + "block.mineralogy.slate_slab": "Stufe aus Schiefer", + "block.mineralogy.slate_brick": "Ziegel aus Schiefer", + "block.mineralogy.slate_brick_stairs": "Ziegeltreppe aus Schiefer", + "block.mineralogy.slate_brick_slab": "Ziegelstufe aus Schiefer", + "block.mineralogy.slate_smooth": "Polierter Block aus Schiefer", + "block.mineralogy.slate_smooth_stairs": "Polierte Treppe aus Schiefer", + "block.mineralogy.slate_smooth_slab": "Polierte Stufe aus Schiefer", + "block.mineralogy.slate_smooth_brick": "Polierte Ziegel aus Schiefer", + "block.mineralogy.slate_smooth_brick_stairs": "Polierte Ziegeltreppe aus Schiefer", + "block.mineralogy.slate_smooth_brick_slab": "Polierte Ziegelstufe aus Schiefer", + "block.mineralogy.schist": "Glimmerschiefer", + "block.mineralogy.schist_stairs": "Treppe aus Glimmerschiefer", + "block.mineralogy.schist_slab": "Stufe aus Glimmerschiefer", + "block.mineralogy.schist_brick": "Ziegel aus Glimmerschiefer", + "block.mineralogy.schist_brick_stairs": "Ziegeltreppe aus Glimmerschiefer", + "block.mineralogy.schist_brick_slab": "Ziegelstufe aus Glimmerschiefer", + "block.mineralogy.schist_smooth": "Polierter Block aus Glimmerschiefer", + "block.mineralogy.schist_smooth_stairs": "Polierte Treppe aus Glimmerschiefer", + "block.mineralogy.schist_smooth_slab": "Polierte Stufe aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick": "Polierte Ziegel aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_stairs": "Polierte Ziegeltreppe aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_slab": "Polierte Ziegelstufe aus Glimmerschiefer", "block.mineralogy.gneiss": "Gneis", - "block.mineralogy.gneiss_stairs": "Gneistreppe", - "block.mineralogy.gneiss_slab": "Gneisplatte", - "block.mineralogy.gneiss_brick": "Gneis Ziegel", - "block.mineralogy.gneiss_brick_stairs": "Gneis Ziegeltreppen", - "block.mineralogy.gneiss_brick_slab": "Gneissteinplatte", - "block.mineralogy.gneiss_smooth": "Polierter Gneis", - "block.mineralogy.gneiss_smooth_stairs": "Polierte Gneistreppe", - "block.mineralogy.gneiss_smooth_slab": "Polierte Gneisplatte", - "block.mineralogy.gneiss_smooth_brick": "Polierter Gneisstein", - "block.mineralogy.gneiss_smooth_brick_stairs": "Polierte Gneisziegeltreppen", - "block.mineralogy.gneiss_smooth_brick_slab": "Polierte Gneissteinplatte", + "block.mineralogy.gneiss_stairs": "Treppe aus Gneis", + "block.mineralogy.gneiss_slab": "Stufe aus Gneis", + "block.mineralogy.gneiss_brick": "Ziegel aus Gneis", + "block.mineralogy.gneiss_brick_stairs": "Ziegeltreppe aus Gneis", + "block.mineralogy.gneiss_brick_slab": "Ziegelstufe aus Gneis", + "block.mineralogy.gneiss_smooth": "Polierter Block aus Gneis", + "block.mineralogy.gneiss_smooth_stairs": "Polierte Treppe aus Gneis", + "block.mineralogy.gneiss_smooth_slab": "Polierte Stufe aus Gneis", + "block.mineralogy.gneiss_smooth_brick": "Polierte Ziegel aus Gneis", + "block.mineralogy.gneiss_smooth_brick_stairs": "Polierte Ziegeltreppe aus Gneis", + "block.mineralogy.gneiss_smooth_brick_slab": "Polierte Ziegelstufe aus Gneis", "block.mineralogy.marble": "Marmor", - "block.mineralogy.marble_stairs": "Marmortreppe", - "block.mineralogy.marble_slab": "Marmorplatte", - "block.mineralogy.marble_brick": "Marmor Backstein", - "block.mineralogy.marble_brick_stairs": "Marmor Backstein Treppe", - "block.mineralogy.marble_brick_slab": "Marmor Ziegelplatte", - "block.mineralogy.marble_smooth": "Polierter Marmor", - "block.mineralogy.marble_smooth_stairs": "Polierte Marmortreppe", - "block.mineralogy.marble_smooth_slab": "Polierte Marmorplatte", - "block.mineralogy.marble_smooth_brick": "Polierter Marmor Ziegelstein", - "block.mineralogy.marble_smooth_brick_stairs": "Polierte Marmor Ziegelstein Treppen", - "block.mineralogy.marble_smooth_brick_slab": "Polierte Marmor Ziegelstein Platte", + "block.mineralogy.marble_stairs": "Treppe aus Marmor", + "block.mineralogy.marble_slab": "Stufe aus Marmor", + "block.mineralogy.marble_brick": "Ziegel aus Marmor", + "block.mineralogy.marble_brick_stairs": "Ziegeltreppe aus Marmor", + "block.mineralogy.marble_brick_slab": "Ziegelstufe aus Marmor", + "block.mineralogy.marble_smooth": "Polierter Block aus Marmor", + "block.mineralogy.marble_smooth_stairs": "Polierte Treppe aus Marmor", + "block.mineralogy.marble_smooth_slab": "Polierte Stufe aus Marmor", + "block.mineralogy.marble_smooth_brick": "Polierte Ziegel aus Marmor", + "block.mineralogy.marble_smooth_brick_stairs": "Polierte Ziegeltreppe aus Marmor", + "block.mineralogy.marble_smooth_brick_slab": "Polierte Ziegelstufe aus Marmor", "block.mineralogy.phyllite": "Phyllit", - "block.mineralogy.phyllite_stairs": "Phyllit Treppen", - "block.mineralogy.phyllite_slab": "Phyllitplatte", - "block.mineralogy.phyllite_brick": "Phyllitstein", - "block.mineralogy.phyllite_brick_stairs": "Phyllite-Ziegelstein-Treppen", - "block.mineralogy.phyllite_brick_slab": "Phyllite-Ziegelstein-Platte", - "block.mineralogy.phyllite_smooth": "Polierter Phyllit", - "block.mineralogy.phyllite_smooth_stairs": "Polierte Phyllit Treppen", - "block.mineralogy.phyllite_smooth_slab": "Polierte Phyllitplatte", - "block.mineralogy.phyllite_smooth_brick": "Polierter Phyllit-Stein", - "block.mineralogy.phyllite_smooth_brick_stairs": "Polierte Phyllit-Ziegelstein-Treppe", - "block.mineralogy.phyllite_smooth_brick_slab": "Polierte Phyllit-Ziegelsteinplatte", + "block.mineralogy.phyllite_stairs": "Treppe aus Phyllit", + "block.mineralogy.phyllite_slab": "Stufe aus Phyllit", + "block.mineralogy.phyllite_brick": "Ziegel aus Phyllit", + "block.mineralogy.phyllite_brick_stairs": "Ziegeltreppe aus Phyllit", + "block.mineralogy.phyllite_brick_slab": "Ziegelstufe aus Phyllit", + "block.mineralogy.phyllite_smooth": "Polierter Block aus Phyllit", + "block.mineralogy.phyllite_smooth_stairs": "Polierte Treppe aus Phyllit", + "block.mineralogy.phyllite_smooth_slab": "Polierte Stufe aus Phyllit", + "block.mineralogy.phyllite_smooth_brick": "Polierte Ziegel aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_slab": "Polierte Ziegelstufe aus Phyllit", "block.mineralogy.amphibolite": "Amphibolit", - "block.mineralogy.amphibolite_stairs": "Amphibolit Treppen", - "block.mineralogy.amphibolite_slab": "Amphibolit-Platte", - "block.mineralogy.amphibolite_brick": "Amphibolitstein", - "block.mineralogy.amphibolite_brick_stairs": "Amphibolit-Ziegelstein-Treppe", - "block.mineralogy.amphibolite_brick_slab": "Amphibolit-Ziegelstein-Platte", - "block.mineralogy.amphibolite_smooth": "Polierter Amphibolit", - "block.mineralogy.amphibolite_smooth_stairs": "Polierte Amphibolit Treppen", - "block.mineralogy.amphibolite_smooth_slab": "Polierte Amphibolitplatte", - "block.mineralogy.amphibolite_smooth_brick": "Polierter Amphibolit-Stein", - "block.mineralogy.amphibolite_smooth_brick_stairs": "Polierte Amphibolit-Ziegelstein-Treppe", - "block.mineralogy.amphibolite_smooth_brick_slab": "Polierte Amphibolit-Ziegelstein-Platte", - "item.mineralogy.gypsum_dust": "Gips Staub", - "item.mineralogy.sulfur_dust": "Schwefel Staub", - "item.mineralogy.phosphorous_dust": "Phosphor Staub", - "item.mineralogy.nitrate_dust": "Nitrat Staub", + "block.mineralogy.amphibolite_stairs": "Treppe aus Amphibolit", + "block.mineralogy.amphibolite_slab": "Stufe aus Amphibolit", + "block.mineralogy.amphibolite_brick": "Ziegel aus Amphibolit", + "block.mineralogy.amphibolite_brick_stairs": "Ziegeltreppe aus Amphibolit", + "block.mineralogy.amphibolite_brick_slab": "Ziegelstufe aus Amphibolit", + "block.mineralogy.amphibolite_smooth": "Polierter Block aus Amphibolit", + "block.mineralogy.amphibolite_smooth_stairs": "Polierte Treppe aus Amphibolit", + "block.mineralogy.amphibolite_smooth_slab": "Polierte Stufe aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick": "Polierte Ziegel aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_slab": "Polierte Ziegelstufe aus Amphibolit", + "item.mineralogy.gypsum_dust": "Gipspulver", + "item.mineralogy.sulfur_dust": "Schwefelpulver", + "item.mineralogy.phosphorous_dust": "Phosphorpulver", + "item.mineralogy.nitrate_dust": "Nitratpulver", "item.mineralogy.mineral_fertilizer": "Mineraldünger", - "block.mineralogy.chert": "Chert", + "block.mineralogy.chert": "Hornstein", "block.mineralogy.gypsum": "Gips", "block.mineralogy.pumice": "Bimsstein", "block.mineralogy.sulfur_block": "Schwefel", @@ -204,727 +204,737 @@ "block.mineralogy.phosphorous_block": "Phosphor", "block.mineralogy.phosphorous_ore": "Phosphorerz", "block.mineralogy.nitrate_block": "Nitrat", - "block.mineralogy.nitrate_ore": "Nitrat-Erz", - "block.mineralogy.drywall_black": "Schwarzer Trockenbau", - "block.mineralogy.drywall_red": "Roter Trockenbau", - "block.mineralogy.drywall_green": "Grüner Trockenbau", - "block.mineralogy.drywall_brown": "Brauner Trockenbau", - "block.mineralogy.drywall_blue": "Blaue Trockenmauer", - "block.mineralogy.drywall_purple": "Lila Trockenbau", - "block.mineralogy.drywall_cyan": "Cyan Trockenbau", - "block.mineralogy.drywall_silver": "Silberner Trockenbau", - "block.mineralogy.drywall_gray": "Graue Trockenmauer", - "block.mineralogy.drywall_pink": "Rosa Trockenbau", - "block.mineralogy.drywall_lime": "Kalk Trockenbau", - "block.mineralogy.drywall_yellow": "Gelber Trockenbau", - "block.mineralogy.drywall_light_blue": "Hellblaue Trockenmauer", - "block.mineralogy.drywall_magenta": "Magenta Trockenbau", - "block.mineralogy.drywall_orange": "Orange Trockenbau", - "block.mineralogy.drywall_white": "Weißer Trockenbau", - "block.mineralogy.andesite_wall": "Andesit-Wand", - "block.mineralogy.andesite_brick_wall": "Andesit-Backsteinmauer", - "block.mineralogy.andesite_smooth_wall": "Andesite polierte Wand", - "block.mineralogy.andesite_smooth_brick_wall": "Andesite polierte Backsteinmauer", - "block.mineralogy.basalt_wall": "Basaltmauer", - "block.mineralogy.basalt_brick_wall": "Basalt-Backsteinmauer", - "block.mineralogy.basalt_smooth_wall": "Basalt polierte Wand", - "block.mineralogy.basalt_smooth_brick_wall": "Basalt polierte Backsteinmauer", - "block.mineralogy.diorite_wall": "Dioritwand", - "block.mineralogy.diorite_brick_wall": "Diorit-Ziegelmauer", - "block.mineralogy.diorite_smooth_wall": "Diorite polierte Wand", - "block.mineralogy.diorite_smooth_brick_wall": "Diorite polierte Backsteinmauer", - "block.mineralogy.granite_wall": "Granitwand", - "block.mineralogy.granite_brick_wall": "Granit-Backsteinmauer", - "block.mineralogy.granite_smooth_wall": "Granit poliert Wand", - "block.mineralogy.granite_smooth_brick_wall": "Granit poliert Ziegelmauer", - "block.mineralogy.rhyolite_wall": "Rhyolithwand", - "block.mineralogy.rhyolite_brick_wall": "Rhyolith-Backsteinmauer", - "block.mineralogy.rhyolite_smooth_wall": "Rhyolith poliert Wand", - "block.mineralogy.rhyolite_smooth_brick_wall": "Rhyolith polierte Backsteinmauer", - "block.mineralogy.pegmatite_wall": "Pegmatitwand", - "block.mineralogy.pegmatite_brick_wall": "Pegmatite-Ziegelmauer", - "block.mineralogy.pegmatite_smooth_wall": "Pegmatite polierte Wand", - "block.mineralogy.pegmatite_smooth_brick_wall": "Pegmatite polierte Backsteinmauer", - "block.mineralogy.shale_wall": "Schieferwand", - "block.mineralogy.shale_brick_wall": "Schiefer Ziegelwand", - "block.mineralogy.shale_smooth_wall": "Schiefer poliert Wand", - "block.mineralogy.shale_smooth_brick_wall": "Schiefer poliert Ziegelmauer", - "block.mineralogy.conglomerate_wall": "Konglomeratwand", - "block.mineralogy.conglomerate_brick_wall": "Konglomerat Ziegelwand", - "block.mineralogy.conglomerate_smooth_wall": "Konglomerat polierte Wand", - "block.mineralogy.conglomerate_smooth_brick_wall": "Konglomerat polierte Backsteinmauer", - "block.mineralogy.dolomite_wall": "Dolomitenwand", - "block.mineralogy.dolomite_brick_wall": "Dolomit-Ziegelmauer", - "block.mineralogy.dolomite_smooth_wall": "Dolomit polierte Wand", - "block.mineralogy.dolomite_smooth_brick_wall": "Dolomit polierte Ziegelmauer", - "block.mineralogy.limestone_wall": "Kalksteinmauer", - "block.mineralogy.limestone_brick_wall": "Kalkstein-Backsteinmauer", - "block.mineralogy.limestone_smooth_wall": "Kalkstein polierte Wand", - "block.mineralogy.limestone_smooth_brick_wall": "Kalkstein poliert Ziegelmauer", - "block.mineralogy.marble_wall": "Marmorwand", - "block.mineralogy.marble_brick_wall": "Marmor Backsteinmauer", - "block.mineralogy.marble_smooth_wall": "Marmor poliert Wand", - "block.mineralogy.marble_smooth_brick_wall": "Marmor poliert Ziegelmauer", - "block.mineralogy.slate_wall": "Schieferwand", - "block.mineralogy.slate_brick_wall": "Schiefer-Backsteinmauer", - "block.mineralogy.slate_smooth_wall": "Schiefer polierte Wand", - "block.mineralogy.slate_smooth_brick_wall": "Schiefer polierte Backsteinmauer", - "block.mineralogy.schist_wall": "Schieferwand", - "block.mineralogy.schist_brick_wall": "Schiefer-Backsteinmauer", - "block.mineralogy.schist_smooth_wall": "Schiefer polierte Wand", - "block.mineralogy.schist_smooth_brick_wall": "Schiefer polierte Backsteinmauer", - "block.mineralogy.gneiss_wall": "Gneismauer", - "block.mineralogy.gneiss_brick_wall": "Gneis-Backsteinmauer", - "block.mineralogy.gneiss_smooth_wall": "Gneis polierte Wand", - "block.mineralogy.gneiss_smooth_brick_wall": "Gneis polierte Backsteinmauer", - "block.mineralogy.phyllite_wall": "Phyllitwand", - "block.mineralogy.phyllite_brick_wall": "Phyllit-Ziegelmauer", - "block.mineralogy.phyllite_smooth_wall": "Phyllite polierte Wand", - "block.mineralogy.phyllite_smooth_brick_wall": "Phyllite polierte Backsteinmauer", - "block.mineralogy.amphibolite_wall": "Amphibolit Wand", - "block.mineralogy.amphibolite_brick_wall": "Amphibolit-Backsteinmauer", - "block.mineralogy.amphibolite_smooth_wall": "Amphibolit poliert Wand", - "block.mineralogy.amphibolite_smooth_brick_wall": "Amphibolite polierte Backsteinmauer", - "block.mineralogy.andesite_furnace": "Andesit-Ofen", - "block.mineralogy.andesite_brick_furnace": "Andesit-Ziegelofen", - "block.mineralogy.andesite_smooth_furnace": "Andesite polierte Ofen", - "block.mineralogy.andesite_smooth_brick_furnace": "Andesite polierte Ziegelofen", - "block.mineralogy.basalt_furnace": "Basaltmauer", - "block.mineralogy.basalt_brick_furnace": "Basalt-Ziegelofen", - "block.mineralogy.basalt_smooth_furnace": "Basalt polierte Ofen", - "block.mineralogy.basalt_smooth_brick_furnace": "Basalt polierte Ziegelofen", - "block.mineralogy.diorite_furnace": "Dioritwand", - "block.mineralogy.diorite_brick_furnace": "Diorit-Ziegelofen", - "block.mineralogy.diorite_smooth_furnace": "Diorite polierte Ofen", - "block.mineralogy.diorite_smooth_brick_furnace": "Diorite polierte Ziegelofen", - "block.mineralogy.granite_furnace": "Granitwand", - "block.mineralogy.granite_brick_furnace": "Granit-Ziegelofen", - "block.mineralogy.granite_smooth_furnace": "Granit poliert Ofen", - "block.mineralogy.granite_smooth_brick_furnace": "Granit poliert Ziegelofen", - "block.mineralogy.rhyolite_furnace": "Rhyolithwand", - "block.mineralogy.rhyolite_brick_furnace": "Rhyolith-Ziegelofen", - "block.mineralogy.rhyolite_smooth_furnace": "Rhyolith poliert Ofen", - "block.mineralogy.rhyolite_smooth_brick_furnace": "Rhyolith polierte Ziegelofen", - "block.mineralogy.pegmatite_furnace": "Pegmatitwand", - "block.mineralogy.pegmatite_brick_furnace": "Pegmatite-Ziegelofen", - "block.mineralogy.pegmatite_smooth_furnace": "Pegmatite polierte Ofen", - "block.mineralogy.pegmatite_smooth_brick_furnace": "Pegmatite polierte Ziegelofen", - "block.mineralogy.shale_furnace": "Schieferwand", - "block.mineralogy.shale_brick_furnace": "Schiefer Ziegelwand", - "block.mineralogy.shale_smooth_furnace": "Schiefer poliert Ofen", - "block.mineralogy.shale_smooth_brick_furnace": "Schiefer poliert Ziegelofen", - "block.mineralogy.conglomerate_furnace": "Konglomeratwand", - "block.mineralogy.conglomerate_brick_furnace": "Konglomerat Ziegelwand", - "block.mineralogy.conglomerate_smooth_furnace": "Konglomerat polierte Ofen", - "block.mineralogy.conglomerate_smooth_brick_furnace": "Konglomerat polierte Ziegelofen", - "block.mineralogy.dolomite_furnace": "Dolomitenwand", - "block.mineralogy.dolomite_brick_furnace": "Dolomit-Ziegelofen", - "block.mineralogy.dolomite_smooth_furnace": "Dolomit polierte Ofen", - "block.mineralogy.dolomite_smooth_brick_furnace": "Dolomit polierte Ziegelofen", - "block.mineralogy.limestone_furnace": "Kalksteinmauer", - "block.mineralogy.limestone_brick_furnace": "Kalkstein-Ziegelofen", - "block.mineralogy.limestone_smooth_furnace": "Kalkstein polierte Ofen", - "block.mineralogy.limestone_smooth_brick_furnace": "Kalkstein poliert Ziegelofen", - "block.mineralogy.marble_furnace": "Marmorwand", - "block.mineralogy.marble_brick_furnace": "Marmor Ziegelofen", - "block.mineralogy.marble_smooth_furnace": "Marmor poliert Ofen", - "block.mineralogy.marble_smooth_brick_furnace": "Marmor poliert Ziegelofen", - "block.mineralogy.slate_furnace": "Schieferwand", - "block.mineralogy.slate_brick_furnace": "Schiefer-Ziegelofen", - "block.mineralogy.slate_smooth_furnace": "Schiefer polierte Ofen", - "block.mineralogy.slate_smooth_brick_furnace": "Schiefer polierte Ziegelofen", - "block.mineralogy.schist_furnace": "Schieferwand", - "block.mineralogy.schist_brick_furnace": "Schiefer-Ziegelofen", - "block.mineralogy.schist_smooth_furnace": "Schiefer polierte Ofen", - "block.mineralogy.schist_smooth_brick_furnace": "Schiefer polierte Ziegelofen", - "block.mineralogy.gneiss_furnace": "Gneismauer", - "block.mineralogy.gneiss_brick_furnace": "Gneis-Ziegelofen", - "block.mineralogy.gneiss_smooth_furnace": "Gneis polierte Ofen", - "block.mineralogy.gneiss_smooth_brick_furnace": "Gneis polierte Ziegelofen", - "block.mineralogy.phyllite_furnace": "Phyllitwand", - "block.mineralogy.phyllite_brick_furnace": "Phyllit-Ziegelofen", - "block.mineralogy.phyllite_smooth_furnace": "Phyllite polierte Ofen", - "block.mineralogy.phyllite_smooth_brick_furnace": "Phyllite polierte Ziegelofen", - "block.mineralogy.amphibolite_furnace": "Amphibolit Ofen", - "block.mineralogy.amphibolite_brick_furnace": "Amphibolit-Ziegelofen", - "block.mineralogy.amphibolite_smooth_furnace": "Amphibolit poliert Ofen", - "block.mineralogy.amphibolite_smooth_brick_furnace": "Amphibolite polierte Ziegelofen", + "block.mineralogy.nitrate_ore": "Nitraterz", + "block.mineralogy.drywall_black": "Gipskartonplatte (Schwarz)", + "block.mineralogy.drywall_red": "Gipskartonplatte (Rot)", + "block.mineralogy.drywall_green": "Gipskartonplatte (Grün)", + "block.mineralogy.drywall_brown": "Gipskartonplatte (Braun)", + "block.mineralogy.drywall_blue": "Gipskartonplatte (Blau)", + "block.mineralogy.drywall_purple": "Gipskartonplatte (Violett)", + "block.mineralogy.drywall_cyan": "Gipskartonplatte (Türkis)", + "block.mineralogy.drywall_silver": "Gipskartonplatte (Hellgrau)", + "block.mineralogy.drywall_gray": "Gipskartonplatte (Grau)", + "block.mineralogy.drywall_pink": "Gipskartonplatte (Rosa)", + "block.mineralogy.drywall_lime": "Gipskartonplatte (Hellgrün)", + "block.mineralogy.drywall_yellow": "Gipskartonplatte (Gelb)", + "block.mineralogy.drywall_light_blue": "Gipskartonplatte (Hellblau)", + "block.mineralogy.drywall_magenta": "Gipskartonplatte (Magenta)", + "block.mineralogy.drywall_orange": "Gipskartonplatte (Orange)", + "block.mineralogy.drywall_white": "Gipskartonplatte (Weiß)", + "block.mineralogy.andesite_wall": "Mauer aus Andesit", + "block.mineralogy.andesite_brick_wall": "Ziegelmauer aus Andesit", + "block.mineralogy.andesite_smooth_wall": "Polierte Mauer aus Andesit", + "block.mineralogy.andesite_smooth_brick_wall": "Polierte Ziegelmauer aus Andesit", + "block.mineralogy.basalt_wall": "Mauer aus Basalt", + "block.mineralogy.basalt_brick_wall": "Ziegelmauer aus Basalt", + "block.mineralogy.basalt_smooth_wall": "Polierte Mauer aus Basalt", + "block.mineralogy.basalt_smooth_brick_wall": "Polierte Ziegelmauer aus Basalt", + "block.mineralogy.diorite_wall": "Mauer aus Diorit", + "block.mineralogy.diorite_brick_wall": "Ziegelmauer aus Diorit", + "block.mineralogy.diorite_smooth_wall": "Polierte Mauer aus Diorit", + "block.mineralogy.diorite_smooth_brick_wall": "Polierte Ziegelmauer aus Diorit", + "block.mineralogy.granite_wall": "Mauer aus Granit", + "block.mineralogy.granite_brick_wall": "Ziegelmauer aus Granit", + "block.mineralogy.granite_smooth_wall": "Polierte Mauer aus Granit", + "block.mineralogy.granite_smooth_brick_wall": "Polierte Ziegelmauer aus Granit", + "block.mineralogy.rhyolite_wall": "Mauer aus Rhyolith", + "block.mineralogy.rhyolite_brick_wall": "Ziegelmauer aus Rhyolith", + "block.mineralogy.rhyolite_smooth_wall": "Polierte Mauer aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_wall": "Polierte Ziegelmauer aus Rhyolith", + "block.mineralogy.pegmatite_wall": "Mauer aus Pegmatit", + "block.mineralogy.pegmatite_brick_wall": "Ziegelmauer aus Pegmatit", + "block.mineralogy.pegmatite_smooth_wall": "Polierte Mauer aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_wall": "Polierte Ziegelmauer aus Pegmatit", + "block.mineralogy.shale_wall": "Mauer aus Tonschiefer", + "block.mineralogy.shale_brick_wall": "Ziegelmauer aus Tonschiefer", + "block.mineralogy.shale_smooth_wall": "Polierte Mauer aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_wall": "Polierte Ziegelmauer aus Tonschiefer", + "block.mineralogy.conglomerate_wall": "Mauer aus Konglomerat", + "block.mineralogy.conglomerate_brick_wall": "Ziegelmauer aus Konglomerat", + "block.mineralogy.conglomerate_smooth_wall": "Polierte Mauer aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_wall": "Polierte Ziegelmauer aus Konglomerat", + "block.mineralogy.dolomite_wall": "Mauer aus Dolomit", + "block.mineralogy.dolomite_brick_wall": "Ziegelmauer aus Dolomit", + "block.mineralogy.dolomite_smooth_wall": "Polierte Mauer aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_wall": "Polierte Ziegelmauer aus Dolomit", + "block.mineralogy.limestone_wall": "Mauer aus Kalkstein", + "block.mineralogy.limestone_brick_wall": "Ziegelmauer aus Kalkstein", + "block.mineralogy.limestone_smooth_wall": "Polierte Mauer aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_wall": "Polierte Ziegelmauer aus Kalkstein", + "block.mineralogy.marble_wall": "Mauer aus Marmor", + "block.mineralogy.marble_brick_wall": "Ziegelmauer aus Marmor", + "block.mineralogy.marble_smooth_wall": "Polierte Mauer aus Marmor", + "block.mineralogy.marble_smooth_brick_wall": "Polierte Ziegelmauer aus Marmor", + "block.mineralogy.slate_wall": "Mauer aus Schiefer", + "block.mineralogy.slate_brick_wall": "Ziegelmauer aus Schiefer", + "block.mineralogy.slate_smooth_wall": "Polierte Mauer aus Schiefer", + "block.mineralogy.slate_smooth_brick_wall": "Polierte Ziegelmauer aus Schiefer", + "block.mineralogy.schist_wall": "Mauer aus Glimmerschiefer", + "block.mineralogy.schist_brick_wall": "Ziegelmauer aus Glimmerschiefer", + "block.mineralogy.schist_smooth_wall": "Polierte Mauer aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_wall": "Polierte Ziegelmauer aus Glimmerschiefer", + "block.mineralogy.gneiss_wall": "Mauer aus Gneis", + "block.mineralogy.gneiss_brick_wall": "Ziegelmauer aus Gneis", + "block.mineralogy.gneiss_smooth_wall": "Polierte Mauer aus Gneis", + "block.mineralogy.gneiss_smooth_brick_wall": "Polierte Ziegelmauer aus Gneis", + "block.mineralogy.phyllite_wall": "Mauer aus Phyllit", + "block.mineralogy.phyllite_brick_wall": "Ziegelmauer aus Phyllit", + "block.mineralogy.phyllite_smooth_wall": "Polierte Mauer aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_wall": "Polierte Ziegelmauer aus Phyllit", + "block.mineralogy.amphibolite_wall": "Mauer aus Amphibolit", + "block.mineralogy.amphibolite_brick_wall": "Ziegelmauer aus Amphibolit", + "block.mineralogy.amphibolite_smooth_wall": "Polierte Mauer aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_wall": "Polierte Ziegelmauer aus Amphibolit", + "block.mineralogy.andesite_furnace": "Ofen aus Andesit", + "block.mineralogy.andesite_brick_furnace": "Ziegelofen aus Andesit", + "block.mineralogy.andesite_smooth_furnace": "Polierter Ofen aus Andesit", + "block.mineralogy.andesite_smooth_brick_furnace": "Polierter Ziegelofen aus Andesit", + "block.mineralogy.basalt_furnace": "Ofen aus Basalt", + "block.mineralogy.basalt_brick_furnace": "Ziegelofen aus Basalt", + "block.mineralogy.basalt_smooth_furnace": "Polierter Ofen aus Basalt", + "block.mineralogy.basalt_smooth_brick_furnace": "Polierter Ziegelofen aus Basalt", + "block.mineralogy.diorite_furnace": "Ofen aus Diorit", + "block.mineralogy.diorite_brick_furnace": "Ziegelofen aus Diorit", + "block.mineralogy.diorite_smooth_furnace": "Polierter Ofen aus Diorit", + "block.mineralogy.diorite_smooth_brick_furnace": "Polierter Ziegelofen aus Diorit", + "block.mineralogy.granite_furnace": "Ofen aus Granit", + "block.mineralogy.granite_brick_furnace": "Ziegelofen aus Granit", + "block.mineralogy.granite_smooth_furnace": "Polierter Ofen aus Granit", + "block.mineralogy.granite_smooth_brick_furnace": "Polierter Ziegelofen aus Granit", + "block.mineralogy.rhyolite_furnace": "Ofen aus Rhyolith", + "block.mineralogy.rhyolite_brick_furnace": "Ziegelofen aus Rhyolith", + "block.mineralogy.rhyolite_smooth_furnace": "Polierter Ofen aus Rhyolith", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Polierter Ziegelofen aus Rhyolith", + "block.mineralogy.pegmatite_furnace": "Ofen aus Pegmatit", + "block.mineralogy.pegmatite_brick_furnace": "Ziegelofen aus Pegmatit", + "block.mineralogy.pegmatite_smooth_furnace": "Polierter Ofen aus Pegmatit", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Polierter Ziegelofen aus Pegmatit", + "block.mineralogy.shale_furnace": "Ofen aus Tonschiefer", + "block.mineralogy.shale_brick_furnace": "Ziegelofen aus Tonschiefer", + "block.mineralogy.shale_smooth_furnace": "Polierter Ofen aus Tonschiefer", + "block.mineralogy.shale_smooth_brick_furnace": "Polierter Ziegelofen aus Tonschiefer", + "block.mineralogy.conglomerate_furnace": "Ofen aus Konglomerat", + "block.mineralogy.conglomerate_brick_furnace": "Ziegelofen aus Konglomerat", + "block.mineralogy.conglomerate_smooth_furnace": "Polierter Ofen aus Konglomerat", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Polierter Ziegelofen aus Konglomerat", + "block.mineralogy.dolomite_furnace": "Ofen aus Dolomit", + "block.mineralogy.dolomite_brick_furnace": "Ziegelofen aus Dolomit", + "block.mineralogy.dolomite_smooth_furnace": "Polierter Ofen aus Dolomit", + "block.mineralogy.dolomite_smooth_brick_furnace": "Polierter Ziegelofen aus Dolomit", + "block.mineralogy.limestone_furnace": "Ofen aus Kalkstein", + "block.mineralogy.limestone_brick_furnace": "Ziegelofen aus Kalkstein", + "block.mineralogy.limestone_smooth_furnace": "Polierter Ofen aus Kalkstein", + "block.mineralogy.limestone_smooth_brick_furnace": "Polierter Ziegelofen aus Kalkstein", + "block.mineralogy.marble_furnace": "Ofen aus Marmor", + "block.mineralogy.marble_brick_furnace": "Ziegelofen aus Marmor", + "block.mineralogy.marble_smooth_furnace": "Polierter Ofen aus Marmor", + "block.mineralogy.marble_smooth_brick_furnace": "Polierter Ziegelofen aus Marmor", + "block.mineralogy.slate_furnace": "Ofen aus Schiefer", + "block.mineralogy.slate_brick_furnace": "Ziegelofen aus Schiefer", + "block.mineralogy.slate_smooth_furnace": "Polierter Ofen aus Schiefer", + "block.mineralogy.slate_smooth_brick_furnace": "Polierter Ziegelofen aus Schiefer", + "block.mineralogy.schist_furnace": "Ofen aus Glimmerschiefer", + "block.mineralogy.schist_brick_furnace": "Ziegelofen aus Glimmerschiefer", + "block.mineralogy.schist_smooth_furnace": "Polierter Ofen aus Glimmerschiefer", + "block.mineralogy.schist_smooth_brick_furnace": "Polierter Ziegelofen aus Glimmerschiefer", + "block.mineralogy.gneiss_furnace": "Ofen aus Gneis", + "block.mineralogy.gneiss_brick_furnace": "Ziegelofen aus Gneis", + "block.mineralogy.gneiss_smooth_furnace": "Polierter Ofen aus Gneis", + "block.mineralogy.gneiss_smooth_brick_furnace": "Polierter Ziegelofen aus Gneis", + "block.mineralogy.phyllite_furnace": "Ofen aus Phyllit", + "block.mineralogy.phyllite_brick_furnace": "Ziegelofen aus Phyllit", + "block.mineralogy.phyllite_smooth_furnace": "Polierter Ofen aus Phyllit", + "block.mineralogy.phyllite_smooth_brick_furnace": "Polierter Ziegelofen aus Phyllit", + "block.mineralogy.amphibolite_furnace": "Ofen aus Amphibolit", + "block.mineralogy.amphibolite_brick_furnace": "Ziegelofen aus Amphibolit", + "block.mineralogy.amphibolite_smooth_furnace": "Polierter Ofen aus Amphibolit", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Polierter Ziegelofen aus Amphibolit", "block.mineralogy.diabase": "Diabas", - "block.mineralogy.diabase_stairs": "Diabas Treppe", - "block.mineralogy.diabase_slab": "Diabas Platte", - "block.mineralogy.diabase_brick": "Diabas Backstein", - "block.mineralogy.diabase_brick_stairs": "Diabas Ziegelsteintreppen", - "block.mineralogy.diabase_brick_slab": "Diabas Ziegelplatte", - "block.mineralogy.diabase_smooth": "Polished Diabas", - "block.mineralogy.diabase_smooth_stairs": "Diabas Polierte Treppe", - "block.mineralogy.diabase_smooth_slab": "Diabas Polierte Platte", - "block.mineralogy.diabase_smooth_brick": "Diabas Polierter Ziegelstein", - "block.mineralogy.diabase_smooth_brick_stairs": "Diabas Polierte Ziegelsteintreppen", - "block.mineralogy.diabase_smooth_brick_slab": "Diabas Polierte Ziegelplatte", - "block.mineralogy.diabase_wall": "Diabas Wand", - "block.mineralogy.diabase_brick_wall": "Diabas Ziegelwand", - "block.mineralogy.diabase_smooth_wall": "Diabas Polierte Wand", - "block.mineralogy.diabase_smooth_brick_wall": "Diabas Polierte Backsteinmauer", - "block.mineralogy.diabase_furnace": "Diabas Ofen", - "block.mineralogy.diabase_brick_furnace": "Diabas Ziegelofen", - "block.mineralogy.diabase_smooth_furnace": "Diabas Polierter Ofen", - "block.mineralogy.diabase_smooth_brick_furnace": "Diabas Polierter Ziegelofen", + "block.mineralogy.diabase_stairs": "Treppe aus Diabas", + "block.mineralogy.diabase_slab": "Stufe aus Diabas", + "block.mineralogy.diabase_brick": "Ziegel aus Diabas", + "block.mineralogy.diabase_brick_stairs": "Ziegeltreppe aus Diabas", + "block.mineralogy.diabase_brick_slab": "Ziegelstufe aus Diabas", + "block.mineralogy.diabase_smooth": "Polierter Block aus Diabas", + "block.mineralogy.diabase_smooth_stairs": "Polierte Treppe aus Diabas", + "block.mineralogy.diabase_smooth_slab": "Polierte Stufe aus Diabas", + "block.mineralogy.diabase_smooth_brick": "Polierte Ziegel aus Diabas", + "block.mineralogy.diabase_smooth_brick_stairs": "Polierte Ziegeltreppe aus Diabas", + "block.mineralogy.diabase_smooth_brick_slab": "Polierte Ziegelstufe aus Diabas", + "block.mineralogy.diabase_wall": "Mauer aus Diabas", + "block.mineralogy.diabase_brick_wall": "Ziegelmauer aus Diabas", + "block.mineralogy.diabase_smooth_wall": "Polierte Mauer aus Diabas", + "block.mineralogy.diabase_smooth_brick_wall": "Polierte Ziegelmauer aus Diabas", + "block.mineralogy.diabase_furnace": "Ofen aus Diabas", + "block.mineralogy.diabase_brick_furnace": "Ziegelofen aus Diabas", + "block.mineralogy.diabase_smooth_furnace": "Polierter Ofen aus Diabas", + "block.mineralogy.diabase_smooth_brick_furnace": "Polierter Ziegelofen aus Diabas", "block.mineralogy.gabbro": "Gabbro", - "block.mineralogy.gabbro_stairs": "Gabbro Treppe", - "block.mineralogy.gabbro_slab": "Gabbro Platte", - "block.mineralogy.gabbro_brick": "Gabbro Backstein", - "block.mineralogy.gabbro_brick_stairs": "Gabbro Ziegelsteintreppen", - "block.mineralogy.gabbro_brick_slab": "Gabbro Ziegelplatte", - "block.mineralogy.gabbro_smooth": "Polished Gabbro", - "block.mineralogy.gabbro_smooth_stairs": "Gabbro Polierte Treppe", - "block.mineralogy.gabbro_smooth_slab": "Gabbro Polierte Platte", - "block.mineralogy.gabbro_smooth_brick": "Gabbro Polierter Ziegelstein", - "block.mineralogy.gabbro_smooth_brick_stairs": "Gabbro Polierte Ziegelsteintreppen", - "block.mineralogy.gabbro_smooth_brick_slab": "Gabbro Polierte Ziegelplatte", - "block.mineralogy.gabbro_wall": "Gabbro Wand", - "block.mineralogy.gabbro_brick_wall": "Gabbro Ziegelwand", - "block.mineralogy.gabbro_smooth_wall": "Gabbro Polierte Wand", - "block.mineralogy.gabbro_smooth_brick_wall": "Gabbro Polierte Backsteinmauer", - "block.mineralogy.gabbro_furnace": "Gabbro Ofen", - "block.mineralogy.gabbro_brick_furnace": "Gabbro Ziegelofen", - "block.mineralogy.gabbro_smooth_furnace": "Gabbro Polierter Ofen", - "block.mineralogy.gabbro_smooth_brick_furnace": "Gabbro Polierter Ziegelofen", + "block.mineralogy.gabbro_stairs": "Treppe aus Gabbro", + "block.mineralogy.gabbro_slab": "Stufe aus Gabbro", + "block.mineralogy.gabbro_brick": "Ziegel aus Gabbro", + "block.mineralogy.gabbro_brick_stairs": "Ziegeltreppe aus Gabbro", + "block.mineralogy.gabbro_brick_slab": "Ziegelstufe aus Gabbro", + "block.mineralogy.gabbro_smooth": "Polierter Block aus Gabbro", + "block.mineralogy.gabbro_smooth_stairs": "Polierte Treppe aus Gabbro", + "block.mineralogy.gabbro_smooth_slab": "Polierte Stufe aus Gabbro", + "block.mineralogy.gabbro_smooth_brick": "Polierte Ziegel aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Polierte Ziegeltreppe aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_slab": "Polierte Ziegelstufe aus Gabbro", + "block.mineralogy.gabbro_wall": "Mauer aus Gabbro", + "block.mineralogy.gabbro_brick_wall": "Ziegelmauer aus Gabbro", + "block.mineralogy.gabbro_smooth_wall": "Polierte Mauer aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_wall": "Polierte Ziegelmauer aus Gabbro", + "block.mineralogy.gabbro_furnace": "Ofen aus Gabbro", + "block.mineralogy.gabbro_brick_furnace": "Ziegelofen aus Gabbro", + "block.mineralogy.gabbro_smooth_furnace": "Polierter Ofen aus Gabbro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Polierter Ziegelofen aus Gabbro", "block.mineralogy.peridotite": "Peridotit", - "block.mineralogy.peridotite_stairs": "Peridotit Treppe", - "block.mineralogy.peridotite_slab": "Peridotit Platte", - "block.mineralogy.peridotite_brick": "Peridotit Backstein", - "block.mineralogy.peridotite_brick_stairs": "Peridotit Ziegelsteintreppen", - "block.mineralogy.peridotite_brick_slab": "Peridotit Ziegelplatte", - "block.mineralogy.peridotite_smooth": "Polished Peridotit", - "block.mineralogy.peridotite_smooth_stairs": "Peridotit Polierte Treppe", - "block.mineralogy.peridotite_smooth_slab": "Peridotit Polierte Platte", - "block.mineralogy.peridotite_smooth_brick": "Peridotit Polierter Ziegelstein", - "block.mineralogy.peridotite_smooth_brick_stairs": "Peridotit Polierte Ziegelsteintreppen", - "block.mineralogy.peridotite_smooth_brick_slab": "Peridotit Polierte Ziegelplatte", - "block.mineralogy.peridotite_wall": "Peridotit Wand", - "block.mineralogy.peridotite_brick_wall": "Peridotit Ziegelwand", - "block.mineralogy.peridotite_smooth_wall": "Peridotit Polierte Wand", - "block.mineralogy.peridotite_smooth_brick_wall": "Peridotit Polierte Backsteinmauer", - "block.mineralogy.peridotite_furnace": "Peridotit Ofen", - "block.mineralogy.peridotite_brick_furnace": "Peridotit Ziegelofen", - "block.mineralogy.peridotite_smooth_furnace": "Peridotit Polierter Ofen", - "block.mineralogy.peridotite_smooth_brick_furnace": "Peridotit Polierter Ziegelofen", + "block.mineralogy.peridotite_stairs": "Treppe aus Peridotit", + "block.mineralogy.peridotite_slab": "Stufe aus Peridotit", + "block.mineralogy.peridotite_brick": "Ziegel aus Peridotit", + "block.mineralogy.peridotite_brick_stairs": "Ziegeltreppe aus Peridotit", + "block.mineralogy.peridotite_brick_slab": "Ziegelstufe aus Peridotit", + "block.mineralogy.peridotite_smooth": "Polierter Block aus Peridotit", + "block.mineralogy.peridotite_smooth_stairs": "Polierte Treppe aus Peridotit", + "block.mineralogy.peridotite_smooth_slab": "Polierte Stufe aus Peridotit", + "block.mineralogy.peridotite_smooth_brick": "Polierte Ziegel aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_slab": "Polierte Ziegelstufe aus Peridotit", + "block.mineralogy.peridotite_wall": "Mauer aus Peridotit", + "block.mineralogy.peridotite_brick_wall": "Ziegelmauer aus Peridotit", + "block.mineralogy.peridotite_smooth_wall": "Polierte Mauer aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_wall": "Polierte Ziegelmauer aus Peridotit", + "block.mineralogy.peridotite_furnace": "Ofen aus Peridotit", + "block.mineralogy.peridotite_brick_furnace": "Ziegelofen aus Peridotit", + "block.mineralogy.peridotite_smooth_furnace": "Polierter Ofen aus Peridotit", + "block.mineralogy.peridotite_smooth_brick_furnace": "Polierter Ziegelofen aus Peridotit", "block.mineralogy.basaltic_glass": "Basaltglas", - "block.mineralogy.basaltic_glass_stairs": "Basaltglas Treppe", - "block.mineralogy.basaltic_glass_slab": "Basaltglas Platte", - "block.mineralogy.basaltic_glass_brick": "Basaltglas Backstein", - "block.mineralogy.basaltic_glass_brick_stairs": "Basaltglas Ziegelsteintreppen", - "block.mineralogy.basaltic_glass_brick_slab": "Basaltglas Ziegelplatte", - "block.mineralogy.basaltic_glass_smooth": "Polished Basaltglas", - "block.mineralogy.basaltic_glass_smooth_stairs": "Basaltglas Polierte Treppe", - "block.mineralogy.basaltic_glass_smooth_slab": "Basaltglas Polierte Platte", - "block.mineralogy.basaltic_glass_smooth_brick": "Basaltglas Polierter Ziegelstein", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Basaltglas Polierte Ziegelsteintreppen", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "Basaltglas Polierte Ziegelplatte", - "block.mineralogy.basaltic_glass_wall": "Basaltglas Wand", - "block.mineralogy.basaltic_glass_brick_wall": "Basaltglas Ziegelwand", - "block.mineralogy.basaltic_glass_smooth_wall": "Basaltglas Polierte Wand", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "Basaltglas Polierte Backsteinmauer", - "block.mineralogy.basaltic_glass_furnace": "Basaltglas Ofen", - "block.mineralogy.basaltic_glass_brick_furnace": "Basaltglas Ziegelofen", - "block.mineralogy.basaltic_glass_smooth_furnace": "Basaltglas Polierter Ofen", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Basaltglas Polierter Ziegelofen", - "block.mineralogy.scoria": "Schlacke", - "block.mineralogy.scoria_stairs": "Schlacke Treppe", - "block.mineralogy.scoria_slab": "Schlacke Platte", - "block.mineralogy.scoria_brick": "Schlacke Backstein", - "block.mineralogy.scoria_brick_stairs": "Schlacke Ziegelsteintreppen", - "block.mineralogy.scoria_brick_slab": "Schlacke Ziegelplatte", - "block.mineralogy.scoria_smooth": "Polished Schlacke", - "block.mineralogy.scoria_smooth_stairs": "Schlacke Polierte Treppe", - "block.mineralogy.scoria_smooth_slab": "Schlacke Polierte Platte", - "block.mineralogy.scoria_smooth_brick": "Schlacke Polierter Ziegelstein", - "block.mineralogy.scoria_smooth_brick_stairs": "Schlacke Polierte Ziegelsteintreppen", - "block.mineralogy.scoria_smooth_brick_slab": "Schlacke Polierte Ziegelplatte", - "block.mineralogy.scoria_wall": "Schlacke Wand", - "block.mineralogy.scoria_brick_wall": "Schlacke Ziegelwand", - "block.mineralogy.scoria_smooth_wall": "Schlacke Polierte Wand", - "block.mineralogy.scoria_smooth_brick_wall": "Schlacke Polierte Backsteinmauer", - "block.mineralogy.scoria_furnace": "Schlacke Ofen", - "block.mineralogy.scoria_brick_furnace": "Schlacke Ziegelofen", - "block.mineralogy.scoria_smooth_furnace": "Schlacke Polierter Ofen", - "block.mineralogy.scoria_smooth_brick_furnace": "Schlacke Polierter Ziegelofen", - "block.mineralogy.tuff": "Tuff", - "block.mineralogy.tuff_stairs": "Tuff Treppe", - "block.mineralogy.tuff_slab": "Tuff Platte", - "block.mineralogy.tuff_brick": "Tuff Backstein", - "block.mineralogy.tuff_brick_stairs": "Tuff Ziegelsteintreppen", - "block.mineralogy.tuff_brick_slab": "Tuff Ziegelplatte", - "block.mineralogy.tuff_smooth": "Polished Tuff", - "block.mineralogy.tuff_smooth_stairs": "Tuff Polierte Treppe", - "block.mineralogy.tuff_smooth_slab": "Tuff Polierte Platte", - "block.mineralogy.tuff_smooth_brick": "Tuff Polierter Ziegelstein", - "block.mineralogy.tuff_smooth_brick_stairs": "Tuff Polierte Ziegelsteintreppen", - "block.mineralogy.tuff_smooth_brick_slab": "Tuff Polierte Ziegelplatte", - "block.mineralogy.tuff_wall": "Tuff Wand", - "block.mineralogy.tuff_brick_wall": "Tuff Ziegelwand", - "block.mineralogy.tuff_smooth_wall": "Tuff Polierte Wand", - "block.mineralogy.tuff_smooth_brick_wall": "Tuff Polierte Backsteinmauer", - "block.mineralogy.tuff_furnace": "Tuff Ofen", - "block.mineralogy.tuff_brick_furnace": "Tuff Ziegelofen", - "block.mineralogy.tuff_smooth_furnace": "Tuff Polierter Ofen", - "block.mineralogy.tuff_smooth_brick_furnace": "Tuff Polierter Ziegelofen", + "block.mineralogy.basaltic_glass_stairs": "Treppe aus Basaltglas", + "block.mineralogy.basaltic_glass_slab": "Stufe aus Basaltglas", + "block.mineralogy.basaltic_glass_brick": "Ziegel aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_stairs": "Ziegeltreppe aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_slab": "Ziegelstufe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth": "Polierter Block aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_stairs": "Polierte Treppe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_slab": "Polierte Stufe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick": "Polierte Ziegel aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Polierte Ziegeltreppe aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Polierte Ziegelstufe aus Basaltglas", + "block.mineralogy.basaltic_glass_wall": "Mauer aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_wall": "Ziegelmauer aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_wall": "Polierte Mauer aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Polierte Ziegelmauer aus Basaltglas", + "block.mineralogy.basaltic_glass_furnace": "Ofen aus Basaltglas", + "block.mineralogy.basaltic_glass_brick_furnace": "Ziegelofen aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_furnace": "Polierter Ofen aus Basaltglas", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Polierter Ziegelofen aus Basaltglas", + "block.mineralogy.scoria": "Skoria", + "block.mineralogy.scoria_stairs": "Treppe aus Skoria", + "block.mineralogy.scoria_slab": "Stufe aus Skoria", + "block.mineralogy.scoria_brick": "Ziegel aus Skoria", + "block.mineralogy.scoria_brick_stairs": "Ziegeltreppe aus Skoria", + "block.mineralogy.scoria_brick_slab": "Ziegelstufe aus Skoria", + "block.mineralogy.scoria_smooth": "Polierter Block aus Skoria", + "block.mineralogy.scoria_smooth_stairs": "Polierte Treppe aus Skoria", + "block.mineralogy.scoria_smooth_slab": "Polierte Stufe aus Skoria", + "block.mineralogy.scoria_smooth_brick": "Polierte Ziegel aus Skoria", + "block.mineralogy.scoria_smooth_brick_stairs": "Polierte Ziegeltreppe aus Skoria", + "block.mineralogy.scoria_smooth_brick_slab": "Polierte Ziegelstufe aus Skoria", + "block.mineralogy.scoria_wall": "Mauer aus Skoria", + "block.mineralogy.scoria_brick_wall": "Ziegelmauer aus Skoria", + "block.mineralogy.scoria_smooth_wall": "Polierte Mauer aus Skoria", + "block.mineralogy.scoria_smooth_brick_wall": "Polierte Ziegelmauer aus Skoria", + "block.mineralogy.scoria_furnace": "Ofen aus Skoria", + "block.mineralogy.scoria_brick_furnace": "Ziegelofen aus Skoria", + "block.mineralogy.scoria_smooth_furnace": "Polierter Ofen aus Skoria", + "block.mineralogy.scoria_smooth_brick_furnace": "Polierter Ziegelofen aus Skoria", + "block.mineralogy.tuff": "Tuffstein", + "block.mineralogy.tuff_stairs": "Treppe aus Tuffstein", + "block.mineralogy.tuff_slab": "Stufe aus Tuffstein", + "block.mineralogy.tuff_brick": "Ziegel aus Tuffstein", + "block.mineralogy.tuff_brick_stairs": "Ziegeltreppe aus Tuffstein", + "block.mineralogy.tuff_brick_slab": "Ziegelstufe aus Tuffstein", + "block.mineralogy.tuff_smooth": "Polierter Block aus Tuffstein", + "block.mineralogy.tuff_smooth_stairs": "Polierte Treppe aus Tuffstein", + "block.mineralogy.tuff_smooth_slab": "Polierte Stufe aus Tuffstein", + "block.mineralogy.tuff_smooth_brick": "Polierte Ziegel aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_stairs": "Polierte Ziegeltreppe aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_slab": "Polierte Ziegelstufe aus Tuffstein", + "block.mineralogy.tuff_wall": "Mauer aus Tuffstein", + "block.mineralogy.tuff_brick_wall": "Ziegelmauer aus Tuffstein", + "block.mineralogy.tuff_smooth_wall": "Polierte Mauer aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_wall": "Polierte Ziegelmauer aus Tuffstein", + "block.mineralogy.tuff_furnace": "Ofen aus Tuffstein", + "block.mineralogy.tuff_brick_furnace": "Ziegelofen aus Tuffstein", + "block.mineralogy.tuff_smooth_furnace": "Polierter Ofen aus Tuffstein", + "block.mineralogy.tuff_smooth_brick_furnace": "Polierter Ziegelofen aus Tuffstein", "block.mineralogy.siltstone": "Schluffstein", - "block.mineralogy.siltstone_stairs": "Schluffstein Treppe", - "block.mineralogy.siltstone_slab": "Schluffstein Platte", - "block.mineralogy.siltstone_brick": "Schluffstein Backstein", - "block.mineralogy.siltstone_brick_stairs": "Schluffstein Ziegelsteintreppen", - "block.mineralogy.siltstone_brick_slab": "Schluffstein Ziegelplatte", - "block.mineralogy.siltstone_smooth": "Polished Schluffstein", - "block.mineralogy.siltstone_smooth_stairs": "Schluffstein Polierte Treppe", - "block.mineralogy.siltstone_smooth_slab": "Schluffstein Polierte Platte", - "block.mineralogy.siltstone_smooth_brick": "Schluffstein Polierter Ziegelstein", - "block.mineralogy.siltstone_smooth_brick_stairs": "Schluffstein Polierte Ziegelsteintreppen", - "block.mineralogy.siltstone_smooth_brick_slab": "Schluffstein Polierte Ziegelplatte", - "block.mineralogy.siltstone_wall": "Schluffstein Wand", - "block.mineralogy.siltstone_brick_wall": "Schluffstein Ziegelwand", - "block.mineralogy.siltstone_smooth_wall": "Schluffstein Polierte Wand", - "block.mineralogy.siltstone_smooth_brick_wall": "Schluffstein Polierte Backsteinmauer", - "block.mineralogy.siltstone_furnace": "Schluffstein Ofen", - "block.mineralogy.siltstone_brick_furnace": "Schluffstein Ziegelofen", - "block.mineralogy.siltstone_smooth_furnace": "Schluffstein Polierter Ofen", - "block.mineralogy.siltstone_smooth_brick_furnace": "Schluffstein Polierter Ziegelofen", + "block.mineralogy.siltstone_stairs": "Treppe aus Schluffstein", + "block.mineralogy.siltstone_slab": "Stufe aus Schluffstein", + "block.mineralogy.siltstone_brick": "Ziegel aus Schluffstein", + "block.mineralogy.siltstone_brick_stairs": "Ziegeltreppe aus Schluffstein", + "block.mineralogy.siltstone_brick_slab": "Ziegelstufe aus Schluffstein", + "block.mineralogy.siltstone_smooth": "Polierter Block aus Schluffstein", + "block.mineralogy.siltstone_smooth_stairs": "Polierte Treppe aus Schluffstein", + "block.mineralogy.siltstone_smooth_slab": "Polierte Stufe aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick": "Polierte Ziegel aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_stairs": "Polierte Ziegeltreppe aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_slab": "Polierte Ziegelstufe aus Schluffstein", + "block.mineralogy.siltstone_wall": "Mauer aus Schluffstein", + "block.mineralogy.siltstone_brick_wall": "Ziegelmauer aus Schluffstein", + "block.mineralogy.siltstone_smooth_wall": "Polierte Mauer aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_wall": "Polierte Ziegelmauer aus Schluffstein", + "block.mineralogy.siltstone_furnace": "Ofen aus Schluffstein", + "block.mineralogy.siltstone_brick_furnace": "Ziegelofen aus Schluffstein", + "block.mineralogy.siltstone_smooth_furnace": "Polierter Ofen aus Schluffstein", + "block.mineralogy.siltstone_smooth_brick_furnace": "Polierter Ziegelofen aus Schluffstein", "block.mineralogy.rock_salt": "Steinsalz", - "block.mineralogy.rock_salt_stairs": "Steinsalz Treppe", - "block.mineralogy.rock_salt_slab": "Steinsalz Platte", - "block.mineralogy.rock_salt_brick": "Steinsalz Backstein", - "block.mineralogy.rock_salt_brick_stairs": "Steinsalz Ziegelsteintreppen", - "block.mineralogy.rock_salt_brick_slab": "Steinsalz Ziegelplatte", - "block.mineralogy.rock_salt_smooth": "Polished Steinsalz", - "block.mineralogy.rock_salt_smooth_stairs": "Steinsalz Polierte Treppe", - "block.mineralogy.rock_salt_smooth_slab": "Steinsalz Polierte Platte", - "block.mineralogy.rock_salt_smooth_brick": "Steinsalz Polierter Ziegelstein", - "block.mineralogy.rock_salt_smooth_brick_stairs": "Steinsalz Polierte Ziegelsteintreppen", - "block.mineralogy.rock_salt_smooth_brick_slab": "Steinsalz Polierte Ziegelplatte", - "block.mineralogy.rock_salt_wall": "Steinsalz Wand", - "block.mineralogy.rock_salt_brick_wall": "Steinsalz Ziegelwand", - "block.mineralogy.rock_salt_smooth_wall": "Steinsalz Polierte Wand", - "block.mineralogy.rock_salt_smooth_brick_wall": "Steinsalz Polierte Backsteinmauer", - "block.mineralogy.rock_salt_furnace": "Steinsalz Ofen", - "block.mineralogy.rock_salt_brick_furnace": "Steinsalz Ziegelofen", - "block.mineralogy.rock_salt_smooth_furnace": "Steinsalz Polierter Ofen", - "block.mineralogy.rock_salt_smooth_brick_furnace": "Steinsalz Polierter Ziegelofen", + "block.mineralogy.rock_salt_stairs": "Treppe aus Steinsalz", + "block.mineralogy.rock_salt_slab": "Stufe aus Steinsalz", + "block.mineralogy.rock_salt_brick": "Ziegel aus Steinsalz", + "block.mineralogy.rock_salt_brick_stairs": "Ziegeltreppe aus Steinsalz", + "block.mineralogy.rock_salt_brick_slab": "Ziegelstufe aus Steinsalz", + "block.mineralogy.rock_salt_smooth": "Polierter Block aus Steinsalz", + "block.mineralogy.rock_salt_smooth_stairs": "Polierte Treppe aus Steinsalz", + "block.mineralogy.rock_salt_smooth_slab": "Polierte Stufe aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick": "Polierte Ziegel aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Polierte Ziegeltreppe aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_slab": "Polierte Ziegelstufe aus Steinsalz", + "block.mineralogy.rock_salt_wall": "Mauer aus Steinsalz", + "block.mineralogy.rock_salt_brick_wall": "Ziegelmauer aus Steinsalz", + "block.mineralogy.rock_salt_smooth_wall": "Polierte Mauer aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_wall": "Polierte Ziegelmauer aus Steinsalz", + "block.mineralogy.rock_salt_furnace": "Ofen aus Steinsalz", + "block.mineralogy.rock_salt_brick_furnace": "Ziegelofen aus Steinsalz", + "block.mineralogy.rock_salt_smooth_furnace": "Polierter Ofen aus Steinsalz", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Polierter Ziegelofen aus Steinsalz", "block.mineralogy.hornfels": "Hornfels", - "block.mineralogy.hornfels_stairs": "Hornfels Treppe", - "block.mineralogy.hornfels_slab": "Hornfels Platte", - "block.mineralogy.hornfels_brick": "Hornfels Backstein", - "block.mineralogy.hornfels_brick_stairs": "Hornfels Ziegelsteintreppen", - "block.mineralogy.hornfels_brick_slab": "Hornfels Ziegelplatte", - "block.mineralogy.hornfels_smooth": "Polished Hornfels", - "block.mineralogy.hornfels_smooth_stairs": "Hornfels Polierte Treppe", - "block.mineralogy.hornfels_smooth_slab": "Hornfels Polierte Platte", - "block.mineralogy.hornfels_smooth_brick": "Hornfels Polierter Ziegelstein", - "block.mineralogy.hornfels_smooth_brick_stairs": "Hornfels Polierte Ziegelsteintreppen", - "block.mineralogy.hornfels_smooth_brick_slab": "Hornfels Polierte Ziegelplatte", - "block.mineralogy.hornfels_wall": "Hornfels Wand", - "block.mineralogy.hornfels_brick_wall": "Hornfels Ziegelwand", - "block.mineralogy.hornfels_smooth_wall": "Hornfels Polierte Wand", - "block.mineralogy.hornfels_smooth_brick_wall": "Hornfels Polierte Backsteinmauer", - "block.mineralogy.hornfels_furnace": "Hornfels Ofen", - "block.mineralogy.hornfels_brick_furnace": "Hornfels Ziegelofen", - "block.mineralogy.hornfels_smooth_furnace": "Hornfels Polierter Ofen", - "block.mineralogy.hornfels_smooth_brick_furnace": "Hornfels Polierter Ziegelofen", + "block.mineralogy.hornfels_stairs": "Treppe aus Hornfels", + "block.mineralogy.hornfels_slab": "Stufe aus Hornfels", + "block.mineralogy.hornfels_brick": "Ziegel aus Hornfels", + "block.mineralogy.hornfels_brick_stairs": "Ziegeltreppe aus Hornfels", + "block.mineralogy.hornfels_brick_slab": "Ziegelstufe aus Hornfels", + "block.mineralogy.hornfels_smooth": "Polierter Block aus Hornfels", + "block.mineralogy.hornfels_smooth_stairs": "Polierte Treppe aus Hornfels", + "block.mineralogy.hornfels_smooth_slab": "Polierte Stufe aus Hornfels", + "block.mineralogy.hornfels_smooth_brick": "Polierte Ziegel aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_stairs": "Polierte Ziegeltreppe aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_slab": "Polierte Ziegelstufe aus Hornfels", + "block.mineralogy.hornfels_wall": "Mauer aus Hornfels", + "block.mineralogy.hornfels_brick_wall": "Ziegelmauer aus Hornfels", + "block.mineralogy.hornfels_smooth_wall": "Polierte Mauer aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_wall": "Polierte Ziegelmauer aus Hornfels", + "block.mineralogy.hornfels_furnace": "Ofen aus Hornfels", + "block.mineralogy.hornfels_brick_furnace": "Ziegelofen aus Hornfels", + "block.mineralogy.hornfels_smooth_furnace": "Polierter Ofen aus Hornfels", + "block.mineralogy.hornfels_smooth_brick_furnace": "Polierter Ziegelofen aus Hornfels", "block.mineralogy.quartzite": "Quarzit", - "block.mineralogy.quartzite_stairs": "Quarzit Treppe", - "block.mineralogy.quartzite_slab": "Quarzit Platte", - "block.mineralogy.quartzite_brick": "Quarzit Backstein", - "block.mineralogy.quartzite_brick_stairs": "Quarzit Ziegelsteintreppen", - "block.mineralogy.quartzite_brick_slab": "Quarzit Ziegelplatte", - "block.mineralogy.quartzite_smooth": "Polished Quarzit", - "block.mineralogy.quartzite_smooth_stairs": "Quarzit Polierte Treppe", - "block.mineralogy.quartzite_smooth_slab": "Quarzit Polierte Platte", - "block.mineralogy.quartzite_smooth_brick": "Quarzit Polierter Ziegelstein", - "block.mineralogy.quartzite_smooth_brick_stairs": "Quarzit Polierte Ziegelsteintreppen", - "block.mineralogy.quartzite_smooth_brick_slab": "Quarzit Polierte Ziegelplatte", - "block.mineralogy.quartzite_wall": "Quarzit Wand", - "block.mineralogy.quartzite_brick_wall": "Quarzit Ziegelwand", - "block.mineralogy.quartzite_smooth_wall": "Quarzit Polierte Wand", - "block.mineralogy.quartzite_smooth_brick_wall": "Quarzit Polierte Backsteinmauer", - "block.mineralogy.quartzite_furnace": "Quarzit Ofen", - "block.mineralogy.quartzite_brick_furnace": "Quarzit Ziegelofen", - "block.mineralogy.quartzite_smooth_furnace": "Quarzit Polierter Ofen", - "block.mineralogy.quartzite_smooth_brick_furnace": "Quarzit Polierter Ziegelofen", - "block.mineralogy.novaculite": "Novaculite", - "block.mineralogy.novaculite_stairs": "Novaculite Treppe", - "block.mineralogy.novaculite_slab": "Novaculite Platte", - "block.mineralogy.novaculite_brick": "Novaculite Backstein", - "block.mineralogy.novaculite_brick_stairs": "Novaculite Ziegelsteintreppen", - "block.mineralogy.novaculite_brick_slab": "Novaculite Ziegelplatte", - "block.mineralogy.novaculite_smooth": "Polished Novaculite", - "block.mineralogy.novaculite_smooth_stairs": "Novaculite Polierte Treppe", - "block.mineralogy.novaculite_smooth_slab": "Novaculite Polierte Platte", - "block.mineralogy.novaculite_smooth_brick": "Novaculite Polierter Ziegelstein", - "block.mineralogy.novaculite_smooth_brick_stairs": "Novaculite Polierte Ziegelsteintreppen", - "block.mineralogy.novaculite_smooth_brick_slab": "Novaculite Polierte Ziegelplatte", - "block.mineralogy.novaculite_wall": "Novaculite Wand", - "block.mineralogy.novaculite_brick_wall": "Novaculite Ziegelwand", - "block.mineralogy.novaculite_smooth_wall": "Novaculite Polierte Wand", - "block.mineralogy.novaculite_smooth_brick_wall": "Novaculite Polierte Backsteinmauer", - "block.mineralogy.novaculite_furnace": "Novaculite Ofen", - "block.mineralogy.novaculite_brick_furnace": "Novaculite Ziegelofen", - "block.mineralogy.novaculite_smooth_furnace": "Novaculite Polierter Ofen", - "block.mineralogy.novaculite_smooth_brick_furnace": "Novaculite Polierter Ziegelofen", + "block.mineralogy.quartzite_stairs": "Treppe aus Quarzit", + "block.mineralogy.quartzite_slab": "Stufe aus Quarzit", + "block.mineralogy.quartzite_brick": "Ziegel aus Quarzit", + "block.mineralogy.quartzite_brick_stairs": "Ziegeltreppe aus Quarzit", + "block.mineralogy.quartzite_brick_slab": "Ziegelstufe aus Quarzit", + "block.mineralogy.quartzite_smooth": "Polierter Block aus Quarzit", + "block.mineralogy.quartzite_smooth_stairs": "Polierte Treppe aus Quarzit", + "block.mineralogy.quartzite_smooth_slab": "Polierte Stufe aus Quarzit", + "block.mineralogy.quartzite_smooth_brick": "Polierte Ziegel aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_slab": "Polierte Ziegelstufe aus Quarzit", + "block.mineralogy.quartzite_wall": "Mauer aus Quarzit", + "block.mineralogy.quartzite_brick_wall": "Ziegelmauer aus Quarzit", + "block.mineralogy.quartzite_smooth_wall": "Polierte Mauer aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_wall": "Polierte Ziegelmauer aus Quarzit", + "block.mineralogy.quartzite_furnace": "Ofen aus Quarzit", + "block.mineralogy.quartzite_brick_furnace": "Ziegelofen aus Quarzit", + "block.mineralogy.quartzite_smooth_furnace": "Polierter Ofen aus Quarzit", + "block.mineralogy.quartzite_smooth_brick_furnace": "Polierter Ziegelofen aus Quarzit", + "block.mineralogy.novaculite": "Novakulit", + "block.mineralogy.novaculite_stairs": "Treppe aus Novakulit", + "block.mineralogy.novaculite_slab": "Stufe aus Novakulit", + "block.mineralogy.novaculite_brick": "Ziegel aus Novakulit", + "block.mineralogy.novaculite_brick_stairs": "Ziegeltreppe aus Novakulit", + "block.mineralogy.novaculite_brick_slab": "Ziegelstufe aus Novakulit", + "block.mineralogy.novaculite_smooth": "Polierter Block aus Novakulit", + "block.mineralogy.novaculite_smooth_stairs": "Polierte Treppe aus Novakulit", + "block.mineralogy.novaculite_smooth_slab": "Polierte Stufe aus Novakulit", + "block.mineralogy.novaculite_smooth_brick": "Polierte Ziegel aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_stairs": "Polierte Ziegeltreppe aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_slab": "Polierte Ziegelstufe aus Novakulit", + "block.mineralogy.novaculite_wall": "Mauer aus Novakulit", + "block.mineralogy.novaculite_brick_wall": "Ziegelmauer aus Novakulit", + "block.mineralogy.novaculite_smooth_wall": "Polierte Mauer aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_wall": "Polierte Ziegelmauer aus Novakulit", + "block.mineralogy.novaculite_furnace": "Ofen aus Novakulit", + "block.mineralogy.novaculite_brick_furnace": "Ziegelofen aus Novakulit", + "block.mineralogy.novaculite_smooth_furnace": "Polierter Ofen aus Novakulit", + "block.mineralogy.novaculite_smooth_brick_furnace": "Polierter Ziegelofen aus Novakulit", "block.mineralogy.chalk": "Kreide", - "item.mineralogy.chalk_dust": "Kreide Pulver", + "item.mineralogy.chalk_dust": "Kreidepulver", "item.mineralogy.salt_dust": "Salz", - "item.mineralogy.rock_salt_dust": "Steinsalz-Kristalle", - "block.mineralogy.rocksaltlamp": "Steinsalz-Lampe", + "item.mineralogy.rock_salt_dust": "Steinsalzkristalle", + "block.mineralogy.rocksaltlamp": "Steinsalzlampe", "block.mineralogy.rocksaltstreetlamp": "Steinsalz-Straßenlaterne", - "block.mineralogy.andesite_relief_axe": "Andesit Axe Relief", - "block.mineralogy.andesite_relief_blank": "Andesit Leere Erleichterung", - "block.mineralogy.andesite_relief_cross": "Andesit Cross Relief", - "block.mineralogy.andesite_relief_hammer": "Andesit Hammer Relief", - "block.mineralogy.andesite_relief_hoe": "Andesit Hacke Erleichterung", - "block.mineralogy.andesite_relief_horizontal": "Andesit Horizontales Relief", - "block.mineralogy.andesite_relief_i": "Andesit I Relief", - "block.mineralogy.andesite_relief_left": "Andesit Relief links", - "block.mineralogy.andesite_relief_pickaxe": "Andesit Spitzhacke Relief", - "block.mineralogy.andesite_relief_plus": "Andesit Plus Relief", - "block.mineralogy.andesite_relief_right": "Andesit Rechte Erleichterung", - "block.mineralogy.andesite_relief_sword": "Andesit Schwert Relief", - "block.mineralogy.andesite_relief_vertical": "Andesit Vertikales Relief", - "block.mineralogy.basalt_relief_axe": "Basalt Axe Relief", - "block.mineralogy.basalt_relief_blank": "Basalt Leere Erleichterung", - "block.mineralogy.basalt_relief_cross": "Basalt Cross Relief", - "block.mineralogy.basalt_relief_hammer": "Basalt Hammer Relief", - "block.mineralogy.basalt_relief_hoe": "Basalt Hacke Erleichterung", - "block.mineralogy.basalt_relief_horizontal": "Basalt Horizontales Relief", - "block.mineralogy.basalt_relief_i": "Basalt I Relief", - "block.mineralogy.basalt_relief_left": "Basalt Relief links", - "block.mineralogy.basalt_relief_pickaxe": "Basalt Spitzhacke Relief", - "block.mineralogy.basalt_relief_plus": "Basalt Plus Relief", - "block.mineralogy.basalt_relief_right": "Basalt Rechte Erleichterung", - "block.mineralogy.basalt_relief_sword": "Basalt Schwert Relief", - "block.mineralogy.basalt_relief_vertical": "Basalt Vertikales Relief", - "block.mineralogy.diorite_relief_axe": "Diorit Axe Relief", - "block.mineralogy.diorite_relief_blank": "Diorit Leere Erleichterung", - "block.mineralogy.diorite_relief_cross": "Diorit Cross Relief", - "block.mineralogy.diorite_relief_hammer": "Diorit Hammer Relief", - "block.mineralogy.diorite_relief_hoe": "Diorit Hacke Erleichterung", - "block.mineralogy.diorite_relief_horizontal": "Diorit Horizontales Relief", - "block.mineralogy.diorite_relief_i": "Diorit I Relief", - "block.mineralogy.diorite_relief_left": "Diorit Relief links", - "block.mineralogy.diorite_relief_pickaxe": "Diorit Spitzhacke Relief", - "block.mineralogy.diorite_relief_plus": "Diorit Plus Relief", - "block.mineralogy.diorite_relief_right": "Diorit Rechte Erleichterung", - "block.mineralogy.diorite_relief_sword": "Diorit Schwert Relief", - "block.mineralogy.diorite_relief_vertical": "Diorit Vertikales Relief", - "block.mineralogy.granite_relief_axe": "Granit Axe Relief", - "block.mineralogy.granite_relief_blank": "Granit Leere Erleichterung", - "block.mineralogy.granite_relief_cross": "Granit Cross Relief", - "block.mineralogy.granite_relief_hammer": "Granit Hammer Relief", - "block.mineralogy.granite_relief_hoe": "Granit Hacke Erleichterung", - "block.mineralogy.granite_relief_horizontal": "Granit Horizontales Relief", - "block.mineralogy.granite_relief_i": "Granit I Relief", - "block.mineralogy.granite_relief_left": "Granit Relief links", - "block.mineralogy.granite_relief_pickaxe": "Granit Spitzhacke Relief", - "block.mineralogy.granite_relief_plus": "Granit Plus Relief", - "block.mineralogy.granite_relief_right": "Granit Rechte Erleichterung", - "block.mineralogy.granite_relief_sword": "Granit Schwert Relief", - "block.mineralogy.granite_relief_vertical": "Granit Vertikales Relief", - "block.mineralogy.rhyolite_relief_axe": "Rhyolith Axe Relief", - "block.mineralogy.rhyolite_relief_blank": "Rhyolith Leere Erleichterung", - "block.mineralogy.rhyolite_relief_cross": "Rhyolith Cross Relief", - "block.mineralogy.rhyolite_relief_hammer": "Rhyolith Hammer Relief", - "block.mineralogy.rhyolite_relief_hoe": "Rhyolith Hacke Erleichterung", - "block.mineralogy.rhyolite_relief_horizontal": "Rhyolith Horizontales Relief", - "block.mineralogy.rhyolite_relief_i": "Rhyolith I Relief", - "block.mineralogy.rhyolite_relief_left": "Rhyolith Relief links", - "block.mineralogy.rhyolite_relief_pickaxe": "Rhyolith Spitzhacke Relief", - "block.mineralogy.rhyolite_relief_plus": "Rhyolith Plus Relief", - "block.mineralogy.rhyolite_relief_right": "Rhyolith Rechte Erleichterung", - "block.mineralogy.rhyolite_relief_sword": "Rhyolith Schwert Relief", - "block.mineralogy.rhyolite_relief_vertical": "Rhyolith Vertikales Relief", - "block.mineralogy.pegmatite_relief_axe": "Pegmatit Axe Relief", - "block.mineralogy.pegmatite_relief_blank": "Pegmatit Leere Erleichterung", - "block.mineralogy.pegmatite_relief_cross": "Pegmatit Cross Relief", - "block.mineralogy.pegmatite_relief_hammer": "Pegmatit Hammer Relief", - "block.mineralogy.pegmatite_relief_hoe": "Pegmatit Hacke Erleichterung", - "block.mineralogy.pegmatite_relief_horizontal": "Pegmatit Horizontales Relief", - "block.mineralogy.pegmatite_relief_i": "Pegmatit I Relief", - "block.mineralogy.pegmatite_relief_left": "Pegmatit Relief links", - "block.mineralogy.pegmatite_relief_pickaxe": "Pegmatit Spitzhacke Relief", - "block.mineralogy.pegmatite_relief_plus": "Pegmatit Plus Relief", - "block.mineralogy.pegmatite_relief_right": "Pegmatit Rechte Erleichterung", - "block.mineralogy.pegmatite_relief_sword": "Pegmatit Schwert Relief", - "block.mineralogy.pegmatite_relief_vertical": "Pegmatit Vertikales Relief", - "block.mineralogy.shale_relief_axe": "Schiefer Axe Relief", - "block.mineralogy.shale_relief_blank": "Schiefer Leere Erleichterung", - "block.mineralogy.shale_relief_cross": "Schiefer Cross Relief", - "block.mineralogy.shale_relief_hammer": "Schiefer Hammer Relief", - "block.mineralogy.shale_relief_hoe": "Schiefer Hacke Erleichterung", - "block.mineralogy.shale_relief_horizontal": "Schiefer Horizontales Relief", - "block.mineralogy.shale_relief_i": "Schiefer I Relief", - "block.mineralogy.shale_relief_left": "Schiefer Relief links", - "block.mineralogy.shale_relief_pickaxe": "Schiefer Spitzhacke Relief", - "block.mineralogy.shale_relief_plus": "Schiefer Plus Relief", - "block.mineralogy.shale_relief_right": "Schiefer Rechte Erleichterung", - "block.mineralogy.shale_relief_sword": "Schiefer Schwert Relief", - "block.mineralogy.shale_relief_vertical": "Schiefer Vertikales Relief", - "block.mineralogy.conglomerate_relief_axe": "Konglomerat Axe Relief", - "block.mineralogy.conglomerate_relief_blank": "Konglomerat Leere Erleichterung", - "block.mineralogy.conglomerate_relief_cross": "Konglomerat Cross Relief", - "block.mineralogy.conglomerate_relief_hammer": "Konglomerat Hammer Relief", - "block.mineralogy.conglomerate_relief_hoe": "Konglomerat Hacke Erleichterung", - "block.mineralogy.conglomerate_relief_horizontal": "Konglomerat Horizontales Relief", - "block.mineralogy.conglomerate_relief_i": "Konglomerat I Relief", - "block.mineralogy.conglomerate_relief_left": "Konglomerat Relief links", - "block.mineralogy.conglomerate_relief_pickaxe": "Konglomerat Spitzhacke Relief", - "block.mineralogy.conglomerate_relief_plus": "Konglomerat Plus Relief", - "block.mineralogy.conglomerate_relief_right": "Konglomerat Rechte Erleichterung", - "block.mineralogy.conglomerate_relief_sword": "Konglomerat Schwert Relief", - "block.mineralogy.conglomerate_relief_vertical": "Konglomerat Vertikales Relief", - "block.mineralogy.dolomite_relief_axe": "Dolomit Axe Relief", - "block.mineralogy.dolomite_relief_blank": "Dolomit Leere Erleichterung", - "block.mineralogy.dolomite_relief_cross": "Dolomit Cross Relief", - "block.mineralogy.dolomite_relief_hammer": "Dolomit Hammer Relief", - "block.mineralogy.dolomite_relief_hoe": "Dolomit Hacke Erleichterung", - "block.mineralogy.dolomite_relief_horizontal": "Dolomit Horizontales Relief", - "block.mineralogy.dolomite_relief_i": "Dolomit I Relief", - "block.mineralogy.dolomite_relief_left": "Dolomit Relief links", - "block.mineralogy.dolomite_relief_pickaxe": "Dolomit Spitzhacke Relief", - "block.mineralogy.dolomite_relief_plus": "Dolomit Plus Relief", - "block.mineralogy.dolomite_relief_right": "Dolomit Rechte Erleichterung", - "block.mineralogy.dolomite_relief_sword": "Dolomit Schwert Relief", - "block.mineralogy.dolomite_relief_vertical": "Dolomit Vertikales Relief", - "block.mineralogy.limestone_relief_axe": "Kalkstein Axe Relief", - "block.mineralogy.limestone_relief_blank": "Kalkstein Leere Erleichterung", - "block.mineralogy.limestone_relief_cross": "Kalkstein Cross Relief", - "block.mineralogy.limestone_relief_hammer": "Kalkstein Hammer Relief", - "block.mineralogy.limestone_relief_hoe": "Kalkstein Hacke Erleichterung", - "block.mineralogy.limestone_relief_horizontal": "Kalkstein Horizontales Relief", - "block.mineralogy.limestone_relief_i": "Kalkstein I Relief", - "block.mineralogy.limestone_relief_left": "Kalkstein Relief links", - "block.mineralogy.limestone_relief_pickaxe": "Kalkstein Spitzhacke Relief", - "block.mineralogy.limestone_relief_plus": "Kalkstein Plus Relief", - "block.mineralogy.limestone_relief_right": "Kalkstein Rechte Erleichterung", - "block.mineralogy.limestone_relief_sword": "Kalkstein Schwert Relief", - "block.mineralogy.limestone_relief_vertical": "Kalkstein Vertikales Relief", - "block.mineralogy.marble_relief_axe": "Marmor Axe Relief", - "block.mineralogy.marble_relief_blank": "Marmor Leere Erleichterung", - "block.mineralogy.marble_relief_cross": "Marmor Cross Relief", - "block.mineralogy.marble_relief_hammer": "Marmor Hammer Relief", - "block.mineralogy.marble_relief_hoe": "Marmor Hacke Erleichterung", - "block.mineralogy.marble_relief_horizontal": "Marmor Horizontales Relief", - "block.mineralogy.marble_relief_i": "Marmor I Relief", - "block.mineralogy.marble_relief_left": "Marmor Relief links", - "block.mineralogy.marble_relief_pickaxe": "Marmor Spitzhacke Relief", - "block.mineralogy.marble_relief_plus": "Marmor Plus Relief", - "block.mineralogy.marble_relief_right": "Marmor Rechte Erleichterung", - "block.mineralogy.marble_relief_sword": "Marmor Schwert Relief", - "block.mineralogy.marble_relief_vertical": "Marmor Vertikales Relief", - "block.mineralogy.slate_relief_axe": "Schiefer Axe Relief", - "block.mineralogy.slate_relief_blank": "Schiefer Leere Erleichterung", - "block.mineralogy.slate_relief_cross": "Schiefer Cross Relief", - "block.mineralogy.slate_relief_hammer": "Schiefer Hammer Relief", - "block.mineralogy.slate_relief_hoe": "Schiefer Hacke Erleichterung", - "block.mineralogy.slate_relief_horizontal": "Schiefer Horizontales Relief", - "block.mineralogy.slate_relief_i": "Schiefer I Relief", - "block.mineralogy.slate_relief_left": "Schiefer Relief links", - "block.mineralogy.slate_relief_pickaxe": "Schiefer Spitzhacke Relief", - "block.mineralogy.slate_relief_plus": "Schiefer Plus Relief", - "block.mineralogy.slate_relief_right": "Schiefer Rechte Erleichterung", - "block.mineralogy.slate_relief_sword": "Schiefer Schwert Relief", - "block.mineralogy.slate_relief_vertical": "Schiefer Vertikales Relief", - "block.mineralogy.schist_relief_axe": "Schiefer Axe Relief", - "block.mineralogy.schist_relief_blank": "Schiefer Leere Erleichterung", - "block.mineralogy.schist_relief_cross": "Schiefer Cross Relief", - "block.mineralogy.schist_relief_hammer": "Schiefer Hammer Relief", - "block.mineralogy.schist_relief_hoe": "Schiefer Hacke Erleichterung", - "block.mineralogy.schist_relief_horizontal": "Schiefer Horizontales Relief", - "block.mineralogy.schist_relief_i": "Schiefer I Relief", - "block.mineralogy.schist_relief_left": "Schiefer Relief links", - "block.mineralogy.schist_relief_pickaxe": "Schiefer Spitzhacke Relief", - "block.mineralogy.schist_relief_plus": "Schiefer Plus Relief", - "block.mineralogy.schist_relief_right": "Schiefer Rechte Erleichterung", - "block.mineralogy.schist_relief_sword": "Schiefer Schwert Relief", - "block.mineralogy.schist_relief_vertical": "Schiefer Vertikales Relief", - "block.mineralogy.gneiss_relief_axe": "Gneis Axe Relief", - "block.mineralogy.gneiss_relief_blank": "Gneis Leere Erleichterung", - "block.mineralogy.gneiss_relief_cross": "Gneis Cross Relief", - "block.mineralogy.gneiss_relief_hammer": "Gneis Hammer Relief", - "block.mineralogy.gneiss_relief_hoe": "Gneis Hacke Erleichterung", - "block.mineralogy.gneiss_relief_horizontal": "Gneis Horizontales Relief", - "block.mineralogy.gneiss_relief_i": "Gneis I Relief", - "block.mineralogy.gneiss_relief_left": "Gneis Relief links", - "block.mineralogy.gneiss_relief_pickaxe": "Gneis Spitzhacke Relief", - "block.mineralogy.gneiss_relief_plus": "Gneis Plus Relief", - "block.mineralogy.gneiss_relief_right": "Gneis Rechte Erleichterung", - "block.mineralogy.gneiss_relief_sword": "Gneis Schwert Relief", - "block.mineralogy.gneiss_relief_vertical": "Gneis Vertikales Relief", - "block.mineralogy.phyllite_relief_axe": "Phyllite Axe Relief", - "block.mineralogy.phyllite_relief_blank": "Phyllite Leere Erleichterung", - "block.mineralogy.phyllite_relief_cross": "Phyllite Cross Relief", - "block.mineralogy.phyllite_relief_hammer": "Phyllite Hammer Relief", - "block.mineralogy.phyllite_relief_hoe": "Phyllite Hacke Erleichterung", - "block.mineralogy.phyllite_relief_horizontal": "Phyllite Horizontales Relief", - "block.mineralogy.phyllite_relief_i": "Phyllite I Relief", - "block.mineralogy.phyllite_relief_left": "Phyllite Relief links", - "block.mineralogy.phyllite_relief_pickaxe": "Phyllite Spitzhacke Relief", - "block.mineralogy.phyllite_relief_plus": "Phyllite Plus Relief", - "block.mineralogy.phyllite_relief_right": "Phyllite Rechte Erleichterung", - "block.mineralogy.phyllite_relief_sword": "Phyllite Schwert Relief", - "block.mineralogy.phyllite_relief_vertical": "Phyllite Vertikales Relief", - "block.mineralogy.amphibolite_relief_axe": "Amphibolith Axe Relief", - "block.mineralogy.amphibolite_relief_blank": "Amphibolith Leere Erleichterung", - "block.mineralogy.amphibolite_relief_cross": "Amphibolith Cross Relief", - "block.mineralogy.amphibolite_relief_hammer": "Amphibolith Hammer Relief", - "block.mineralogy.amphibolite_relief_hoe": "Amphibolith Hacke Erleichterung", - "block.mineralogy.amphibolite_relief_horizontal": "Amphibolith Horizontales Relief", - "block.mineralogy.amphibolite_relief_i": "Amphibolith I Relief", - "block.mineralogy.amphibolite_relief_left": "Amphibolith Relief links", - "block.mineralogy.amphibolite_relief_pickaxe": "Amphibolith Spitzhacke Relief", - "block.mineralogy.amphibolite_relief_plus": "Amphibolith Plus Relief", - "block.mineralogy.amphibolite_relief_right": "Amphibolith Rechte Erleichterung", - "block.mineralogy.amphibolite_relief_sword": "Amphibolith Schwert Relief", - "block.mineralogy.amphibolite_relief_vertical": "Amphibolith Vertikales Relief", - "block.mineralogy.diabase_relief_axe": "Diabas Axe Relief", - "block.mineralogy.diabase_relief_blank": "Diabas Leere Erleichterung", - "block.mineralogy.diabase_relief_cross": "Diabas Cross Relief", - "block.mineralogy.diabase_relief_hammer": "Diabas Hammer Relief", - "block.mineralogy.diabase_relief_hoe": "Diabas Hacke Erleichterung", - "block.mineralogy.diabase_relief_horizontal": "Diabas Horizontales Relief", - "block.mineralogy.diabase_relief_i": "Diabas I Relief", - "block.mineralogy.diabase_relief_left": "Diabas Relief links", - "block.mineralogy.diabase_relief_pickaxe": "Diabas Spitzhacke Relief", - "block.mineralogy.diabase_relief_plus": "Diabas Plus Relief", - "block.mineralogy.diabase_relief_right": "Diabas Rechte Erleichterung", - "block.mineralogy.diabase_relief_sword": "Diabas Schwert Relief", - "block.mineralogy.diabase_relief_vertical": "Diabas Vertikales Relief", - "block.mineralogy.gabbro_relief_axe": "Gabbro Axe Relief", - "block.mineralogy.gabbro_relief_blank": "Gabbro Leere Erleichterung", - "block.mineralogy.gabbro_relief_cross": "Gabbro Cross Relief", - "block.mineralogy.gabbro_relief_hammer": "Gabbro Hammer Relief", - "block.mineralogy.gabbro_relief_hoe": "Gabbro Hacke Erleichterung", - "block.mineralogy.gabbro_relief_horizontal": "Gabbro Horizontales Relief", - "block.mineralogy.gabbro_relief_i": "Gabbro I Relief", - "block.mineralogy.gabbro_relief_left": "Gabbro Relief links", - "block.mineralogy.gabbro_relief_pickaxe": "Gabbro Spitzhacke Relief", - "block.mineralogy.gabbro_relief_plus": "Gabbro Plus Relief", - "block.mineralogy.gabbro_relief_right": "Gabbro Rechte Erleichterung", - "block.mineralogy.gabbro_relief_sword": "Gabbro Schwert Relief", - "block.mineralogy.gabbro_relief_vertical": "Gabbro Vertikales Relief", - "block.mineralogy.peridotite_relief_axe": "Peridotit Axe Relief", - "block.mineralogy.peridotite_relief_blank": "Peridotit Leere Erleichterung", - "block.mineralogy.peridotite_relief_cross": "Peridotit Cross Relief", - "block.mineralogy.peridotite_relief_hammer": "Peridotit Hammer Relief", - "block.mineralogy.peridotite_relief_hoe": "Peridotit Hacke Erleichterung", - "block.mineralogy.peridotite_relief_horizontal": "Peridotit Horizontales Relief", - "block.mineralogy.peridotite_relief_i": "Peridotit I Relief", - "block.mineralogy.peridotite_relief_left": "Peridotit Relief links", - "block.mineralogy.peridotite_relief_pickaxe": "Peridotit Spitzhacke Relief", - "block.mineralogy.peridotite_relief_plus": "Peridotit Plus Relief", - "block.mineralogy.peridotite_relief_right": "Peridotit Rechte Erleichterung", - "block.mineralogy.peridotite_relief_sword": "Peridotit Schwert Relief", - "block.mineralogy.peridotite_relief_vertical": "Peridotit Vertikales Relief", - "block.mineralogy.basaltic_glass_relief_axe": "Basaltglas Axe Relief", - "block.mineralogy.basaltic_glass_relief_blank": "Basaltglas Leere Erleichterung", - "block.mineralogy.basaltic_glass_relief_cross": "Basaltglas Cross Relief", - "block.mineralogy.basaltic_glass_relief_hammer": "Basaltglas Hammer Relief", - "block.mineralogy.basaltic_glass_relief_hoe": "Basaltglas Hacke Erleichterung", - "block.mineralogy.basaltic_glass_relief_horizontal": "Basaltglas Horizontales Relief", - "block.mineralogy.basaltic_glass_relief_i": "Basaltglas I Relief", - "block.mineralogy.basaltic_glass_relief_left": "Basaltglas Relief links", - "block.mineralogy.basaltic_glass_relief_pickaxe": "Basaltglas Spitzhacke Relief", - "block.mineralogy.basaltic_glass_relief_plus": "Basaltglas Plus Relief", - "block.mineralogy.basaltic_glass_relief_right": "Basaltglas Rechte Erleichterung", - "block.mineralogy.basaltic_glass_relief_sword": "Basaltglas Schwert Relief", - "block.mineralogy.basaltic_glass_relief_vertical": "Basaltglas Vertikales Relief", - "block.mineralogy.scoria_relief_axe": "Schlacke Axe Relief", - "block.mineralogy.scoria_relief_blank": "Schlacke Leere Erleichterung", - "block.mineralogy.scoria_relief_cross": "Schlacke Cross Relief", - "block.mineralogy.scoria_relief_hammer": "Schlacke Hammer Relief", - "block.mineralogy.scoria_relief_hoe": "Schlacke Hacke Erleichterung", - "block.mineralogy.scoria_relief_horizontal": "Schlacke Horizontales Relief", - "block.mineralogy.scoria_relief_i": "Schlacke I Relief", - "block.mineralogy.scoria_relief_left": "Schlacke Relief links", - "block.mineralogy.scoria_relief_pickaxe": "Schlacke Spitzhacke Relief", - "block.mineralogy.scoria_relief_plus": "Schlacke Plus Relief", - "block.mineralogy.scoria_relief_right": "Schlacke Rechte Erleichterung", - "block.mineralogy.scoria_relief_sword": "Schlacke Schwert Relief", - "block.mineralogy.scoria_relief_vertical": "Schlacke Vertikales Relief", - "block.mineralogy.tuff_relief_axe": "Tuff Axe Relief", - "block.mineralogy.tuff_relief_blank": "Tuff Leere Erleichterung", - "block.mineralogy.tuff_relief_cross": "Tuff Cross Relief", - "block.mineralogy.tuff_relief_hammer": "Tuff Hammer Relief", - "block.mineralogy.tuff_relief_hoe": "Tuff Hacke Erleichterung", - "block.mineralogy.tuff_relief_horizontal": "Tuff Horizontales Relief", - "block.mineralogy.tuff_relief_i": "Tuff I Relief", - "block.mineralogy.tuff_relief_left": "Tuff Relief links", - "block.mineralogy.tuff_relief_pickaxe": "Tuff Spitzhacke Relief", - "block.mineralogy.tuff_relief_plus": "Tuff Plus Relief", - "block.mineralogy.tuff_relief_right": "Tuff Rechte Erleichterung", - "block.mineralogy.tuff_relief_sword": "Tuff Schwert Relief", - "block.mineralogy.tuff_relief_vertical": "Tuff Vertikales Relief", - "block.mineralogy.siltstone_relief_axe": "Schluffstein Axe Relief", - "block.mineralogy.siltstone_relief_blank": "Schluffstein Leere Erleichterung", - "block.mineralogy.siltstone_relief_cross": "Schluffstein Cross Relief", - "block.mineralogy.siltstone_relief_hammer": "Schluffstein Hammer Relief", - "block.mineralogy.siltstone_relief_hoe": "Schluffstein Hacke Erleichterung", - "block.mineralogy.siltstone_relief_horizontal": "Schluffstein Horizontales Relief", - "block.mineralogy.siltstone_relief_i": "Schluffstein I Relief", - "block.mineralogy.siltstone_relief_left": "Schluffstein Relief links", - "block.mineralogy.siltstone_relief_pickaxe": "Schluffstein Spitzhacke Relief", - "block.mineralogy.siltstone_relief_plus": "Schluffstein Plus Relief", - "block.mineralogy.siltstone_relief_right": "Schluffstein Rechte Erleichterung", - "block.mineralogy.siltstone_relief_sword": "Schluffstein Schwert Relief", - "block.mineralogy.siltstone_relief_vertical": "Schluffstein Vertikales Relief", - "block.mineralogy.rock_salt_relief_axe": "Steinsalz Axe Relief", - "block.mineralogy.rock_salt_relief_blank": "Steinsalz Leere Erleichterung", - "block.mineralogy.rock_salt_relief_cross": "Steinsalz Cross Relief", - "block.mineralogy.rock_salt_relief_hammer": "Steinsalz Hammer Relief", - "block.mineralogy.rock_salt_relief_hoe": "Steinsalz Hacke Erleichterung", - "block.mineralogy.rock_salt_relief_horizontal": "Steinsalz Horizontales Relief", - "block.mineralogy.rock_salt_relief_i": "Steinsalz I Relief", - "block.mineralogy.rock_salt_relief_left": "Steinsalz Relief links", - "block.mineralogy.rock_salt_relief_pickaxe": "Steinsalz Spitzhacke Relief", - "block.mineralogy.rock_salt_relief_plus": "Steinsalz Plus Relief", - "block.mineralogy.rock_salt_relief_right": "Steinsalz Rechte Erleichterung", - "block.mineralogy.rock_salt_relief_sword": "Steinsalz Schwert Relief", - "block.mineralogy.rock_salt_relief_vertical": "Steinsalz Vertikales Relief", - "block.mineralogy.hornfels_relief_axe": "Hornfels Axe Relief", - "block.mineralogy.hornfels_relief_blank": "Hornfels Leere Erleichterung", - "block.mineralogy.hornfels_relief_cross": "Hornfels Cross Relief", - "block.mineralogy.hornfels_relief_hammer": "Hornfels Hammer Relief", - "block.mineralogy.hornfels_relief_hoe": "Hornfels Hacke Erleichterung", - "block.mineralogy.hornfels_relief_horizontal": "Hornfels Horizontales Relief", - "block.mineralogy.hornfels_relief_i": "Hornfels I Relief", - "block.mineralogy.hornfels_relief_left": "Hornfels Relief links", - "block.mineralogy.hornfels_relief_pickaxe": "Hornfels Spitzhacke Relief", - "block.mineralogy.hornfels_relief_plus": "Hornfels Plus Relief", - "block.mineralogy.hornfels_relief_right": "Hornfels Rechte Erleichterung", - "block.mineralogy.hornfels_relief_sword": "Hornfels Schwert Relief", - "block.mineralogy.hornfels_relief_vertical": "Hornfels Vertikales Relief", - "block.mineralogy.quartzite_relief_axe": "Quarzit Axe Relief", - "block.mineralogy.quartzite_relief_blank": "Quarzit Leere Erleichterung", - "block.mineralogy.quartzite_relief_cross": "Quarzit Cross Relief", - "block.mineralogy.quartzite_relief_hammer": "Quarzit Hammer Relief", - "block.mineralogy.quartzite_relief_hoe": "Quarzit Hacke Erleichterung", - "block.mineralogy.quartzite_relief_horizontal": "Quarzit Horizontales Relief", - "block.mineralogy.quartzite_relief_i": "Quarzit I Relief", - "block.mineralogy.quartzite_relief_left": "Quarzit Relief links", - "block.mineralogy.quartzite_relief_pickaxe": "Quarzit Spitzhacke Relief", - "block.mineralogy.quartzite_relief_plus": "Quarzit Plus Relief", - "block.mineralogy.quartzite_relief_right": "Quarzit Rechte Erleichterung", - "block.mineralogy.quartzite_relief_sword": "Quarzit Schwert Relief", - "block.mineralogy.quartzite_relief_vertical": "Quarzit Vertikales Relief", - "block.mineralogy.novaculite_relief_axe": "Novaculite Axe Relief", - "block.mineralogy.novaculite_relief_blank": "Novaculite Leere Erleichterung", - "block.mineralogy.novaculite_relief_cross": "Novaculite Cross Relief", - "block.mineralogy.novaculite_relief_hammer": "Novaculite Hammer Relief", - "block.mineralogy.novaculite_relief_hoe": "Novaculite Hacke Erleichterung", - "block.mineralogy.novaculite_relief_horizontal": "Novaculite Horizontales Relief", - "block.mineralogy.novaculite_relief_i": "Novaculite I Relief", - "block.mineralogy.novaculite_relief_left": "Novaculite Relief links", - "block.mineralogy.novaculite_relief_pickaxe": "Novaculite Spitzhacke Relief", - "block.mineralogy.novaculite_relief_plus": "Novaculite Plus Relief", - "block.mineralogy.novaculite_relief_right": "Novaculite Rechte Erleichterung", - "block.mineralogy.novaculite_relief_sword": "Novaculite Schwert Relief", - "block.mineralogy.novaculite_relief_vertical": "Novaculite Vertikales Relief", - "itemGroup.mineralogy.mineralogy": "Mineralogie" + "block.mineralogy.andesite_relief_axe": "Relief aus Andesit (Axt)", + "block.mineralogy.andesite_relief_blank": "Relief aus Andesit (ohne Motiv)", + "block.mineralogy.andesite_relief_cross": "Relief aus Andesit (Kreuz)", + "block.mineralogy.andesite_relief_hammer": "Relief aus Andesit (Hammer)", + "block.mineralogy.andesite_relief_hoe": "Relief aus Andesit (Hacke)", + "block.mineralogy.andesite_relief_horizontal": "Relief aus Andesit (waagerecht)", + "block.mineralogy.andesite_relief_i": "Relief aus Andesit (I)", + "block.mineralogy.andesite_relief_left": "Relief aus Andesit (links)", + "block.mineralogy.andesite_relief_pickaxe": "Relief aus Andesit (Spitzhacke)", + "block.mineralogy.andesite_relief_plus": "Relief aus Andesit (Pluszeichen)", + "block.mineralogy.andesite_relief_right": "Relief aus Andesit (rechts)", + "block.mineralogy.andesite_relief_sword": "Relief aus Andesit (Schwert)", + "block.mineralogy.andesite_relief_vertical": "Relief aus Andesit (senkrecht)", + "block.mineralogy.basalt_relief_axe": "Relief aus Basalt (Axt)", + "block.mineralogy.basalt_relief_blank": "Relief aus Basalt (ohne Motiv)", + "block.mineralogy.basalt_relief_cross": "Relief aus Basalt (Kreuz)", + "block.mineralogy.basalt_relief_hammer": "Relief aus Basalt (Hammer)", + "block.mineralogy.basalt_relief_hoe": "Relief aus Basalt (Hacke)", + "block.mineralogy.basalt_relief_horizontal": "Relief aus Basalt (waagerecht)", + "block.mineralogy.basalt_relief_i": "Relief aus Basalt (I)", + "block.mineralogy.basalt_relief_left": "Relief aus Basalt (links)", + "block.mineralogy.basalt_relief_pickaxe": "Relief aus Basalt (Spitzhacke)", + "block.mineralogy.basalt_relief_plus": "Relief aus Basalt (Pluszeichen)", + "block.mineralogy.basalt_relief_right": "Relief aus Basalt (rechts)", + "block.mineralogy.basalt_relief_sword": "Relief aus Basalt (Schwert)", + "block.mineralogy.basalt_relief_vertical": "Relief aus Basalt (senkrecht)", + "block.mineralogy.diorite_relief_axe": "Relief aus Diorit (Axt)", + "block.mineralogy.diorite_relief_blank": "Relief aus Diorit (ohne Motiv)", + "block.mineralogy.diorite_relief_cross": "Relief aus Diorit (Kreuz)", + "block.mineralogy.diorite_relief_hammer": "Relief aus Diorit (Hammer)", + "block.mineralogy.diorite_relief_hoe": "Relief aus Diorit (Hacke)", + "block.mineralogy.diorite_relief_horizontal": "Relief aus Diorit (waagerecht)", + "block.mineralogy.diorite_relief_i": "Relief aus Diorit (I)", + "block.mineralogy.diorite_relief_left": "Relief aus Diorit (links)", + "block.mineralogy.diorite_relief_pickaxe": "Relief aus Diorit (Spitzhacke)", + "block.mineralogy.diorite_relief_plus": "Relief aus Diorit (Pluszeichen)", + "block.mineralogy.diorite_relief_right": "Relief aus Diorit (rechts)", + "block.mineralogy.diorite_relief_sword": "Relief aus Diorit (Schwert)", + "block.mineralogy.diorite_relief_vertical": "Relief aus Diorit (senkrecht)", + "block.mineralogy.granite_relief_axe": "Relief aus Granit (Axt)", + "block.mineralogy.granite_relief_blank": "Relief aus Granit (ohne Motiv)", + "block.mineralogy.granite_relief_cross": "Relief aus Granit (Kreuz)", + "block.mineralogy.granite_relief_hammer": "Relief aus Granit (Hammer)", + "block.mineralogy.granite_relief_hoe": "Relief aus Granit (Hacke)", + "block.mineralogy.granite_relief_horizontal": "Relief aus Granit (waagerecht)", + "block.mineralogy.granite_relief_i": "Relief aus Granit (I)", + "block.mineralogy.granite_relief_left": "Relief aus Granit (links)", + "block.mineralogy.granite_relief_pickaxe": "Relief aus Granit (Spitzhacke)", + "block.mineralogy.granite_relief_plus": "Relief aus Granit (Pluszeichen)", + "block.mineralogy.granite_relief_right": "Relief aus Granit (rechts)", + "block.mineralogy.granite_relief_sword": "Relief aus Granit (Schwert)", + "block.mineralogy.granite_relief_vertical": "Relief aus Granit (senkrecht)", + "block.mineralogy.rhyolite_relief_axe": "Relief aus Rhyolith (Axt)", + "block.mineralogy.rhyolite_relief_blank": "Relief aus Rhyolith (ohne Motiv)", + "block.mineralogy.rhyolite_relief_cross": "Relief aus Rhyolith (Kreuz)", + "block.mineralogy.rhyolite_relief_hammer": "Relief aus Rhyolith (Hammer)", + "block.mineralogy.rhyolite_relief_hoe": "Relief aus Rhyolith (Hacke)", + "block.mineralogy.rhyolite_relief_horizontal": "Relief aus Rhyolith (waagerecht)", + "block.mineralogy.rhyolite_relief_i": "Relief aus Rhyolith (I)", + "block.mineralogy.rhyolite_relief_left": "Relief aus Rhyolith (links)", + "block.mineralogy.rhyolite_relief_pickaxe": "Relief aus Rhyolith (Spitzhacke)", + "block.mineralogy.rhyolite_relief_plus": "Relief aus Rhyolith (Pluszeichen)", + "block.mineralogy.rhyolite_relief_right": "Relief aus Rhyolith (rechts)", + "block.mineralogy.rhyolite_relief_sword": "Relief aus Rhyolith (Schwert)", + "block.mineralogy.rhyolite_relief_vertical": "Relief aus Rhyolith (senkrecht)", + "block.mineralogy.pegmatite_relief_axe": "Relief aus Pegmatit (Axt)", + "block.mineralogy.pegmatite_relief_blank": "Relief aus Pegmatit (ohne Motiv)", + "block.mineralogy.pegmatite_relief_cross": "Relief aus Pegmatit (Kreuz)", + "block.mineralogy.pegmatite_relief_hammer": "Relief aus Pegmatit (Hammer)", + "block.mineralogy.pegmatite_relief_hoe": "Relief aus Pegmatit (Hacke)", + "block.mineralogy.pegmatite_relief_horizontal": "Relief aus Pegmatit (waagerecht)", + "block.mineralogy.pegmatite_relief_i": "Relief aus Pegmatit (I)", + "block.mineralogy.pegmatite_relief_left": "Relief aus Pegmatit (links)", + "block.mineralogy.pegmatite_relief_pickaxe": "Relief aus Pegmatit (Spitzhacke)", + "block.mineralogy.pegmatite_relief_plus": "Relief aus Pegmatit (Pluszeichen)", + "block.mineralogy.pegmatite_relief_right": "Relief aus Pegmatit (rechts)", + "block.mineralogy.pegmatite_relief_sword": "Relief aus Pegmatit (Schwert)", + "block.mineralogy.pegmatite_relief_vertical": "Relief aus Pegmatit (senkrecht)", + "block.mineralogy.shale_relief_axe": "Relief aus Tonschiefer (Axt)", + "block.mineralogy.shale_relief_blank": "Relief aus Tonschiefer (ohne Motiv)", + "block.mineralogy.shale_relief_cross": "Relief aus Tonschiefer (Kreuz)", + "block.mineralogy.shale_relief_hammer": "Relief aus Tonschiefer (Hammer)", + "block.mineralogy.shale_relief_hoe": "Relief aus Tonschiefer (Hacke)", + "block.mineralogy.shale_relief_horizontal": "Relief aus Tonschiefer (waagerecht)", + "block.mineralogy.shale_relief_i": "Relief aus Tonschiefer (I)", + "block.mineralogy.shale_relief_left": "Relief aus Tonschiefer (links)", + "block.mineralogy.shale_relief_pickaxe": "Relief aus Tonschiefer (Spitzhacke)", + "block.mineralogy.shale_relief_plus": "Relief aus Tonschiefer (Pluszeichen)", + "block.mineralogy.shale_relief_right": "Relief aus Tonschiefer (rechts)", + "block.mineralogy.shale_relief_sword": "Relief aus Tonschiefer (Schwert)", + "block.mineralogy.shale_relief_vertical": "Relief aus Tonschiefer (senkrecht)", + "block.mineralogy.conglomerate_relief_axe": "Relief aus Konglomerat (Axt)", + "block.mineralogy.conglomerate_relief_blank": "Relief aus Konglomerat (ohne Motiv)", + "block.mineralogy.conglomerate_relief_cross": "Relief aus Konglomerat (Kreuz)", + "block.mineralogy.conglomerate_relief_hammer": "Relief aus Konglomerat (Hammer)", + "block.mineralogy.conglomerate_relief_hoe": "Relief aus Konglomerat (Hacke)", + "block.mineralogy.conglomerate_relief_horizontal": "Relief aus Konglomerat (waagerecht)", + "block.mineralogy.conglomerate_relief_i": "Relief aus Konglomerat (I)", + "block.mineralogy.conglomerate_relief_left": "Relief aus Konglomerat (links)", + "block.mineralogy.conglomerate_relief_pickaxe": "Relief aus Konglomerat (Spitzhacke)", + "block.mineralogy.conglomerate_relief_plus": "Relief aus Konglomerat (Pluszeichen)", + "block.mineralogy.conglomerate_relief_right": "Relief aus Konglomerat (rechts)", + "block.mineralogy.conglomerate_relief_sword": "Relief aus Konglomerat (Schwert)", + "block.mineralogy.conglomerate_relief_vertical": "Relief aus Konglomerat (senkrecht)", + "block.mineralogy.dolomite_relief_axe": "Relief aus Dolomit (Axt)", + "block.mineralogy.dolomite_relief_blank": "Relief aus Dolomit (ohne Motiv)", + "block.mineralogy.dolomite_relief_cross": "Relief aus Dolomit (Kreuz)", + "block.mineralogy.dolomite_relief_hammer": "Relief aus Dolomit (Hammer)", + "block.mineralogy.dolomite_relief_hoe": "Relief aus Dolomit (Hacke)", + "block.mineralogy.dolomite_relief_horizontal": "Relief aus Dolomit (waagerecht)", + "block.mineralogy.dolomite_relief_i": "Relief aus Dolomit (I)", + "block.mineralogy.dolomite_relief_left": "Relief aus Dolomit (links)", + "block.mineralogy.dolomite_relief_pickaxe": "Relief aus Dolomit (Spitzhacke)", + "block.mineralogy.dolomite_relief_plus": "Relief aus Dolomit (Pluszeichen)", + "block.mineralogy.dolomite_relief_right": "Relief aus Dolomit (rechts)", + "block.mineralogy.dolomite_relief_sword": "Relief aus Dolomit (Schwert)", + "block.mineralogy.dolomite_relief_vertical": "Relief aus Dolomit (senkrecht)", + "block.mineralogy.limestone_relief_axe": "Relief aus Kalkstein (Axt)", + "block.mineralogy.limestone_relief_blank": "Relief aus Kalkstein (ohne Motiv)", + "block.mineralogy.limestone_relief_cross": "Relief aus Kalkstein (Kreuz)", + "block.mineralogy.limestone_relief_hammer": "Relief aus Kalkstein (Hammer)", + "block.mineralogy.limestone_relief_hoe": "Relief aus Kalkstein (Hacke)", + "block.mineralogy.limestone_relief_horizontal": "Relief aus Kalkstein (waagerecht)", + "block.mineralogy.limestone_relief_i": "Relief aus Kalkstein (I)", + "block.mineralogy.limestone_relief_left": "Relief aus Kalkstein (links)", + "block.mineralogy.limestone_relief_pickaxe": "Relief aus Kalkstein (Spitzhacke)", + "block.mineralogy.limestone_relief_plus": "Relief aus Kalkstein (Pluszeichen)", + "block.mineralogy.limestone_relief_right": "Relief aus Kalkstein (rechts)", + "block.mineralogy.limestone_relief_sword": "Relief aus Kalkstein (Schwert)", + "block.mineralogy.limestone_relief_vertical": "Relief aus Kalkstein (senkrecht)", + "block.mineralogy.marble_relief_axe": "Relief aus Marmor (Axt)", + "block.mineralogy.marble_relief_blank": "Relief aus Marmor (ohne Motiv)", + "block.mineralogy.marble_relief_cross": "Relief aus Marmor (Kreuz)", + "block.mineralogy.marble_relief_hammer": "Relief aus Marmor (Hammer)", + "block.mineralogy.marble_relief_hoe": "Relief aus Marmor (Hacke)", + "block.mineralogy.marble_relief_horizontal": "Relief aus Marmor (waagerecht)", + "block.mineralogy.marble_relief_i": "Relief aus Marmor (I)", + "block.mineralogy.marble_relief_left": "Relief aus Marmor (links)", + "block.mineralogy.marble_relief_pickaxe": "Relief aus Marmor (Spitzhacke)", + "block.mineralogy.marble_relief_plus": "Relief aus Marmor (Pluszeichen)", + "block.mineralogy.marble_relief_right": "Relief aus Marmor (rechts)", + "block.mineralogy.marble_relief_sword": "Relief aus Marmor (Schwert)", + "block.mineralogy.marble_relief_vertical": "Relief aus Marmor (senkrecht)", + "block.mineralogy.slate_relief_axe": "Relief aus Schiefer (Axt)", + "block.mineralogy.slate_relief_blank": "Relief aus Schiefer (ohne Motiv)", + "block.mineralogy.slate_relief_cross": "Relief aus Schiefer (Kreuz)", + "block.mineralogy.slate_relief_hammer": "Relief aus Schiefer (Hammer)", + "block.mineralogy.slate_relief_hoe": "Relief aus Schiefer (Hacke)", + "block.mineralogy.slate_relief_horizontal": "Relief aus Schiefer (waagerecht)", + "block.mineralogy.slate_relief_i": "Relief aus Schiefer (I)", + "block.mineralogy.slate_relief_left": "Relief aus Schiefer (links)", + "block.mineralogy.slate_relief_pickaxe": "Relief aus Schiefer (Spitzhacke)", + "block.mineralogy.slate_relief_plus": "Relief aus Schiefer (Pluszeichen)", + "block.mineralogy.slate_relief_right": "Relief aus Schiefer (rechts)", + "block.mineralogy.slate_relief_sword": "Relief aus Schiefer (Schwert)", + "block.mineralogy.slate_relief_vertical": "Relief aus Schiefer (senkrecht)", + "block.mineralogy.schist_relief_axe": "Relief aus Glimmerschiefer (Axt)", + "block.mineralogy.schist_relief_blank": "Relief aus Glimmerschiefer (ohne Motiv)", + "block.mineralogy.schist_relief_cross": "Relief aus Glimmerschiefer (Kreuz)", + "block.mineralogy.schist_relief_hammer": "Relief aus Glimmerschiefer (Hammer)", + "block.mineralogy.schist_relief_hoe": "Relief aus Glimmerschiefer (Hacke)", + "block.mineralogy.schist_relief_horizontal": "Relief aus Glimmerschiefer (waagerecht)", + "block.mineralogy.schist_relief_i": "Relief aus Glimmerschiefer (I)", + "block.mineralogy.schist_relief_left": "Relief aus Glimmerschiefer (links)", + "block.mineralogy.schist_relief_pickaxe": "Relief aus Glimmerschiefer (Spitzhacke)", + "block.mineralogy.schist_relief_plus": "Relief aus Glimmerschiefer (Pluszeichen)", + "block.mineralogy.schist_relief_right": "Relief aus Glimmerschiefer (rechts)", + "block.mineralogy.schist_relief_sword": "Relief aus Glimmerschiefer (Schwert)", + "block.mineralogy.schist_relief_vertical": "Relief aus Glimmerschiefer (senkrecht)", + "block.mineralogy.gneiss_relief_axe": "Relief aus Gneis (Axt)", + "block.mineralogy.gneiss_relief_blank": "Relief aus Gneis (ohne Motiv)", + "block.mineralogy.gneiss_relief_cross": "Relief aus Gneis (Kreuz)", + "block.mineralogy.gneiss_relief_hammer": "Relief aus Gneis (Hammer)", + "block.mineralogy.gneiss_relief_hoe": "Relief aus Gneis (Hacke)", + "block.mineralogy.gneiss_relief_horizontal": "Relief aus Gneis (waagerecht)", + "block.mineralogy.gneiss_relief_i": "Relief aus Gneis (I)", + "block.mineralogy.gneiss_relief_left": "Relief aus Gneis (links)", + "block.mineralogy.gneiss_relief_pickaxe": "Relief aus Gneis (Spitzhacke)", + "block.mineralogy.gneiss_relief_plus": "Relief aus Gneis (Pluszeichen)", + "block.mineralogy.gneiss_relief_right": "Relief aus Gneis (rechts)", + "block.mineralogy.gneiss_relief_sword": "Relief aus Gneis (Schwert)", + "block.mineralogy.gneiss_relief_vertical": "Relief aus Gneis (senkrecht)", + "block.mineralogy.phyllite_relief_axe": "Relief aus Phyllit (Axt)", + "block.mineralogy.phyllite_relief_blank": "Relief aus Phyllit (ohne Motiv)", + "block.mineralogy.phyllite_relief_cross": "Relief aus Phyllit (Kreuz)", + "block.mineralogy.phyllite_relief_hammer": "Relief aus Phyllit (Hammer)", + "block.mineralogy.phyllite_relief_hoe": "Relief aus Phyllit (Hacke)", + "block.mineralogy.phyllite_relief_horizontal": "Relief aus Phyllit (waagerecht)", + "block.mineralogy.phyllite_relief_i": "Relief aus Phyllit (I)", + "block.mineralogy.phyllite_relief_left": "Relief aus Phyllit (links)", + "block.mineralogy.phyllite_relief_pickaxe": "Relief aus Phyllit (Spitzhacke)", + "block.mineralogy.phyllite_relief_plus": "Relief aus Phyllit (Pluszeichen)", + "block.mineralogy.phyllite_relief_right": "Relief aus Phyllit (rechts)", + "block.mineralogy.phyllite_relief_sword": "Relief aus Phyllit (Schwert)", + "block.mineralogy.phyllite_relief_vertical": "Relief aus Phyllit (senkrecht)", + "block.mineralogy.amphibolite_relief_axe": "Relief aus Amphibolit (Axt)", + "block.mineralogy.amphibolite_relief_blank": "Relief aus Amphibolit (ohne Motiv)", + "block.mineralogy.amphibolite_relief_cross": "Relief aus Amphibolit (Kreuz)", + "block.mineralogy.amphibolite_relief_hammer": "Relief aus Amphibolit (Hammer)", + "block.mineralogy.amphibolite_relief_hoe": "Relief aus Amphibolit (Hacke)", + "block.mineralogy.amphibolite_relief_horizontal": "Relief aus Amphibolit (waagerecht)", + "block.mineralogy.amphibolite_relief_i": "Relief aus Amphibolit (I)", + "block.mineralogy.amphibolite_relief_left": "Relief aus Amphibolit (links)", + "block.mineralogy.amphibolite_relief_pickaxe": "Relief aus Amphibolit (Spitzhacke)", + "block.mineralogy.amphibolite_relief_plus": "Relief aus Amphibolit (Pluszeichen)", + "block.mineralogy.amphibolite_relief_right": "Relief aus Amphibolit (rechts)", + "block.mineralogy.amphibolite_relief_sword": "Relief aus Amphibolit (Schwert)", + "block.mineralogy.amphibolite_relief_vertical": "Relief aus Amphibolit (senkrecht)", + "block.mineralogy.diabase_relief_axe": "Relief aus Diabas (Axt)", + "block.mineralogy.diabase_relief_blank": "Relief aus Diabas (ohne Motiv)", + "block.mineralogy.diabase_relief_cross": "Relief aus Diabas (Kreuz)", + "block.mineralogy.diabase_relief_hammer": "Relief aus Diabas (Hammer)", + "block.mineralogy.diabase_relief_hoe": "Relief aus Diabas (Hacke)", + "block.mineralogy.diabase_relief_horizontal": "Relief aus Diabas (waagerecht)", + "block.mineralogy.diabase_relief_i": "Relief aus Diabas (I)", + "block.mineralogy.diabase_relief_left": "Relief aus Diabas (links)", + "block.mineralogy.diabase_relief_pickaxe": "Relief aus Diabas (Spitzhacke)", + "block.mineralogy.diabase_relief_plus": "Relief aus Diabas (Pluszeichen)", + "block.mineralogy.diabase_relief_right": "Relief aus Diabas (rechts)", + "block.mineralogy.diabase_relief_sword": "Relief aus Diabas (Schwert)", + "block.mineralogy.diabase_relief_vertical": "Relief aus Diabas (senkrecht)", + "block.mineralogy.gabbro_relief_axe": "Relief aus Gabbro (Axt)", + "block.mineralogy.gabbro_relief_blank": "Relief aus Gabbro (ohne Motiv)", + "block.mineralogy.gabbro_relief_cross": "Relief aus Gabbro (Kreuz)", + "block.mineralogy.gabbro_relief_hammer": "Relief aus Gabbro (Hammer)", + "block.mineralogy.gabbro_relief_hoe": "Relief aus Gabbro (Hacke)", + "block.mineralogy.gabbro_relief_horizontal": "Relief aus Gabbro (waagerecht)", + "block.mineralogy.gabbro_relief_i": "Relief aus Gabbro (I)", + "block.mineralogy.gabbro_relief_left": "Relief aus Gabbro (links)", + "block.mineralogy.gabbro_relief_pickaxe": "Relief aus Gabbro (Spitzhacke)", + "block.mineralogy.gabbro_relief_plus": "Relief aus Gabbro (Pluszeichen)", + "block.mineralogy.gabbro_relief_right": "Relief aus Gabbro (rechts)", + "block.mineralogy.gabbro_relief_sword": "Relief aus Gabbro (Schwert)", + "block.mineralogy.gabbro_relief_vertical": "Relief aus Gabbro (senkrecht)", + "block.mineralogy.peridotite_relief_axe": "Relief aus Peridotit (Axt)", + "block.mineralogy.peridotite_relief_blank": "Relief aus Peridotit (ohne Motiv)", + "block.mineralogy.peridotite_relief_cross": "Relief aus Peridotit (Kreuz)", + "block.mineralogy.peridotite_relief_hammer": "Relief aus Peridotit (Hammer)", + "block.mineralogy.peridotite_relief_hoe": "Relief aus Peridotit (Hacke)", + "block.mineralogy.peridotite_relief_horizontal": "Relief aus Peridotit (waagerecht)", + "block.mineralogy.peridotite_relief_i": "Relief aus Peridotit (I)", + "block.mineralogy.peridotite_relief_left": "Relief aus Peridotit (links)", + "block.mineralogy.peridotite_relief_pickaxe": "Relief aus Peridotit (Spitzhacke)", + "block.mineralogy.peridotite_relief_plus": "Relief aus Peridotit (Pluszeichen)", + "block.mineralogy.peridotite_relief_right": "Relief aus Peridotit (rechts)", + "block.mineralogy.peridotite_relief_sword": "Relief aus Peridotit (Schwert)", + "block.mineralogy.peridotite_relief_vertical": "Relief aus Peridotit (senkrecht)", + "block.mineralogy.basaltic_glass_relief_axe": "Relief aus Basaltglas (Axt)", + "block.mineralogy.basaltic_glass_relief_blank": "Relief aus Basaltglas (ohne Motiv)", + "block.mineralogy.basaltic_glass_relief_cross": "Relief aus Basaltglas (Kreuz)", + "block.mineralogy.basaltic_glass_relief_hammer": "Relief aus Basaltglas (Hammer)", + "block.mineralogy.basaltic_glass_relief_hoe": "Relief aus Basaltglas (Hacke)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Relief aus Basaltglas (waagerecht)", + "block.mineralogy.basaltic_glass_relief_i": "Relief aus Basaltglas (I)", + "block.mineralogy.basaltic_glass_relief_left": "Relief aus Basaltglas (links)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Relief aus Basaltglas (Spitzhacke)", + "block.mineralogy.basaltic_glass_relief_plus": "Relief aus Basaltglas (Pluszeichen)", + "block.mineralogy.basaltic_glass_relief_right": "Relief aus Basaltglas (rechts)", + "block.mineralogy.basaltic_glass_relief_sword": "Relief aus Basaltglas (Schwert)", + "block.mineralogy.basaltic_glass_relief_vertical": "Relief aus Basaltglas (senkrecht)", + "block.mineralogy.scoria_relief_axe": "Relief aus Skoria (Axt)", + "block.mineralogy.scoria_relief_blank": "Relief aus Skoria (ohne Motiv)", + "block.mineralogy.scoria_relief_cross": "Relief aus Skoria (Kreuz)", + "block.mineralogy.scoria_relief_hammer": "Relief aus Skoria (Hammer)", + "block.mineralogy.scoria_relief_hoe": "Relief aus Skoria (Hacke)", + "block.mineralogy.scoria_relief_horizontal": "Relief aus Skoria (waagerecht)", + "block.mineralogy.scoria_relief_i": "Relief aus Skoria (I)", + "block.mineralogy.scoria_relief_left": "Relief aus Skoria (links)", + "block.mineralogy.scoria_relief_pickaxe": "Relief aus Skoria (Spitzhacke)", + "block.mineralogy.scoria_relief_plus": "Relief aus Skoria (Pluszeichen)", + "block.mineralogy.scoria_relief_right": "Relief aus Skoria (rechts)", + "block.mineralogy.scoria_relief_sword": "Relief aus Skoria (Schwert)", + "block.mineralogy.scoria_relief_vertical": "Relief aus Skoria (senkrecht)", + "block.mineralogy.tuff_relief_axe": "Relief aus Tuffstein (Axt)", + "block.mineralogy.tuff_relief_blank": "Relief aus Tuffstein (ohne Motiv)", + "block.mineralogy.tuff_relief_cross": "Relief aus Tuffstein (Kreuz)", + "block.mineralogy.tuff_relief_hammer": "Relief aus Tuffstein (Hammer)", + "block.mineralogy.tuff_relief_hoe": "Relief aus Tuffstein (Hacke)", + "block.mineralogy.tuff_relief_horizontal": "Relief aus Tuffstein (waagerecht)", + "block.mineralogy.tuff_relief_i": "Relief aus Tuffstein (I)", + "block.mineralogy.tuff_relief_left": "Relief aus Tuffstein (links)", + "block.mineralogy.tuff_relief_pickaxe": "Relief aus Tuffstein (Spitzhacke)", + "block.mineralogy.tuff_relief_plus": "Relief aus Tuffstein (Pluszeichen)", + "block.mineralogy.tuff_relief_right": "Relief aus Tuffstein (rechts)", + "block.mineralogy.tuff_relief_sword": "Relief aus Tuffstein (Schwert)", + "block.mineralogy.tuff_relief_vertical": "Relief aus Tuffstein (senkrecht)", + "block.mineralogy.siltstone_relief_axe": "Relief aus Schluffstein (Axt)", + "block.mineralogy.siltstone_relief_blank": "Relief aus Schluffstein (ohne Motiv)", + "block.mineralogy.siltstone_relief_cross": "Relief aus Schluffstein (Kreuz)", + "block.mineralogy.siltstone_relief_hammer": "Relief aus Schluffstein (Hammer)", + "block.mineralogy.siltstone_relief_hoe": "Relief aus Schluffstein (Hacke)", + "block.mineralogy.siltstone_relief_horizontal": "Relief aus Schluffstein (waagerecht)", + "block.mineralogy.siltstone_relief_i": "Relief aus Schluffstein (I)", + "block.mineralogy.siltstone_relief_left": "Relief aus Schluffstein (links)", + "block.mineralogy.siltstone_relief_pickaxe": "Relief aus Schluffstein (Spitzhacke)", + "block.mineralogy.siltstone_relief_plus": "Relief aus Schluffstein (Pluszeichen)", + "block.mineralogy.siltstone_relief_right": "Relief aus Schluffstein (rechts)", + "block.mineralogy.siltstone_relief_sword": "Relief aus Schluffstein (Schwert)", + "block.mineralogy.siltstone_relief_vertical": "Relief aus Schluffstein (senkrecht)", + "block.mineralogy.rock_salt_relief_axe": "Relief aus Steinsalz (Axt)", + "block.mineralogy.rock_salt_relief_blank": "Relief aus Steinsalz (ohne Motiv)", + "block.mineralogy.rock_salt_relief_cross": "Relief aus Steinsalz (Kreuz)", + "block.mineralogy.rock_salt_relief_hammer": "Relief aus Steinsalz (Hammer)", + "block.mineralogy.rock_salt_relief_hoe": "Relief aus Steinsalz (Hacke)", + "block.mineralogy.rock_salt_relief_horizontal": "Relief aus Steinsalz (waagerecht)", + "block.mineralogy.rock_salt_relief_i": "Relief aus Steinsalz (I)", + "block.mineralogy.rock_salt_relief_left": "Relief aus Steinsalz (links)", + "block.mineralogy.rock_salt_relief_pickaxe": "Relief aus Steinsalz (Spitzhacke)", + "block.mineralogy.rock_salt_relief_plus": "Relief aus Steinsalz (Pluszeichen)", + "block.mineralogy.rock_salt_relief_right": "Relief aus Steinsalz (rechts)", + "block.mineralogy.rock_salt_relief_sword": "Relief aus Steinsalz (Schwert)", + "block.mineralogy.rock_salt_relief_vertical": "Relief aus Steinsalz (senkrecht)", + "block.mineralogy.hornfels_relief_axe": "Relief aus Hornfels (Axt)", + "block.mineralogy.hornfels_relief_blank": "Relief aus Hornfels (ohne Motiv)", + "block.mineralogy.hornfels_relief_cross": "Relief aus Hornfels (Kreuz)", + "block.mineralogy.hornfels_relief_hammer": "Relief aus Hornfels (Hammer)", + "block.mineralogy.hornfels_relief_hoe": "Relief aus Hornfels (Hacke)", + "block.mineralogy.hornfels_relief_horizontal": "Relief aus Hornfels (waagerecht)", + "block.mineralogy.hornfels_relief_i": "Relief aus Hornfels (I)", + "block.mineralogy.hornfels_relief_left": "Relief aus Hornfels (links)", + "block.mineralogy.hornfels_relief_pickaxe": "Relief aus Hornfels (Spitzhacke)", + "block.mineralogy.hornfels_relief_plus": "Relief aus Hornfels (Pluszeichen)", + "block.mineralogy.hornfels_relief_right": "Relief aus Hornfels (rechts)", + "block.mineralogy.hornfels_relief_sword": "Relief aus Hornfels (Schwert)", + "block.mineralogy.hornfels_relief_vertical": "Relief aus Hornfels (senkrecht)", + "block.mineralogy.quartzite_relief_axe": "Relief aus Quarzit (Axt)", + "block.mineralogy.quartzite_relief_blank": "Relief aus Quarzit (ohne Motiv)", + "block.mineralogy.quartzite_relief_cross": "Relief aus Quarzit (Kreuz)", + "block.mineralogy.quartzite_relief_hammer": "Relief aus Quarzit (Hammer)", + "block.mineralogy.quartzite_relief_hoe": "Relief aus Quarzit (Hacke)", + "block.mineralogy.quartzite_relief_horizontal": "Relief aus Quarzit (waagerecht)", + "block.mineralogy.quartzite_relief_i": "Relief aus Quarzit (I)", + "block.mineralogy.quartzite_relief_left": "Relief aus Quarzit (links)", + "block.mineralogy.quartzite_relief_pickaxe": "Relief aus Quarzit (Spitzhacke)", + "block.mineralogy.quartzite_relief_plus": "Relief aus Quarzit (Pluszeichen)", + "block.mineralogy.quartzite_relief_right": "Relief aus Quarzit (rechts)", + "block.mineralogy.quartzite_relief_sword": "Relief aus Quarzit (Schwert)", + "block.mineralogy.quartzite_relief_vertical": "Relief aus Quarzit (senkrecht)", + "block.mineralogy.novaculite_relief_axe": "Relief aus Novakulit (Axt)", + "block.mineralogy.novaculite_relief_blank": "Relief aus Novakulit (ohne Motiv)", + "block.mineralogy.novaculite_relief_cross": "Relief aus Novakulit (Kreuz)", + "block.mineralogy.novaculite_relief_hammer": "Relief aus Novakulit (Hammer)", + "block.mineralogy.novaculite_relief_hoe": "Relief aus Novakulit (Hacke)", + "block.mineralogy.novaculite_relief_horizontal": "Relief aus Novakulit (waagerecht)", + "block.mineralogy.novaculite_relief_i": "Relief aus Novakulit (I)", + "block.mineralogy.novaculite_relief_left": "Relief aus Novakulit (links)", + "block.mineralogy.novaculite_relief_pickaxe": "Relief aus Novakulit (Spitzhacke)", + "block.mineralogy.novaculite_relief_plus": "Relief aus Novakulit (Pluszeichen)", + "block.mineralogy.novaculite_relief_right": "Relief aus Novakulit (rechts)", + "block.mineralogy.novaculite_relief_sword": "Relief aus Novakulit (Schwert)", + "block.mineralogy.novaculite_relief_vertical": "Relief aus Novakulit (senkrecht)", + "itemGroup.mineralogy.mineralogy": "Mineralogie", + "itemGroup.mineralogy.rock": "Mineralogische Gesteine", + "itemGroup.mineralogy.stair": "Mineralogie-Treppen", + "itemGroup.mineralogy.slab": "Mineralogie-Stufen", + "itemGroup.mineralogy.wall": "Mineralogie-Mauern", + "itemGroup.mineralogy.item": "Mineralogie-Gegenstände", + "block.mineralogy.crude_oil": "Rohöl", + "item.mineralogy.crude_oil_bucket": "Rohöleimer", + "fluid.mineralogy.crude_oil": "Rohöl", + "advancements.mineralogy.all_the_rocks.title": "Alle Gesteine", + "advancements.mineralogy.all_the_rocks.description": "Du hast alle Standardgesteine in Mineralogy gefunden!" } diff --git a/src/main/resources/assets/mineralogy/lang/en_ca.json b/src/main/resources/assets/mineralogy/lang/en_ca.json index 9da5d20a2..81ad1b683 100644 --- a/src/main/resources/assets/mineralogy/lang/en_ca.json +++ b/src/main/resources/assets/mineralogy/lang/en_ca.json @@ -926,7 +926,15 @@ "block.mineralogy.novaculite_relief_right": "Novaculite Right Relief", "block.mineralogy.novaculite_relief_sword": "Novaculite Sword Relief", "block.mineralogy.novaculite_relief_vertical": "Novaculite Vertical Relief", + "itemGroup.mineralogy.mineralogy": "Mineralogy", + "itemGroup.mineralogy.rock": "Mineralogy Rocks", + "itemGroup.mineralogy.stair": "Mineralogy Stairs", + "itemGroup.mineralogy.slab": "Mineralogy Slabs", + "itemGroup.mineralogy.wall": "Mineralogy Walls", + "itemGroup.mineralogy.item": "Mineralogy Items", + "block.mineralogy.crude_oil": "Crude Oil", + "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", + "fluid.mineralogy.crude_oil": "Crude Oil", "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", - "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!", - "itemGroup.mineralogy.mineralogy": "Mineralogy" + "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/en_en.json b/src/main/resources/assets/mineralogy/lang/en_en.json index 9da5d20a2..81ad1b683 100644 --- a/src/main/resources/assets/mineralogy/lang/en_en.json +++ b/src/main/resources/assets/mineralogy/lang/en_en.json @@ -926,7 +926,15 @@ "block.mineralogy.novaculite_relief_right": "Novaculite Right Relief", "block.mineralogy.novaculite_relief_sword": "Novaculite Sword Relief", "block.mineralogy.novaculite_relief_vertical": "Novaculite Vertical Relief", + "itemGroup.mineralogy.mineralogy": "Mineralogy", + "itemGroup.mineralogy.rock": "Mineralogy Rocks", + "itemGroup.mineralogy.stair": "Mineralogy Stairs", + "itemGroup.mineralogy.slab": "Mineralogy Slabs", + "itemGroup.mineralogy.wall": "Mineralogy Walls", + "itemGroup.mineralogy.item": "Mineralogy Items", + "block.mineralogy.crude_oil": "Crude Oil", + "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", + "fluid.mineralogy.crude_oil": "Crude Oil", "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", - "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!", - "itemGroup.mineralogy.mineralogy": "Mineralogy" + "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/en_gb.json b/src/main/resources/assets/mineralogy/lang/en_gb.json index 9da5d20a2..81ad1b683 100644 --- a/src/main/resources/assets/mineralogy/lang/en_gb.json +++ b/src/main/resources/assets/mineralogy/lang/en_gb.json @@ -926,7 +926,15 @@ "block.mineralogy.novaculite_relief_right": "Novaculite Right Relief", "block.mineralogy.novaculite_relief_sword": "Novaculite Sword Relief", "block.mineralogy.novaculite_relief_vertical": "Novaculite Vertical Relief", + "itemGroup.mineralogy.mineralogy": "Mineralogy", + "itemGroup.mineralogy.rock": "Mineralogy Rocks", + "itemGroup.mineralogy.stair": "Mineralogy Stairs", + "itemGroup.mineralogy.slab": "Mineralogy Slabs", + "itemGroup.mineralogy.wall": "Mineralogy Walls", + "itemGroup.mineralogy.item": "Mineralogy Items", + "block.mineralogy.crude_oil": "Crude Oil", + "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", + "fluid.mineralogy.crude_oil": "Crude Oil", "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", - "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!", - "itemGroup.mineralogy.mineralogy": "Mineralogy" + "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/en_pt.json b/src/main/resources/assets/mineralogy/lang/en_pt.json index 9da5d20a2..81ad1b683 100644 --- a/src/main/resources/assets/mineralogy/lang/en_pt.json +++ b/src/main/resources/assets/mineralogy/lang/en_pt.json @@ -926,7 +926,15 @@ "block.mineralogy.novaculite_relief_right": "Novaculite Right Relief", "block.mineralogy.novaculite_relief_sword": "Novaculite Sword Relief", "block.mineralogy.novaculite_relief_vertical": "Novaculite Vertical Relief", + "itemGroup.mineralogy.mineralogy": "Mineralogy", + "itemGroup.mineralogy.rock": "Mineralogy Rocks", + "itemGroup.mineralogy.stair": "Mineralogy Stairs", + "itemGroup.mineralogy.slab": "Mineralogy Slabs", + "itemGroup.mineralogy.wall": "Mineralogy Walls", + "itemGroup.mineralogy.item": "Mineralogy Items", + "block.mineralogy.crude_oil": "Crude Oil", + "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", + "fluid.mineralogy.crude_oil": "Crude Oil", "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", - "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!", - "itemGroup.mineralogy.mineralogy": "Mineralogy" + "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/en_us.json b/src/main/resources/assets/mineralogy/lang/en_us.json index e6ba1fcf0..81ad1b683 100644 --- a/src/main/resources/assets/mineralogy/lang/en_us.json +++ b/src/main/resources/assets/mineralogy/lang/en_us.json @@ -926,12 +926,15 @@ "block.mineralogy.novaculite_relief_right": "Novaculite Right Relief", "block.mineralogy.novaculite_relief_sword": "Novaculite Sword Relief", "block.mineralogy.novaculite_relief_vertical": "Novaculite Vertical Relief", - "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", - "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!", "itemGroup.mineralogy.mineralogy": "Mineralogy", "itemGroup.mineralogy.rock": "Mineralogy Rocks", "itemGroup.mineralogy.stair": "Mineralogy Stairs", "itemGroup.mineralogy.slab": "Mineralogy Slabs", "itemGroup.mineralogy.wall": "Mineralogy Walls", - "itemGroup.mineralogy.item": "Mineralogy Items" + "itemGroup.mineralogy.item": "Mineralogy Items", + "block.mineralogy.crude_oil": "Crude Oil", + "item.mineralogy.crude_oil_bucket": "Crude Oil Bucket", + "fluid.mineralogy.crude_oil": "Crude Oil", + "advancements.mineralogy.all_the_rocks.title": "Call the rocks Ludo!", + "advancements.mineralogy.all_the_rocks.description": "Wow, you've found all the standard rock types in Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/es_es.json b/src/main/resources/assets/mineralogy/lang/es_es.json index 84e335cd5..5738497f7 100644 --- a/src/main/resources/assets/mineralogy/lang/es_es.json +++ b/src/main/resources/assets/mineralogy/lang/es_es.json @@ -2,929 +2,939 @@ "block.mineralogy.andesite": "Andesita", "block.mineralogy.andesite_stairs": "Escaleras de Andesita", "block.mineralogy.andesite_slab": "Losa de Andesita", - "block.mineralogy.andesite_brick": "Ladrillo de Andesita", - "block.mineralogy.andesite_brick_stairs": "Escaleras de ladrillo Andesita", - "block.mineralogy.andesite_brick_slab": "Losa de ladrillo andesita", - "block.mineralogy.andesite_smooth": "Andesita Pulida", - "block.mineralogy.andesite_smooth_stairs": "Escalera de andesita pulida", + "block.mineralogy.andesite_brick": "Ladrillos de Andesita", + "block.mineralogy.andesite_brick_stairs": "Escaleras de ladrillos de Andesita", + "block.mineralogy.andesite_brick_slab": "Losa de ladrillos de Andesita", + "block.mineralogy.andesite_smooth": "Bloque pulido de Andesita", + "block.mineralogy.andesite_smooth_stairs": "Escaleras pulidas de Andesita", "block.mineralogy.andesite_smooth_slab": "Losa pulida de Andesita", - "block.mineralogy.andesite_smooth_brick": "Ladrillo de andesita pulido", - "block.mineralogy.andesite_smooth_brick_stairs": "Escalera de ladrillo anodizado pulido", - "block.mineralogy.andesite_smooth_brick_slab": "Losa de ladrillo anodizado pulido", + "block.mineralogy.andesite_smooth_brick": "Ladrillos pulidos de Andesita", + "block.mineralogy.andesite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Andesita", + "block.mineralogy.andesite_smooth_brick_slab": "Losa de ladrillos pulidos de Andesita", "block.mineralogy.basalt": "Basalto", - "block.mineralogy.basalt_stairs": "Escaleras de basalto", - "block.mineralogy.basalt_slab": "Losa de basalto", - "block.mineralogy.basalt_brick": "Ladrillo de basalto", - "block.mineralogy.basalt_brick_stairs": "Escaleras de ladrillo de basalto", - "block.mineralogy.basalt_brick_slab": "Losa de ladrillo de basalto", - "block.mineralogy.basalt_smooth": "Basalto pulido", - "block.mineralogy.basalt_smooth_stairs": "Escaleras de basalto pulido", - "block.mineralogy.basalt_smooth_slab": "Losa de basalto pulida", - "block.mineralogy.basalt_smooth_brick": "Ladrillo de basalto pulido", - "block.mineralogy.basalt_smooth_brick_stairs": "Escaleras de ladrillo de basalto pulido", - "block.mineralogy.basalt_smooth_brick_slab": "Losa de ladrillo pulido de basalto", + "block.mineralogy.basalt_stairs": "Escaleras de Basalto", + "block.mineralogy.basalt_slab": "Losa de Basalto", + "block.mineralogy.basalt_brick": "Ladrillos de Basalto", + "block.mineralogy.basalt_brick_stairs": "Escaleras de ladrillos de Basalto", + "block.mineralogy.basalt_brick_slab": "Losa de ladrillos de Basalto", + "block.mineralogy.basalt_smooth": "Bloque pulido de Basalto", + "block.mineralogy.basalt_smooth_stairs": "Escaleras pulidas de Basalto", + "block.mineralogy.basalt_smooth_slab": "Losa pulida de Basalto", + "block.mineralogy.basalt_smooth_brick": "Ladrillos pulidos de Basalto", + "block.mineralogy.basalt_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Basalto", + "block.mineralogy.basalt_smooth_brick_slab": "Losa de ladrillos pulidos de Basalto", "block.mineralogy.diorite": "Diorita", "block.mineralogy.diorite_stairs": "Escaleras de Diorita", "block.mineralogy.diorite_slab": "Losa de Diorita", - "block.mineralogy.diorite_brick": "Ladrillo de Diorita", - "block.mineralogy.diorite_brick_stairs": "Escaleras de ladrillo de Diorita", - "block.mineralogy.diorite_brick_slab": "Losa de ladrillo de Diorita", - "block.mineralogy.diorite_smooth": "Diorita pulida", - "block.mineralogy.diorite_smooth_stairs": "Escaleras de Diorita pulida", - "block.mineralogy.diorite_smooth_slab": "Losa de Diorita pulida", - "block.mineralogy.diorite_smooth_brick": "Ladrillo de Diorita pulido", - "block.mineralogy.diorite_smooth_brick_stairs": "Escaleras de ladrillo de Diorita pulida", - "block.mineralogy.diorite_smooth_brick_slab": "Losa de ladrillo de Diorita pulida", + "block.mineralogy.diorite_brick": "Ladrillos de Diorita", + "block.mineralogy.diorite_brick_stairs": "Escaleras de ladrillos de Diorita", + "block.mineralogy.diorite_brick_slab": "Losa de ladrillos de Diorita", + "block.mineralogy.diorite_smooth": "Bloque pulido de Diorita", + "block.mineralogy.diorite_smooth_stairs": "Escaleras pulidas de Diorita", + "block.mineralogy.diorite_smooth_slab": "Losa pulida de Diorita", + "block.mineralogy.diorite_smooth_brick": "Ladrillos pulidos de Diorita", + "block.mineralogy.diorite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Diorita", + "block.mineralogy.diorite_smooth_brick_slab": "Losa de ladrillos pulidos de Diorita", "block.mineralogy.granite": "Granito", "block.mineralogy.granite_stairs": "Escaleras de Granito", "block.mineralogy.granite_slab": "Losa de Granito", - "block.mineralogy.granite_brick": "Ladrillo de Granito", - "block.mineralogy.granite_brick_stairs": "Escaleras de ladrillo de Granito", - "block.mineralogy.granite_brick_slab": "Losa de ladrillo de Granito", - "block.mineralogy.granite_smooth": "Granito pulida", - "block.mineralogy.granite_smooth_stairs": "Escaleras de Granito pulida", - "block.mineralogy.granite_smooth_slab": "Losa de Granito pulida", - "block.mineralogy.granite_smooth_brick": "Ladrillo de Granito pulido", - "block.mineralogy.granite_smooth_brick_stairs": "Escaleras de ladrillo de Granito pulida", - "block.mineralogy.granite_smooth_brick_slab": "Losa de ladrillo de Granito pulida", + "block.mineralogy.granite_brick": "Ladrillos de Granito", + "block.mineralogy.granite_brick_stairs": "Escaleras de ladrillos de Granito", + "block.mineralogy.granite_brick_slab": "Losa de ladrillos de Granito", + "block.mineralogy.granite_smooth": "Bloque pulido de Granito", + "block.mineralogy.granite_smooth_stairs": "Escaleras pulidas de Granito", + "block.mineralogy.granite_smooth_slab": "Losa pulida de Granito", + "block.mineralogy.granite_smooth_brick": "Ladrillos pulidos de Granito", + "block.mineralogy.granite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Granito", + "block.mineralogy.granite_smooth_brick_slab": "Losa de ladrillos pulidos de Granito", "block.mineralogy.rhyolite": "Riolita", "block.mineralogy.rhyolite_stairs": "Escaleras de Riolita", "block.mineralogy.rhyolite_slab": "Losa de Riolita", - "block.mineralogy.rhyolite_brick": "Ladrillo de Riolita", - "block.mineralogy.rhyolite_brick_stairs": "Escaleras de ladrillo de Riolita", - "block.mineralogy.rhyolite_brick_slab": "Losa de ladrillo de Riolita", - "block.mineralogy.rhyolite_smooth": "Riolita pulida", - "block.mineralogy.rhyolite_smooth_stairs": "Escaleras de Riolita pulida", - "block.mineralogy.rhyolite_smooth_slab": "Losa de Riolita pulida", - "block.mineralogy.rhyolite_smooth_brick": "Ladrillo de Riolita pulido", - "block.mineralogy.rhyolite_smooth_brick_stairs": "Escaleras de ladrillo de Riolita pulida", - "block.mineralogy.rhyolite_smooth_brick_slab": "Losa de ladrillo de Riolita pulida", + "block.mineralogy.rhyolite_brick": "Ladrillos de Riolita", + "block.mineralogy.rhyolite_brick_stairs": "Escaleras de ladrillos de Riolita", + "block.mineralogy.rhyolite_brick_slab": "Losa de ladrillos de Riolita", + "block.mineralogy.rhyolite_smooth": "Bloque pulido de Riolita", + "block.mineralogy.rhyolite_smooth_stairs": "Escaleras pulidas de Riolita", + "block.mineralogy.rhyolite_smooth_slab": "Losa pulida de Riolita", + "block.mineralogy.rhyolite_smooth_brick": "Ladrillos pulidos de Riolita", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Riolita", + "block.mineralogy.rhyolite_smooth_brick_slab": "Losa de ladrillos pulidos de Riolita", "block.mineralogy.pegmatite": "Pegmatita", "block.mineralogy.pegmatite_stairs": "Escaleras de Pegmatita", "block.mineralogy.pegmatite_slab": "Losa de Pegmatita", - "block.mineralogy.pegmatite_brick": "Ladrillo de Pegmatita", - "block.mineralogy.pegmatite_brick_stairs": "Escaleras de ladrillo de Pegmatita", - "block.mineralogy.pegmatite_brick_slab": "Losa de ladrillo de Pegmatita", - "block.mineralogy.pegmatite_smooth": "Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_stairs": "Escaleras de Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_slab": "Losa de Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_brick": "Ladrillo de Pegmatita pulido", - "block.mineralogy.pegmatite_smooth_brick_stairs": "Escaleras de ladrillo de Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_brick_slab": "Losa de ladrillo de Pegmatita pulida", - "block.mineralogy.shale": "Esquisto", - "block.mineralogy.shale_stairs": "Escaleras de Esquisto", - "block.mineralogy.shale_slab": "Losa de Esquisto", - "block.mineralogy.shale_brick": "Ladrillo de Esquisto", - "block.mineralogy.shale_brick_stairs": "Escaleras de ladrillo de Esquisto", - "block.mineralogy.shale_brick_slab": "Losa de ladrillo de Esquisto", - "block.mineralogy.shale_smooth": "Esquisto pulida", - "block.mineralogy.shale_smooth_stairs": "Escaleras de Esquisto pulida", - "block.mineralogy.shale_smooth_slab": "Losa de Esquisto pulida", - "block.mineralogy.shale_smooth_brick": "Ladrillo de Esquisto pulido", - "block.mineralogy.shale_smooth_brick_stairs": "Escaleras de ladrillo de Esquisto pulida", - "block.mineralogy.shale_smooth_brick_slab": "Losa de ladrillo de Esquisto pulida", + "block.mineralogy.pegmatite_brick": "Ladrillos de Pegmatita", + "block.mineralogy.pegmatite_brick_stairs": "Escaleras de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_brick_slab": "Losa de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_smooth": "Bloque pulido de Pegmatita", + "block.mineralogy.pegmatite_smooth_stairs": "Escaleras pulidas de Pegmatita", + "block.mineralogy.pegmatite_smooth_slab": "Losa pulida de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick": "Ladrillos pulidos de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_slab": "Losa de ladrillos pulidos de Pegmatita", + "block.mineralogy.shale": "Lutita", + "block.mineralogy.shale_stairs": "Escaleras de Lutita", + "block.mineralogy.shale_slab": "Losa de Lutita", + "block.mineralogy.shale_brick": "Ladrillos de Lutita", + "block.mineralogy.shale_brick_stairs": "Escaleras de ladrillos de Lutita", + "block.mineralogy.shale_brick_slab": "Losa de ladrillos de Lutita", + "block.mineralogy.shale_smooth": "Bloque pulido de Lutita", + "block.mineralogy.shale_smooth_stairs": "Escaleras pulidas de Lutita", + "block.mineralogy.shale_smooth_slab": "Losa pulida de Lutita", + "block.mineralogy.shale_smooth_brick": "Ladrillos pulidos de Lutita", + "block.mineralogy.shale_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Lutita", + "block.mineralogy.shale_smooth_brick_slab": "Losa de ladrillos pulidos de Lutita", "block.mineralogy.conglomerate": "Conglomerado", "block.mineralogy.conglomerate_stairs": "Escaleras de Conglomerado", "block.mineralogy.conglomerate_slab": "Losa de Conglomerado", - "block.mineralogy.conglomerate_brick": "Ladrillo de Conglomerado", - "block.mineralogy.conglomerate_brick_stairs": "Escaleras de ladrillo de Conglomerado", - "block.mineralogy.conglomerate_brick_slab": "Losa de ladrillo de Conglomerado", - "block.mineralogy.conglomerate_smooth": "Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_stairs": "Escaleras de Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_slab": "Losa de Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_brick": "Ladrillo de Conglomerado pulido", - "block.mineralogy.conglomerate_smooth_brick_stairs": "Escaleras de ladrillo de Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_brick_slab": "Losa de ladrillo de Conglomerado pulida", + "block.mineralogy.conglomerate_brick": "Ladrillos de Conglomerado", + "block.mineralogy.conglomerate_brick_stairs": "Escaleras de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_brick_slab": "Losa de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_smooth": "Bloque pulido de Conglomerado", + "block.mineralogy.conglomerate_smooth_stairs": "Escaleras pulidas de Conglomerado", + "block.mineralogy.conglomerate_smooth_slab": "Losa pulida de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick": "Ladrillos pulidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_slab": "Losa de ladrillos pulidos de Conglomerado", "block.mineralogy.dolomite": "Dolomita", "block.mineralogy.dolomite_stairs": "Escaleras de Dolomita", "block.mineralogy.dolomite_slab": "Losa de Dolomita", - "block.mineralogy.dolomite_brick": "Ladrillo de Dolomita", - "block.mineralogy.dolomite_brick_stairs": "Escaleras de ladrillo de Dolomita", - "block.mineralogy.dolomite_brick_slab": "Losa de ladrillo de Dolomita", - "block.mineralogy.dolomite_smooth": "Dolomita pulida", - "block.mineralogy.dolomite_smooth_stairs": "Escaleras de Dolomita pulida", - "block.mineralogy.dolomite_smooth_slab": "Losa de Dolomita pulida", - "block.mineralogy.dolomite_smooth_brick": "Ladrillo de Dolomita pulido", - "block.mineralogy.dolomite_smooth_brick_stairs": "Escaleras de ladrillo de Dolomita pulida", - "block.mineralogy.dolomite_smooth_brick_slab": "Losa de ladrillo de Dolomita pulida", + "block.mineralogy.dolomite_brick": "Ladrillos de Dolomita", + "block.mineralogy.dolomite_brick_stairs": "Escaleras de ladrillos de Dolomita", + "block.mineralogy.dolomite_brick_slab": "Losa de ladrillos de Dolomita", + "block.mineralogy.dolomite_smooth": "Bloque pulido de Dolomita", + "block.mineralogy.dolomite_smooth_stairs": "Escaleras pulidas de Dolomita", + "block.mineralogy.dolomite_smooth_slab": "Losa pulida de Dolomita", + "block.mineralogy.dolomite_smooth_brick": "Ladrillos pulidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_slab": "Losa de ladrillos pulidos de Dolomita", "block.mineralogy.limestone": "Caliza", "block.mineralogy.limestone_stairs": "Escaleras de Caliza", "block.mineralogy.limestone_slab": "Losa de Caliza", - "block.mineralogy.limestone_brick": "Ladrillo de Caliza", - "block.mineralogy.limestone_brick_stairs": "Escaleras de ladrillo de Caliza", - "block.mineralogy.limestone_brick_slab": "Losa de ladrillo de Caliza", - "block.mineralogy.limestone_smooth": "Caliza pulida", - "block.mineralogy.limestone_smooth_stairs": "Escaleras de Caliza pulida", - "block.mineralogy.limestone_smooth_slab": "Losa de Caliza pulida", - "block.mineralogy.limestone_smooth_brick": "Ladrillo de Caliza pulido", - "block.mineralogy.limestone_smooth_brick_stairs": "Escaleras de ladrillo de Caliza pulida", - "block.mineralogy.limestone_smooth_brick_slab": "Losa de ladrillo de Caliza pulida", + "block.mineralogy.limestone_brick": "Ladrillos de Caliza", + "block.mineralogy.limestone_brick_stairs": "Escaleras de ladrillos de Caliza", + "block.mineralogy.limestone_brick_slab": "Losa de ladrillos de Caliza", + "block.mineralogy.limestone_smooth": "Bloque pulido de Caliza", + "block.mineralogy.limestone_smooth_stairs": "Escaleras pulidas de Caliza", + "block.mineralogy.limestone_smooth_slab": "Losa pulida de Caliza", + "block.mineralogy.limestone_smooth_brick": "Ladrillos pulidos de Caliza", + "block.mineralogy.limestone_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Caliza", + "block.mineralogy.limestone_smooth_brick_slab": "Losa de ladrillos pulidos de Caliza", "block.mineralogy.slate": "Pizarra", "block.mineralogy.slate_stairs": "Escaleras de Pizarra", "block.mineralogy.slate_slab": "Losa de Pizarra", - "block.mineralogy.slate_brick": "Ladrillo de Pizarra", - "block.mineralogy.slate_brick_stairs": "Escaleras de ladrillo de Pizarra", - "block.mineralogy.slate_brick_slab": "Losa de ladrillo de Pizarra", - "block.mineralogy.slate_smooth": "Pizarra pulida", - "block.mineralogy.slate_smooth_stairs": "Escaleras de Pizarra pulida", - "block.mineralogy.slate_smooth_slab": "Losa de Pizarra pulida", - "block.mineralogy.slate_smooth_brick": "Ladrillo de Pizarra pulido", - "block.mineralogy.slate_smooth_brick_stairs": "Escaleras de ladrillo de Pizarra pulida", - "block.mineralogy.slate_smooth_brick_slab": "Losa de ladrillo de Pizarra pulida", + "block.mineralogy.slate_brick": "Ladrillos de Pizarra", + "block.mineralogy.slate_brick_stairs": "Escaleras de ladrillos de Pizarra", + "block.mineralogy.slate_brick_slab": "Losa de ladrillos de Pizarra", + "block.mineralogy.slate_smooth": "Bloque pulido de Pizarra", + "block.mineralogy.slate_smooth_stairs": "Escaleras pulidas de Pizarra", + "block.mineralogy.slate_smooth_slab": "Losa pulida de Pizarra", + "block.mineralogy.slate_smooth_brick": "Ladrillos pulidos de Pizarra", + "block.mineralogy.slate_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Pizarra", + "block.mineralogy.slate_smooth_brick_slab": "Losa de ladrillos pulidos de Pizarra", "block.mineralogy.schist": "Esquisto", "block.mineralogy.schist_stairs": "Escaleras de Esquisto", "block.mineralogy.schist_slab": "Losa de Esquisto", - "block.mineralogy.schist_brick": "Ladrillo de Esquisto", - "block.mineralogy.schist_brick_stairs": "Escaleras de ladrillo de Esquisto", - "block.mineralogy.schist_brick_slab": "Losa de ladrillo de Esquisto", - "block.mineralogy.schist_smooth": "Esquisto pulida", - "block.mineralogy.schist_smooth_stairs": "Escaleras de Esquisto pulida", - "block.mineralogy.schist_smooth_slab": "Losa de Esquisto pulida", - "block.mineralogy.schist_smooth_brick": "Ladrillo de Esquisto pulido", - "block.mineralogy.schist_smooth_brick_stairs": "Escaleras de ladrillo de Esquisto pulida", - "block.mineralogy.schist_smooth_brick_slab": "Losa de ladrillo de Esquisto pulida", + "block.mineralogy.schist_brick": "Ladrillos de Esquisto", + "block.mineralogy.schist_brick_stairs": "Escaleras de ladrillos de Esquisto", + "block.mineralogy.schist_brick_slab": "Losa de ladrillos de Esquisto", + "block.mineralogy.schist_smooth": "Bloque pulido de Esquisto", + "block.mineralogy.schist_smooth_stairs": "Escaleras pulidas de Esquisto", + "block.mineralogy.schist_smooth_slab": "Losa pulida de Esquisto", + "block.mineralogy.schist_smooth_brick": "Ladrillos pulidos de Esquisto", + "block.mineralogy.schist_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Esquisto", + "block.mineralogy.schist_smooth_brick_slab": "Losa de ladrillos pulidos de Esquisto", "block.mineralogy.gneiss": "Gneis", "block.mineralogy.gneiss_stairs": "Escaleras de Gneis", "block.mineralogy.gneiss_slab": "Losa de Gneis", - "block.mineralogy.gneiss_brick": "Ladrillo de Gneis", - "block.mineralogy.gneiss_brick_stairs": "Escaleras de ladrillo de Gneis", - "block.mineralogy.gneiss_brick_slab": "Losa de ladrillo de Gneis", - "block.mineralogy.gneiss_smooth": "Gneis pulida", - "block.mineralogy.gneiss_smooth_stairs": "Escaleras de Gneis pulida", - "block.mineralogy.gneiss_smooth_slab": "Losa de Gneis pulida", - "block.mineralogy.gneiss_smooth_brick": "Ladrillo de Gneis pulido", - "block.mineralogy.gneiss_smooth_brick_stairs": "Escaleras de ladrillo de Gneis pulida", - "block.mineralogy.gneiss_smooth_brick_slab": "Losa de ladrillo de Gneis pulida", + "block.mineralogy.gneiss_brick": "Ladrillos de Gneis", + "block.mineralogy.gneiss_brick_stairs": "Escaleras de ladrillos de Gneis", + "block.mineralogy.gneiss_brick_slab": "Losa de ladrillos de Gneis", + "block.mineralogy.gneiss_smooth": "Bloque pulido de Gneis", + "block.mineralogy.gneiss_smooth_stairs": "Escaleras pulidas de Gneis", + "block.mineralogy.gneiss_smooth_slab": "Losa pulida de Gneis", + "block.mineralogy.gneiss_smooth_brick": "Ladrillos pulidos de Gneis", + "block.mineralogy.gneiss_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Gneis", + "block.mineralogy.gneiss_smooth_brick_slab": "Losa de ladrillos pulidos de Gneis", "block.mineralogy.marble": "Mármol", "block.mineralogy.marble_stairs": "Escaleras de Mármol", "block.mineralogy.marble_slab": "Losa de Mármol", - "block.mineralogy.marble_brick": "Ladrillo de Mármol", - "block.mineralogy.marble_brick_stairs": "Escaleras de ladrillo de Mármol", - "block.mineralogy.marble_brick_slab": "Losa de ladrillo de Mármol", - "block.mineralogy.marble_smooth": "Mármol pulida", - "block.mineralogy.marble_smooth_stairs": "Escaleras de Mármol pulida", - "block.mineralogy.marble_smooth_slab": "Losa de Mármol pulida", - "block.mineralogy.marble_smooth_brick": "Ladrillo de Mármol pulido", - "block.mineralogy.marble_smooth_brick_stairs": "Escaleras de ladrillo de Mármol pulida", - "block.mineralogy.marble_smooth_brick_slab": "Losa de ladrillo de Mármol pulida", - "block.mineralogy.phyllite": "Phyllite", - "block.mineralogy.phyllite_stairs": "Escaleras de Phyllite", - "block.mineralogy.phyllite_slab": "Losa de Phyllite", - "block.mineralogy.phyllite_brick": "Ladrillo de Phyllite", - "block.mineralogy.phyllite_brick_stairs": "Escaleras de ladrillo de Phyllite", - "block.mineralogy.phyllite_brick_slab": "Losa de ladrillo de Phyllite", - "block.mineralogy.phyllite_smooth": "Phyllite pulida", - "block.mineralogy.phyllite_smooth_stairs": "Escaleras de Phyllite pulida", - "block.mineralogy.phyllite_smooth_slab": "Losa de Phyllite pulida", - "block.mineralogy.phyllite_smooth_brick": "Ladrillo de Phyllite pulido", - "block.mineralogy.phyllite_smooth_brick_stairs": "Escaleras de ladrillo de Phyllite pulida", - "block.mineralogy.phyllite_smooth_brick_slab": "Losa de ladrillo de Phyllite pulida", - "block.mineralogy.amphibolite": "Amphibolita", - "block.mineralogy.amphibolite_stairs": "Escaleras de Amphibolita", - "block.mineralogy.amphibolite_slab": "Losa de Amphibolita", - "block.mineralogy.amphibolite_brick": "Ladrillo de Amphibolita", - "block.mineralogy.amphibolite_brick_stairs": "Escaleras de ladrillo de Amphibolita", - "block.mineralogy.amphibolite_brick_slab": "Losa de ladrillo de Amphibolita", - "block.mineralogy.amphibolite_smooth": "Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_stairs": "Escaleras de Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_slab": "Losa de Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_brick": "Ladrillo de Amphibolita pulido", - "block.mineralogy.amphibolite_smooth_brick_stairs": "Escaleras de ladrillo de Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_brick_slab": "Losa de ladrillo de Amphibolita pulida", + "block.mineralogy.marble_brick": "Ladrillos de Mármol", + "block.mineralogy.marble_brick_stairs": "Escaleras de ladrillos de Mármol", + "block.mineralogy.marble_brick_slab": "Losa de ladrillos de Mármol", + "block.mineralogy.marble_smooth": "Bloque pulido de Mármol", + "block.mineralogy.marble_smooth_stairs": "Escaleras pulidas de Mármol", + "block.mineralogy.marble_smooth_slab": "Losa pulida de Mármol", + "block.mineralogy.marble_smooth_brick": "Ladrillos pulidos de Mármol", + "block.mineralogy.marble_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Mármol", + "block.mineralogy.marble_smooth_brick_slab": "Losa de ladrillos pulidos de Mármol", + "block.mineralogy.phyllite": "Filita", + "block.mineralogy.phyllite_stairs": "Escaleras de Filita", + "block.mineralogy.phyllite_slab": "Losa de Filita", + "block.mineralogy.phyllite_brick": "Ladrillos de Filita", + "block.mineralogy.phyllite_brick_stairs": "Escaleras de ladrillos de Filita", + "block.mineralogy.phyllite_brick_slab": "Losa de ladrillos de Filita", + "block.mineralogy.phyllite_smooth": "Bloque pulido de Filita", + "block.mineralogy.phyllite_smooth_stairs": "Escaleras pulidas de Filita", + "block.mineralogy.phyllite_smooth_slab": "Losa pulida de Filita", + "block.mineralogy.phyllite_smooth_brick": "Ladrillos pulidos de Filita", + "block.mineralogy.phyllite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Filita", + "block.mineralogy.phyllite_smooth_brick_slab": "Losa de ladrillos pulidos de Filita", + "block.mineralogy.amphibolite": "Anfibolita", + "block.mineralogy.amphibolite_stairs": "Escaleras de Anfibolita", + "block.mineralogy.amphibolite_slab": "Losa de Anfibolita", + "block.mineralogy.amphibolite_brick": "Ladrillos de Anfibolita", + "block.mineralogy.amphibolite_brick_stairs": "Escaleras de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_brick_slab": "Losa de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_smooth": "Bloque pulido de Anfibolita", + "block.mineralogy.amphibolite_smooth_stairs": "Escaleras pulidas de Anfibolita", + "block.mineralogy.amphibolite_smooth_slab": "Losa pulida de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick": "Ladrillos pulidos de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_slab": "Losa de ladrillos pulidos de Anfibolita", "item.mineralogy.gypsum_dust": "Polvo de yeso", "item.mineralogy.sulfur_dust": "Polvo de azufre", "item.mineralogy.phosphorous_dust": "Polvo de fósforo", "item.mineralogy.nitrate_dust": "Polvo de nitrato", "item.mineralogy.mineral_fertilizer": "Fertilizante mineral", - "block.mineralogy.chert": "Esquisto", + "block.mineralogy.chert": "Sílex", "block.mineralogy.gypsum": "Yeso", - "block.mineralogy.pumice": "Piedra Pómez", + "block.mineralogy.pumice": "Piedra pómez", "block.mineralogy.sulfur_block": "Azufre", - "block.mineralogy.sulfur_ore": "Mineral de azufre", + "block.mineralogy.sulfur_ore": "Mena de azufre", "block.mineralogy.phosphorous_block": "Fósforo", - "block.mineralogy.phosphorous_ore": "Mineral de fósforo", + "block.mineralogy.phosphorous_ore": "Mena de fósforo", "block.mineralogy.nitrate_block": "Nitrato", - "block.mineralogy.nitrate_ore": "Mineral de nitrato", - "block.mineralogy.drywall_black": "Negro panel de yeso", - "block.mineralogy.drywall_red": "Rojo panel de yeso", - "block.mineralogy.drywall_green": "Verde panel de yeso", - "block.mineralogy.drywall_brown": "Marrón panel de yeso", - "block.mineralogy.drywall_blue": "Azul panel de yeso", - "block.mineralogy.drywall_purple": "Púrpura panel de yeso", - "block.mineralogy.drywall_cyan": "Cyan panel de yeso", - "block.mineralogy.drywall_silver": "Plata panel de yeso", - "block.mineralogy.drywall_gray": "Gris panel de yeso", - "block.mineralogy.drywall_pink": "Rosado panel de yeso", - "block.mineralogy.drywall_lime": "Lima panel de yeso", - "block.mineralogy.drywall_yellow": "Amarillo panel de yeso", - "block.mineralogy.drywall_light_blue": "Azul claro panel de yeso", - "block.mineralogy.drywall_magenta": "Magenta panel de yeso", - "block.mineralogy.drywall_orange": "Naranja panel de yeso", - "block.mineralogy.drywall_white": "Blanco panel de yeso", - "block.mineralogy.andesite_wall": "Pared de andesita", - "block.mineralogy.andesite_brick_wall": "Pared de ladrillo de andesita", - "block.mineralogy.andesite_smooth_wall": "Pared Pulida de Andesita", - "block.mineralogy.andesite_smooth_brick_wall": "Pared de ladrillo pulido Andesite", - "block.mineralogy.basalt_wall": "Pared de basalto", - "block.mineralogy.basalt_brick_wall": "Pared de ladrillo de basalto", - "block.mineralogy.basalt_smooth_wall": "Muro pulido de basalto", - "block.mineralogy.basalt_smooth_brick_wall": "Pared de ladrillo pulido de basalto", - "block.mineralogy.diorite_wall": "Pared de Diorita", - "block.mineralogy.diorite_brick_wall": "Pared de ladrillo de diorita", - "block.mineralogy.diorite_smooth_wall": "Diorite pulido de pared", - "block.mineralogy.diorite_smooth_brick_wall": "Pared de ladrillo pulido de diorita", - "block.mineralogy.granite_wall": "Pared de granito", - "block.mineralogy.granite_brick_wall": "Pared de ladrillo de granito", - "block.mineralogy.granite_smooth_wall": "Muro pulido de granito", - "block.mineralogy.granite_smooth_brick_wall": "Pared de ladrillo pulido de granito", - "block.mineralogy.rhyolite_wall": "Pared de riolita", - "block.mineralogy.rhyolite_brick_wall": "Pared de ladrillos de riolita", - "block.mineralogy.rhyolite_smooth_wall": "Pared pulida de riolita", - "block.mineralogy.rhyolite_smooth_brick_wall": "Pared de ladrillo pulido de riolita", - "block.mineralogy.pegmatite_wall": "Pared de Pegmatita", - "block.mineralogy.pegmatite_brick_wall": "Pared de ladrillo de pegmatita", - "block.mineralogy.pegmatite_smooth_wall": "Pared pulida de pegmatita", - "block.mineralogy.pegmatite_smooth_brick_wall": "Pared de ladrillo pulido de pegmatita", - "block.mineralogy.shale_wall": "Muro de pizarra", - "block.mineralogy.shale_brick_wall": "Pared de ladrillo de pizarra", - "block.mineralogy.shale_smooth_wall": "Pared pulida de pizarra", - "block.mineralogy.shale_smooth_brick_wall": "Pizarra, pulido, pared de ladrillo", - "block.mineralogy.conglomerate_wall": "Pared de conglomerado", - "block.mineralogy.conglomerate_brick_wall": "Pared de ladrillo conglomerado", - "block.mineralogy.conglomerate_smooth_wall": "Pared pulida de conglomerado", - "block.mineralogy.conglomerate_smooth_brick_wall": "Conglomerado, pulido, pared de ladrillo", + "block.mineralogy.nitrate_ore": "Mena de nitrato", + "block.mineralogy.drywall_black": "Panel de yeso negro", + "block.mineralogy.drywall_red": "Panel de yeso rojo", + "block.mineralogy.drywall_green": "Panel de yeso verde", + "block.mineralogy.drywall_brown": "Panel de yeso marrón", + "block.mineralogy.drywall_blue": "Panel de yeso azul", + "block.mineralogy.drywall_purple": "Panel de yeso morado", + "block.mineralogy.drywall_cyan": "Panel de yeso cian", + "block.mineralogy.drywall_silver": "Panel de yeso gris claro", + "block.mineralogy.drywall_gray": "Panel de yeso gris", + "block.mineralogy.drywall_pink": "Panel de yeso rosa", + "block.mineralogy.drywall_lime": "Panel de yeso verde lima", + "block.mineralogy.drywall_yellow": "Panel de yeso amarillo", + "block.mineralogy.drywall_light_blue": "Panel de yeso azul claro", + "block.mineralogy.drywall_magenta": "Panel de yeso magenta", + "block.mineralogy.drywall_orange": "Panel de yeso naranja", + "block.mineralogy.drywall_white": "Panel de yeso blanco", + "block.mineralogy.andesite_wall": "Muro de Andesita", + "block.mineralogy.andesite_brick_wall": "Muro de ladrillos de Andesita", + "block.mineralogy.andesite_smooth_wall": "Muro pulido de Andesita", + "block.mineralogy.andesite_smooth_brick_wall": "Muro de ladrillos pulidos de Andesita", + "block.mineralogy.basalt_wall": "Muro de Basalto", + "block.mineralogy.basalt_brick_wall": "Muro de ladrillos de Basalto", + "block.mineralogy.basalt_smooth_wall": "Muro pulido de Basalto", + "block.mineralogy.basalt_smooth_brick_wall": "Muro de ladrillos pulidos de Basalto", + "block.mineralogy.diorite_wall": "Muro de Diorita", + "block.mineralogy.diorite_brick_wall": "Muro de ladrillos de Diorita", + "block.mineralogy.diorite_smooth_wall": "Muro pulido de Diorita", + "block.mineralogy.diorite_smooth_brick_wall": "Muro de ladrillos pulidos de Diorita", + "block.mineralogy.granite_wall": "Muro de Granito", + "block.mineralogy.granite_brick_wall": "Muro de ladrillos de Granito", + "block.mineralogy.granite_smooth_wall": "Muro pulido de Granito", + "block.mineralogy.granite_smooth_brick_wall": "Muro de ladrillos pulidos de Granito", + "block.mineralogy.rhyolite_wall": "Muro de Riolita", + "block.mineralogy.rhyolite_brick_wall": "Muro de ladrillos de Riolita", + "block.mineralogy.rhyolite_smooth_wall": "Muro pulido de Riolita", + "block.mineralogy.rhyolite_smooth_brick_wall": "Muro de ladrillos pulidos de Riolita", + "block.mineralogy.pegmatite_wall": "Muro de Pegmatita", + "block.mineralogy.pegmatite_brick_wall": "Muro de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_smooth_wall": "Muro pulido de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_wall": "Muro de ladrillos pulidos de Pegmatita", + "block.mineralogy.shale_wall": "Muro de Lutita", + "block.mineralogy.shale_brick_wall": "Muro de ladrillos de Lutita", + "block.mineralogy.shale_smooth_wall": "Muro pulido de Lutita", + "block.mineralogy.shale_smooth_brick_wall": "Muro de ladrillos pulidos de Lutita", + "block.mineralogy.conglomerate_wall": "Muro de Conglomerado", + "block.mineralogy.conglomerate_brick_wall": "Muro de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_smooth_wall": "Muro pulido de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_wall": "Muro de ladrillos pulidos de Conglomerado", "block.mineralogy.dolomite_wall": "Muro de Dolomita", - "block.mineralogy.dolomite_brick_wall": "Pared de ladrillos de dolomita", - "block.mineralogy.dolomite_smooth_wall": "Pared pulida de dolomita", - "block.mineralogy.dolomite_smooth_brick_wall": "Pared de ladrillo pulido de dolomita", - "block.mineralogy.limestone_wall": "Muro de piedra caliza", - "block.mineralogy.limestone_brick_wall": "Pared de ladrillo de piedra caliza", - "block.mineralogy.limestone_smooth_wall": "Muro pulido de piedra caliza", - "block.mineralogy.limestone_smooth_brick_wall": "Pared de ladrillo pulido de piedra caliza", - "block.mineralogy.marble_wall": "Muro de mármol", - "block.mineralogy.marble_brick_wall": "Pared de ladrillo de mármol", - "block.mineralogy.marble_smooth_wall": "Mármol pulido de la pared", - "block.mineralogy.marble_smooth_brick_wall": "Mármol pulido de la pared de ladrillo", - "block.mineralogy.slate_wall": "Pared de pizarra", - "block.mineralogy.slate_brick_wall": "Pared de ladrillo de pizarra", - "block.mineralogy.slate_smooth_wall": "Pared pulida pizarra", - "block.mineralogy.slate_smooth_brick_wall": "Pared de ladrillo pulido pizarra", - "block.mineralogy.schist_wall": "Muro de esquisto", - "block.mineralogy.schist_brick_wall": "Pared de ladrillo esquist", - "block.mineralogy.schist_smooth_wall": "Esquisto de pared pulida", - "block.mineralogy.schist_smooth_brick_wall": "Pared de ladrillo pulido de esquisto", - "block.mineralogy.gneiss_wall": "Muro de gneis", - "block.mineralogy.gneiss_brick_wall": "Pared de ladrillo gneis", - "block.mineralogy.gneiss_smooth_wall": "Gneis pulido de la pared", - "block.mineralogy.gneiss_smooth_brick_wall": "Gneis pulido de la pared de ladrillo", - "block.mineralogy.phyllite_wall": "Pared de Phyllite", - "block.mineralogy.phyllite_brick_wall": "Pared de ladrillo Phyllite", - "block.mineralogy.phyllite_smooth_wall": "Phyllite pulido de pared", - "block.mineralogy.phyllite_smooth_brick_wall": "Pared de ladrillo pulido de Phyllite", - "block.mineralogy.amphibolite_wall": "Pared de anfibolita", - "block.mineralogy.amphibolite_brick_wall": "Pared de ladrillo de anfibolita", - "block.mineralogy.amphibolite_smooth_wall": "Pared pulida de anfibolita", - "block.mineralogy.amphibolite_smooth_brick_wall": "Pared de ladrillo pulido de anfibolita", - "block.mineralogy.andesite_furnace": "Horno de andesita", - "block.mineralogy.andesite_brick_furnace": "Horno de ladrillo de andesita", - "block.mineralogy.andesite_smooth_furnace": "Horno Pulida de Andesita", - "block.mineralogy.andesite_smooth_brick_furnace": "Horno de ladrillo pulido Andesite", - "block.mineralogy.basalt_furnace": "Horno de basalto", - "block.mineralogy.basalt_brick_furnace": "Horno de ladrillo de basalto", - "block.mineralogy.basalt_smooth_furnace": "Muro pulido de basalto", - "block.mineralogy.basalt_smooth_brick_furnace": "Horno de ladrillo pulido de basalto", + "block.mineralogy.dolomite_brick_wall": "Muro de ladrillos de Dolomita", + "block.mineralogy.dolomite_smooth_wall": "Muro pulido de Dolomita", + "block.mineralogy.dolomite_smooth_brick_wall": "Muro de ladrillos pulidos de Dolomita", + "block.mineralogy.limestone_wall": "Muro de Caliza", + "block.mineralogy.limestone_brick_wall": "Muro de ladrillos de Caliza", + "block.mineralogy.limestone_smooth_wall": "Muro pulido de Caliza", + "block.mineralogy.limestone_smooth_brick_wall": "Muro de ladrillos pulidos de Caliza", + "block.mineralogy.marble_wall": "Muro de Mármol", + "block.mineralogy.marble_brick_wall": "Muro de ladrillos de Mármol", + "block.mineralogy.marble_smooth_wall": "Muro pulido de Mármol", + "block.mineralogy.marble_smooth_brick_wall": "Muro de ladrillos pulidos de Mármol", + "block.mineralogy.slate_wall": "Muro de Pizarra", + "block.mineralogy.slate_brick_wall": "Muro de ladrillos de Pizarra", + "block.mineralogy.slate_smooth_wall": "Muro pulido de Pizarra", + "block.mineralogy.slate_smooth_brick_wall": "Muro de ladrillos pulidos de Pizarra", + "block.mineralogy.schist_wall": "Muro de Esquisto", + "block.mineralogy.schist_brick_wall": "Muro de ladrillos de Esquisto", + "block.mineralogy.schist_smooth_wall": "Muro pulido de Esquisto", + "block.mineralogy.schist_smooth_brick_wall": "Muro de ladrillos pulidos de Esquisto", + "block.mineralogy.gneiss_wall": "Muro de Gneis", + "block.mineralogy.gneiss_brick_wall": "Muro de ladrillos de Gneis", + "block.mineralogy.gneiss_smooth_wall": "Muro pulido de Gneis", + "block.mineralogy.gneiss_smooth_brick_wall": "Muro de ladrillos pulidos de Gneis", + "block.mineralogy.phyllite_wall": "Muro de Filita", + "block.mineralogy.phyllite_brick_wall": "Muro de ladrillos de Filita", + "block.mineralogy.phyllite_smooth_wall": "Muro pulido de Filita", + "block.mineralogy.phyllite_smooth_brick_wall": "Muro de ladrillos pulidos de Filita", + "block.mineralogy.amphibolite_wall": "Muro de Anfibolita", + "block.mineralogy.amphibolite_brick_wall": "Muro de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_smooth_wall": "Muro pulido de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_wall": "Muro de ladrillos pulidos de Anfibolita", + "block.mineralogy.andesite_furnace": "Horno de Andesita", + "block.mineralogy.andesite_brick_furnace": "Horno de ladrillos de Andesita", + "block.mineralogy.andesite_smooth_furnace": "Horno pulido de Andesita", + "block.mineralogy.andesite_smooth_brick_furnace": "Horno de ladrillos pulidos de Andesita", + "block.mineralogy.basalt_furnace": "Horno de Basalto", + "block.mineralogy.basalt_brick_furnace": "Horno de ladrillos de Basalto", + "block.mineralogy.basalt_smooth_furnace": "Horno pulido de Basalto", + "block.mineralogy.basalt_smooth_brick_furnace": "Horno de ladrillos pulidos de Basalto", "block.mineralogy.diorite_furnace": "Horno de Diorita", - "block.mineralogy.diorite_brick_furnace": "Horno de ladrillo de diorita", - "block.mineralogy.diorite_smooth_furnace": "Diorite pulido de pared", - "block.mineralogy.diorite_smooth_brick_furnace": "Horno de ladrillo pulido de diorita", - "block.mineralogy.granite_furnace": "Horno de granito", - "block.mineralogy.granite_brick_furnace": "Horno de ladrillo de granito", - "block.mineralogy.granite_smooth_furnace": "Muro pulido de granito", - "block.mineralogy.granite_smooth_brick_furnace": "Horno de ladrillo pulido de granito", - "block.mineralogy.rhyolite_furnace": "Horno de riolita", - "block.mineralogy.rhyolite_brick_furnace": "Horno de ladrillos de riolita", - "block.mineralogy.rhyolite_smooth_furnace": "Horno pulida de riolita", - "block.mineralogy.rhyolite_smooth_brick_furnace": "Horno de ladrillo pulido de riolita", + "block.mineralogy.diorite_brick_furnace": "Horno de ladrillos de Diorita", + "block.mineralogy.diorite_smooth_furnace": "Horno pulido de Diorita", + "block.mineralogy.diorite_smooth_brick_furnace": "Horno de ladrillos pulidos de Diorita", + "block.mineralogy.granite_furnace": "Horno de Granito", + "block.mineralogy.granite_brick_furnace": "Horno de ladrillos de Granito", + "block.mineralogy.granite_smooth_furnace": "Horno pulido de Granito", + "block.mineralogy.granite_smooth_brick_furnace": "Horno de ladrillos pulidos de Granito", + "block.mineralogy.rhyolite_furnace": "Horno de Riolita", + "block.mineralogy.rhyolite_brick_furnace": "Horno de ladrillos de Riolita", + "block.mineralogy.rhyolite_smooth_furnace": "Horno pulido de Riolita", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Horno de ladrillos pulidos de Riolita", "block.mineralogy.pegmatite_furnace": "Horno de Pegmatita", - "block.mineralogy.pegmatite_brick_furnace": "Horno de ladrillo de pegmatita", - "block.mineralogy.pegmatite_smooth_furnace": "Horno pulida de pegmatita", - "block.mineralogy.pegmatite_smooth_brick_furnace": "Horno de ladrillo pulido de pegmatita", - "block.mineralogy.shale_furnace": "Muro de pizarra", - "block.mineralogy.shale_brick_furnace": "Horno de ladrillo de pizarra", - "block.mineralogy.shale_smooth_furnace": "Horno pulida de pizarra", - "block.mineralogy.shale_smooth_brick_furnace": "Pizarra, pulido, pared de ladrillo", - "block.mineralogy.conglomerate_furnace": "Horno de conglomerado", - "block.mineralogy.conglomerate_brick_furnace": "Horno de ladrillo conglomerado", - "block.mineralogy.conglomerate_smooth_furnace": "Horno pulida de conglomerado", - "block.mineralogy.conglomerate_smooth_brick_furnace": "Conglomerado, pulido, pared de ladrillo", - "block.mineralogy.dolomite_furnace": "Muro de Dolomita", - "block.mineralogy.dolomite_brick_furnace": "Horno de ladrillos de dolomita", - "block.mineralogy.dolomite_smooth_furnace": "Horno pulida de dolomita", - "block.mineralogy.dolomite_smooth_brick_furnace": "Horno de ladrillo pulido de dolomita", - "block.mineralogy.limestone_furnace": "Muro de piedra caliza", - "block.mineralogy.limestone_brick_furnace": "Horno de ladrillo de piedra caliza", - "block.mineralogy.limestone_smooth_furnace": "Muro pulido de piedra caliza", - "block.mineralogy.limestone_smooth_brick_furnace": "Horno de ladrillo pulido de piedra caliza", - "block.mineralogy.marble_furnace": "Muro de mármol", - "block.mineralogy.marble_brick_furnace": "Horno de ladrillo de mármol", - "block.mineralogy.marble_smooth_furnace": "Mármol pulido de la pared", - "block.mineralogy.marble_smooth_brick_furnace": "Mármol pulido de la pared de ladrillo", - "block.mineralogy.slate_furnace": "Horno de pizarra", - "block.mineralogy.slate_brick_furnace": "Horno de ladrillo de pizarra", - "block.mineralogy.slate_smooth_furnace": "Horno pulida pizarra", - "block.mineralogy.slate_smooth_brick_furnace": "Horno de ladrillo pulido pizarra", - "block.mineralogy.schist_furnace": "Muro de esquisto", - "block.mineralogy.schist_brick_furnace": "Horno de ladrillo esquist", - "block.mineralogy.schist_smooth_furnace": "Esquisto de pared pulida", - "block.mineralogy.schist_smooth_brick_furnace": "Horno de ladrillo pulido de esquisto", - "block.mineralogy.gneiss_furnace": "Muro de gneis", - "block.mineralogy.gneiss_brick_furnace": "Horno de ladrillo gneis", - "block.mineralogy.gneiss_smooth_furnace": "Gneis pulido de la pared", - "block.mineralogy.gneiss_smooth_brick_furnace": "Gneis pulido de la pared de ladrillo", - "block.mineralogy.phyllite_furnace": "Horno de Phyllite", - "block.mineralogy.phyllite_brick_furnace": "Horno de ladrillo Phyllite", - "block.mineralogy.phyllite_smooth_furnace": "Phyllite pulido de pared", - "block.mineralogy.phyllite_smooth_brick_furnace": "Horno de ladrillo pulido de Phyllite", - "block.mineralogy.amphibolite_furnace": "Horno de anfibolita", - "block.mineralogy.amphibolite_brick_furnace": "Horno de ladrillo de anfibolita", - "block.mineralogy.amphibolite_smooth_furnace": "Horno pulida de anfibolita", - "block.mineralogy.amphibolite_smooth_brick_furnace": "Horno de ladrillo pulido de anfibolita", + "block.mineralogy.pegmatite_brick_furnace": "Horno de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_smooth_furnace": "Horno pulido de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Horno de ladrillos pulidos de Pegmatita", + "block.mineralogy.shale_furnace": "Horno de Lutita", + "block.mineralogy.shale_brick_furnace": "Horno de ladrillos de Lutita", + "block.mineralogy.shale_smooth_furnace": "Horno pulido de Lutita", + "block.mineralogy.shale_smooth_brick_furnace": "Horno de ladrillos pulidos de Lutita", + "block.mineralogy.conglomerate_furnace": "Horno de Conglomerado", + "block.mineralogy.conglomerate_brick_furnace": "Horno de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_smooth_furnace": "Horno pulido de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Horno de ladrillos pulidos de Conglomerado", + "block.mineralogy.dolomite_furnace": "Horno de Dolomita", + "block.mineralogy.dolomite_brick_furnace": "Horno de ladrillos de Dolomita", + "block.mineralogy.dolomite_smooth_furnace": "Horno pulido de Dolomita", + "block.mineralogy.dolomite_smooth_brick_furnace": "Horno de ladrillos pulidos de Dolomita", + "block.mineralogy.limestone_furnace": "Horno de Caliza", + "block.mineralogy.limestone_brick_furnace": "Horno de ladrillos de Caliza", + "block.mineralogy.limestone_smooth_furnace": "Horno pulido de Caliza", + "block.mineralogy.limestone_smooth_brick_furnace": "Horno de ladrillos pulidos de Caliza", + "block.mineralogy.marble_furnace": "Horno de Mármol", + "block.mineralogy.marble_brick_furnace": "Horno de ladrillos de Mármol", + "block.mineralogy.marble_smooth_furnace": "Horno pulido de Mármol", + "block.mineralogy.marble_smooth_brick_furnace": "Horno de ladrillos pulidos de Mármol", + "block.mineralogy.slate_furnace": "Horno de Pizarra", + "block.mineralogy.slate_brick_furnace": "Horno de ladrillos de Pizarra", + "block.mineralogy.slate_smooth_furnace": "Horno pulido de Pizarra", + "block.mineralogy.slate_smooth_brick_furnace": "Horno de ladrillos pulidos de Pizarra", + "block.mineralogy.schist_furnace": "Horno de Esquisto", + "block.mineralogy.schist_brick_furnace": "Horno de ladrillos de Esquisto", + "block.mineralogy.schist_smooth_furnace": "Horno pulido de Esquisto", + "block.mineralogy.schist_smooth_brick_furnace": "Horno de ladrillos pulidos de Esquisto", + "block.mineralogy.gneiss_furnace": "Horno de Gneis", + "block.mineralogy.gneiss_brick_furnace": "Horno de ladrillos de Gneis", + "block.mineralogy.gneiss_smooth_furnace": "Horno pulido de Gneis", + "block.mineralogy.gneiss_smooth_brick_furnace": "Horno de ladrillos pulidos de Gneis", + "block.mineralogy.phyllite_furnace": "Horno de Filita", + "block.mineralogy.phyllite_brick_furnace": "Horno de ladrillos de Filita", + "block.mineralogy.phyllite_smooth_furnace": "Horno pulido de Filita", + "block.mineralogy.phyllite_smooth_brick_furnace": "Horno de ladrillos pulidos de Filita", + "block.mineralogy.amphibolite_furnace": "Horno de Anfibolita", + "block.mineralogy.amphibolite_brick_furnace": "Horno de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_smooth_furnace": "Horno pulido de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Horno de ladrillos pulidos de Anfibolita", "block.mineralogy.diabase": "Diabasa", - "block.mineralogy.diabase_stairs": "Diabasa Escalera", - "block.mineralogy.diabase_slab": "Diabasa Losa", - "block.mineralogy.diabase_brick": "Diabasa Ladrillo", - "block.mineralogy.diabase_brick_stairs": "Diabasa Escaleras de ladrillo", - "block.mineralogy.diabase_brick_slab": "Diabasa Losa de ladrillo", - "block.mineralogy.diabase_smooth": "Polished Diabasa", - "block.mineralogy.diabase_smooth_stairs": "Diabasa Escaleras pulidas", - "block.mineralogy.diabase_smooth_slab": "Diabasa Losa pulida", - "block.mineralogy.diabase_smooth_brick": "Diabasa Ladrillo pulido", - "block.mineralogy.diabase_smooth_brick_stairs": "Diabasa Polished Escaleras de ladrillo", - "block.mineralogy.diabase_smooth_brick_slab": "Diabasa Polished Losa de ladrillo", - "block.mineralogy.diabase_wall": "Diabasa pared", - "block.mineralogy.diabase_brick_wall": "Diabasa Pared de ladrillo", - "block.mineralogy.diabase_smooth_wall": "Diabasa Pared pulida", - "block.mineralogy.diabase_smooth_brick_wall": "Diabasa Ladrillo pulido pared", - "block.mineralogy.diabase_furnace": "Diabasa Horno", - "block.mineralogy.diabase_brick_furnace": "Diabasa Horno de ladrillo", - "block.mineralogy.diabase_smooth_furnace": "Diabasa Horno pulido", - "block.mineralogy.diabase_smooth_brick_furnace": "Diabasa Ladrillo pulido Horno", - "block.mineralogy.gabbro": "Gabbro", - "block.mineralogy.gabbro_stairs": "Gabbro Escalera", - "block.mineralogy.gabbro_slab": "Gabbro Losa", - "block.mineralogy.gabbro_brick": "Gabbro Ladrillo", - "block.mineralogy.gabbro_brick_stairs": "Gabbro Escaleras de ladrillo", - "block.mineralogy.gabbro_brick_slab": "Gabbro Losa de ladrillo", - "block.mineralogy.gabbro_smooth": "Polished Gabbro", - "block.mineralogy.gabbro_smooth_stairs": "Gabbro Escaleras pulidas", - "block.mineralogy.gabbro_smooth_slab": "Gabbro Losa pulida", - "block.mineralogy.gabbro_smooth_brick": "Gabbro Ladrillo pulido", - "block.mineralogy.gabbro_smooth_brick_stairs": "Gabbro Polished Escaleras de ladrillo", - "block.mineralogy.gabbro_smooth_brick_slab": "Gabbro Polished Losa de ladrillo", - "block.mineralogy.gabbro_wall": "Gabbro pared", - "block.mineralogy.gabbro_brick_wall": "Gabbro Pared de ladrillo", - "block.mineralogy.gabbro_smooth_wall": "Gabbro Pared pulida", - "block.mineralogy.gabbro_smooth_brick_wall": "Gabbro Ladrillo pulido pared", - "block.mineralogy.gabbro_furnace": "Gabbro Horno", - "block.mineralogy.gabbro_brick_furnace": "Gabbro Horno de ladrillo", - "block.mineralogy.gabbro_smooth_furnace": "Gabbro Horno pulido", - "block.mineralogy.gabbro_smooth_brick_furnace": "Gabbro Ladrillo pulido Horno", + "block.mineralogy.diabase_stairs": "Escaleras de Diabasa", + "block.mineralogy.diabase_slab": "Losa de Diabasa", + "block.mineralogy.diabase_brick": "Ladrillos de Diabasa", + "block.mineralogy.diabase_brick_stairs": "Escaleras de ladrillos de Diabasa", + "block.mineralogy.diabase_brick_slab": "Losa de ladrillos de Diabasa", + "block.mineralogy.diabase_smooth": "Bloque pulido de Diabasa", + "block.mineralogy.diabase_smooth_stairs": "Escaleras pulidas de Diabasa", + "block.mineralogy.diabase_smooth_slab": "Losa pulida de Diabasa", + "block.mineralogy.diabase_smooth_brick": "Ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_smooth_brick_slab": "Losa de ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_wall": "Muro de Diabasa", + "block.mineralogy.diabase_brick_wall": "Muro de ladrillos de Diabasa", + "block.mineralogy.diabase_smooth_wall": "Muro pulido de Diabasa", + "block.mineralogy.diabase_smooth_brick_wall": "Muro de ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_furnace": "Horno de Diabasa", + "block.mineralogy.diabase_brick_furnace": "Horno de ladrillos de Diabasa", + "block.mineralogy.diabase_smooth_furnace": "Horno pulido de Diabasa", + "block.mineralogy.diabase_smooth_brick_furnace": "Horno de ladrillos pulidos de Diabasa", + "block.mineralogy.gabbro": "Gabro", + "block.mineralogy.gabbro_stairs": "Escaleras de Gabro", + "block.mineralogy.gabbro_slab": "Losa de Gabro", + "block.mineralogy.gabbro_brick": "Ladrillos de Gabro", + "block.mineralogy.gabbro_brick_stairs": "Escaleras de ladrillos de Gabro", + "block.mineralogy.gabbro_brick_slab": "Losa de ladrillos de Gabro", + "block.mineralogy.gabbro_smooth": "Bloque pulido de Gabro", + "block.mineralogy.gabbro_smooth_stairs": "Escaleras pulidas de Gabro", + "block.mineralogy.gabbro_smooth_slab": "Losa pulida de Gabro", + "block.mineralogy.gabbro_smooth_brick": "Ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_slab": "Losa de ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_wall": "Muro de Gabro", + "block.mineralogy.gabbro_brick_wall": "Muro de ladrillos de Gabro", + "block.mineralogy.gabbro_smooth_wall": "Muro pulido de Gabro", + "block.mineralogy.gabbro_smooth_brick_wall": "Muro de ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_furnace": "Horno de Gabro", + "block.mineralogy.gabbro_brick_furnace": "Horno de ladrillos de Gabro", + "block.mineralogy.gabbro_smooth_furnace": "Horno pulido de Gabro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Horno de ladrillos pulidos de Gabro", "block.mineralogy.peridotite": "Peridotita", - "block.mineralogy.peridotite_stairs": "Peridotita Escalera", - "block.mineralogy.peridotite_slab": "Peridotita Losa", - "block.mineralogy.peridotite_brick": "Peridotita Ladrillo", - "block.mineralogy.peridotite_brick_stairs": "Peridotita Escaleras de ladrillo", - "block.mineralogy.peridotite_brick_slab": "Peridotita Losa de ladrillo", - "block.mineralogy.peridotite_smooth": "Polished Peridotita", - "block.mineralogy.peridotite_smooth_stairs": "Peridotita Escaleras pulidas", - "block.mineralogy.peridotite_smooth_slab": "Peridotita Losa pulida", - "block.mineralogy.peridotite_smooth_brick": "Peridotita Ladrillo pulido", - "block.mineralogy.peridotite_smooth_brick_stairs": "Peridotita Polished Escaleras de ladrillo", - "block.mineralogy.peridotite_smooth_brick_slab": "Peridotita Polished Losa de ladrillo", - "block.mineralogy.peridotite_wall": "Peridotita pared", - "block.mineralogy.peridotite_brick_wall": "Peridotita Pared de ladrillo", - "block.mineralogy.peridotite_smooth_wall": "Peridotita Pared pulida", - "block.mineralogy.peridotite_smooth_brick_wall": "Peridotita Ladrillo pulido pared", - "block.mineralogy.peridotite_furnace": "Peridotita Horno", - "block.mineralogy.peridotite_brick_furnace": "Peridotita Horno de ladrillo", - "block.mineralogy.peridotite_smooth_furnace": "Peridotita Horno pulido", - "block.mineralogy.peridotite_smooth_brick_furnace": "Peridotita Ladrillo pulido Horno", + "block.mineralogy.peridotite_stairs": "Escaleras de Peridotita", + "block.mineralogy.peridotite_slab": "Losa de Peridotita", + "block.mineralogy.peridotite_brick": "Ladrillos de Peridotita", + "block.mineralogy.peridotite_brick_stairs": "Escaleras de ladrillos de Peridotita", + "block.mineralogy.peridotite_brick_slab": "Losa de ladrillos de Peridotita", + "block.mineralogy.peridotite_smooth": "Bloque pulido de Peridotita", + "block.mineralogy.peridotite_smooth_stairs": "Escaleras pulidas de Peridotita", + "block.mineralogy.peridotite_smooth_slab": "Losa pulida de Peridotita", + "block.mineralogy.peridotite_smooth_brick": "Ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_smooth_brick_slab": "Losa de ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_wall": "Muro de Peridotita", + "block.mineralogy.peridotite_brick_wall": "Muro de ladrillos de Peridotita", + "block.mineralogy.peridotite_smooth_wall": "Muro pulido de Peridotita", + "block.mineralogy.peridotite_smooth_brick_wall": "Muro de ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_furnace": "Horno de Peridotita", + "block.mineralogy.peridotite_brick_furnace": "Horno de ladrillos de Peridotita", + "block.mineralogy.peridotite_smooth_furnace": "Horno pulido de Peridotita", + "block.mineralogy.peridotite_smooth_brick_furnace": "Horno de ladrillos pulidos de Peridotita", "block.mineralogy.basaltic_glass": "Vidrio basáltico", - "block.mineralogy.basaltic_glass_stairs": "Vidrio basáltico Escalera", - "block.mineralogy.basaltic_glass_slab": "Vidrio basáltico Losa", - "block.mineralogy.basaltic_glass_brick": "Vidrio basáltico Ladrillo", - "block.mineralogy.basaltic_glass_brick_stairs": "Vidrio basáltico Escaleras de ladrillo", - "block.mineralogy.basaltic_glass_brick_slab": "Vidrio basáltico Losa de ladrillo", - "block.mineralogy.basaltic_glass_smooth": "Polished Vidrio basáltico", - "block.mineralogy.basaltic_glass_smooth_stairs": "Vidrio basáltico Escaleras pulidas", - "block.mineralogy.basaltic_glass_smooth_slab": "Vidrio basáltico Losa pulida", - "block.mineralogy.basaltic_glass_smooth_brick": "Vidrio basáltico Ladrillo pulido", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Vidrio basáltico Polished Escaleras de ladrillo", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "Vidrio basáltico Polished Losa de ladrillo", - "block.mineralogy.basaltic_glass_wall": "Vidrio basáltico pared", - "block.mineralogy.basaltic_glass_brick_wall": "Vidrio basáltico Pared de ladrillo", - "block.mineralogy.basaltic_glass_smooth_wall": "Vidrio basáltico Pared pulida", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "Vidrio basáltico Ladrillo pulido pared", - "block.mineralogy.basaltic_glass_furnace": "Vidrio basáltico Horno", - "block.mineralogy.basaltic_glass_brick_furnace": "Vidrio basáltico Horno de ladrillo", - "block.mineralogy.basaltic_glass_smooth_furnace": "Vidrio basáltico Horno pulido", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Vidrio basáltico Ladrillo pulido Horno", + "block.mineralogy.basaltic_glass_stairs": "Escaleras de Vidrio basáltico", + "block.mineralogy.basaltic_glass_slab": "Losa de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick": "Ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_stairs": "Escaleras de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_slab": "Losa de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth": "Bloque pulido de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_stairs": "Escaleras pulidas de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_slab": "Losa pulida de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick": "Ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Losa de ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_wall": "Muro de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_wall": "Muro de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_wall": "Muro pulido de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Muro de ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_furnace": "Horno de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_furnace": "Horno de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_furnace": "Horno pulido de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Horno de ladrillos pulidos de Vidrio basáltico", "block.mineralogy.scoria": "Escoria", - "block.mineralogy.scoria_stairs": "Escoria Escalera", - "block.mineralogy.scoria_slab": "Escoria Losa", - "block.mineralogy.scoria_brick": "Escoria Ladrillo", - "block.mineralogy.scoria_brick_stairs": "Escoria Escaleras de ladrillo", - "block.mineralogy.scoria_brick_slab": "Escoria Losa de ladrillo", - "block.mineralogy.scoria_smooth": "Polished Escoria", - "block.mineralogy.scoria_smooth_stairs": "Escoria Escaleras pulidas", - "block.mineralogy.scoria_smooth_slab": "Escoria Losa pulida", - "block.mineralogy.scoria_smooth_brick": "Escoria Ladrillo pulido", - "block.mineralogy.scoria_smooth_brick_stairs": "Escoria Polished Escaleras de ladrillo", - "block.mineralogy.scoria_smooth_brick_slab": "Escoria Polished Losa de ladrillo", - "block.mineralogy.scoria_wall": "Escoria pared", - "block.mineralogy.scoria_brick_wall": "Escoria Pared de ladrillo", - "block.mineralogy.scoria_smooth_wall": "Escoria Pared pulida", - "block.mineralogy.scoria_smooth_brick_wall": "Escoria Ladrillo pulido pared", - "block.mineralogy.scoria_furnace": "Escoria Horno", - "block.mineralogy.scoria_brick_furnace": "Escoria Horno de ladrillo", - "block.mineralogy.scoria_smooth_furnace": "Escoria Horno pulido", - "block.mineralogy.scoria_smooth_brick_furnace": "Escoria Ladrillo pulido Horno", + "block.mineralogy.scoria_stairs": "Escaleras de Escoria", + "block.mineralogy.scoria_slab": "Losa de Escoria", + "block.mineralogy.scoria_brick": "Ladrillos de Escoria", + "block.mineralogy.scoria_brick_stairs": "Escaleras de ladrillos de Escoria", + "block.mineralogy.scoria_brick_slab": "Losa de ladrillos de Escoria", + "block.mineralogy.scoria_smooth": "Bloque pulido de Escoria", + "block.mineralogy.scoria_smooth_stairs": "Escaleras pulidas de Escoria", + "block.mineralogy.scoria_smooth_slab": "Losa pulida de Escoria", + "block.mineralogy.scoria_smooth_brick": "Ladrillos pulidos de Escoria", + "block.mineralogy.scoria_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Escoria", + "block.mineralogy.scoria_smooth_brick_slab": "Losa de ladrillos pulidos de Escoria", + "block.mineralogy.scoria_wall": "Muro de Escoria", + "block.mineralogy.scoria_brick_wall": "Muro de ladrillos de Escoria", + "block.mineralogy.scoria_smooth_wall": "Muro pulido de Escoria", + "block.mineralogy.scoria_smooth_brick_wall": "Muro de ladrillos pulidos de Escoria", + "block.mineralogy.scoria_furnace": "Horno de Escoria", + "block.mineralogy.scoria_brick_furnace": "Horno de ladrillos de Escoria", + "block.mineralogy.scoria_smooth_furnace": "Horno pulido de Escoria", + "block.mineralogy.scoria_smooth_brick_furnace": "Horno de ladrillos pulidos de Escoria", "block.mineralogy.tuff": "Toba", - "block.mineralogy.tuff_stairs": "Toba Escalera", - "block.mineralogy.tuff_slab": "Toba Losa", - "block.mineralogy.tuff_brick": "Toba Ladrillo", - "block.mineralogy.tuff_brick_stairs": "Toba Escaleras de ladrillo", - "block.mineralogy.tuff_brick_slab": "Toba Losa de ladrillo", - "block.mineralogy.tuff_smooth": "Polished Toba", - "block.mineralogy.tuff_smooth_stairs": "Toba Escaleras pulidas", - "block.mineralogy.tuff_smooth_slab": "Toba Losa pulida", - "block.mineralogy.tuff_smooth_brick": "Toba Ladrillo pulido", - "block.mineralogy.tuff_smooth_brick_stairs": "Toba Polished Escaleras de ladrillo", - "block.mineralogy.tuff_smooth_brick_slab": "Toba Polished Losa de ladrillo", - "block.mineralogy.tuff_wall": "Toba pared", - "block.mineralogy.tuff_brick_wall": "Toba Pared de ladrillo", - "block.mineralogy.tuff_smooth_wall": "Toba Pared pulida", - "block.mineralogy.tuff_smooth_brick_wall": "Toba Ladrillo pulido pared", - "block.mineralogy.tuff_furnace": "Toba Horno", - "block.mineralogy.tuff_brick_furnace": "Toba Horno de ladrillo", - "block.mineralogy.tuff_smooth_furnace": "Toba Horno pulido", - "block.mineralogy.tuff_smooth_brick_furnace": "Toba Ladrillo pulido Horno", - "block.mineralogy.siltstone": "Siltstone", - "block.mineralogy.siltstone_stairs": "Siltstone Escalera", - "block.mineralogy.siltstone_slab": "Siltstone Losa", - "block.mineralogy.siltstone_brick": "Siltstone Ladrillo", - "block.mineralogy.siltstone_brick_stairs": "Siltstone Escaleras de ladrillo", - "block.mineralogy.siltstone_brick_slab": "Siltstone Losa de ladrillo", - "block.mineralogy.siltstone_smooth": "Polished Siltstone", - "block.mineralogy.siltstone_smooth_stairs": "Siltstone Escaleras pulidas", - "block.mineralogy.siltstone_smooth_slab": "Siltstone Losa pulida", - "block.mineralogy.siltstone_smooth_brick": "Siltstone Ladrillo pulido", - "block.mineralogy.siltstone_smooth_brick_stairs": "Siltstone Polished Escaleras de ladrillo", - "block.mineralogy.siltstone_smooth_brick_slab": "Siltstone Polished Losa de ladrillo", - "block.mineralogy.siltstone_wall": "Siltstone pared", - "block.mineralogy.siltstone_brick_wall": "Siltstone Pared de ladrillo", - "block.mineralogy.siltstone_smooth_wall": "Siltstone Pared pulida", - "block.mineralogy.siltstone_smooth_brick_wall": "Siltstone Ladrillo pulido pared", - "block.mineralogy.siltstone_furnace": "Siltstone Horno", - "block.mineralogy.siltstone_brick_furnace": "Siltstone Horno de ladrillo", - "block.mineralogy.siltstone_smooth_furnace": "Siltstone Horno pulido", - "block.mineralogy.siltstone_smooth_brick_furnace": "Siltstone Ladrillo pulido Horno", + "block.mineralogy.tuff_stairs": "Escaleras de Toba", + "block.mineralogy.tuff_slab": "Losa de Toba", + "block.mineralogy.tuff_brick": "Ladrillos de Toba", + "block.mineralogy.tuff_brick_stairs": "Escaleras de ladrillos de Toba", + "block.mineralogy.tuff_brick_slab": "Losa de ladrillos de Toba", + "block.mineralogy.tuff_smooth": "Bloque pulido de Toba", + "block.mineralogy.tuff_smooth_stairs": "Escaleras pulidas de Toba", + "block.mineralogy.tuff_smooth_slab": "Losa pulida de Toba", + "block.mineralogy.tuff_smooth_brick": "Ladrillos pulidos de Toba", + "block.mineralogy.tuff_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Toba", + "block.mineralogy.tuff_smooth_brick_slab": "Losa de ladrillos pulidos de Toba", + "block.mineralogy.tuff_wall": "Muro de Toba", + "block.mineralogy.tuff_brick_wall": "Muro de ladrillos de Toba", + "block.mineralogy.tuff_smooth_wall": "Muro pulido de Toba", + "block.mineralogy.tuff_smooth_brick_wall": "Muro de ladrillos pulidos de Toba", + "block.mineralogy.tuff_furnace": "Horno de Toba", + "block.mineralogy.tuff_brick_furnace": "Horno de ladrillos de Toba", + "block.mineralogy.tuff_smooth_furnace": "Horno pulido de Toba", + "block.mineralogy.tuff_smooth_brick_furnace": "Horno de ladrillos pulidos de Toba", + "block.mineralogy.siltstone": "Limolita", + "block.mineralogy.siltstone_stairs": "Escaleras de Limolita", + "block.mineralogy.siltstone_slab": "Losa de Limolita", + "block.mineralogy.siltstone_brick": "Ladrillos de Limolita", + "block.mineralogy.siltstone_brick_stairs": "Escaleras de ladrillos de Limolita", + "block.mineralogy.siltstone_brick_slab": "Losa de ladrillos de Limolita", + "block.mineralogy.siltstone_smooth": "Bloque pulido de Limolita", + "block.mineralogy.siltstone_smooth_stairs": "Escaleras pulidas de Limolita", + "block.mineralogy.siltstone_smooth_slab": "Losa pulida de Limolita", + "block.mineralogy.siltstone_smooth_brick": "Ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_smooth_brick_slab": "Losa de ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_wall": "Muro de Limolita", + "block.mineralogy.siltstone_brick_wall": "Muro de ladrillos de Limolita", + "block.mineralogy.siltstone_smooth_wall": "Muro pulido de Limolita", + "block.mineralogy.siltstone_smooth_brick_wall": "Muro de ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_furnace": "Horno de Limolita", + "block.mineralogy.siltstone_brick_furnace": "Horno de ladrillos de Limolita", + "block.mineralogy.siltstone_smooth_furnace": "Horno pulido de Limolita", + "block.mineralogy.siltstone_smooth_brick_furnace": "Horno de ladrillos pulidos de Limolita", "block.mineralogy.rock_salt": "Sal de roca", - "block.mineralogy.rock_salt_stairs": "Sal de roca Escalera", - "block.mineralogy.rock_salt_slab": "Sal de roca Losa", - "block.mineralogy.rock_salt_brick": "Sal de roca Ladrillo", - "block.mineralogy.rock_salt_brick_stairs": "Sal de roca Escaleras de ladrillo", - "block.mineralogy.rock_salt_brick_slab": "Sal de roca Losa de ladrillo", - "block.mineralogy.rock_salt_smooth": "Polished Sal de roca", - "block.mineralogy.rock_salt_smooth_stairs": "Sal de roca Escaleras pulidas", - "block.mineralogy.rock_salt_smooth_slab": "Sal de roca Losa pulida", - "block.mineralogy.rock_salt_smooth_brick": "Sal de roca Ladrillo pulido", - "block.mineralogy.rock_salt_smooth_brick_stairs": "Sal de roca Polished Escaleras de ladrillo", - "block.mineralogy.rock_salt_smooth_brick_slab": "Sal de roca Polished Losa de ladrillo", - "block.mineralogy.rock_salt_wall": "Sal de roca pared", - "block.mineralogy.rock_salt_brick_wall": "Sal de roca Pared de ladrillo", - "block.mineralogy.rock_salt_smooth_wall": "Sal de roca Pared pulida", - "block.mineralogy.rock_salt_smooth_brick_wall": "Sal de roca Ladrillo pulido pared", - "block.mineralogy.rock_salt_furnace": "Sal de roca Horno", - "block.mineralogy.rock_salt_brick_furnace": "Sal de roca Horno de ladrillo", - "block.mineralogy.rock_salt_smooth_furnace": "Sal de roca Horno pulido", - "block.mineralogy.rock_salt_smooth_brick_furnace": "Sal de roca Ladrillo pulido Horno", - "block.mineralogy.hornfels": "Hornfels", - "block.mineralogy.hornfels_stairs": "Hornfels Escalera", - "block.mineralogy.hornfels_slab": "Hornfels Losa", - "block.mineralogy.hornfels_brick": "Hornfels Ladrillo", - "block.mineralogy.hornfels_brick_stairs": "Hornfels Escaleras de ladrillo", - "block.mineralogy.hornfels_brick_slab": "Hornfels Losa de ladrillo", - "block.mineralogy.hornfels_smooth": "Polished Hornfels", - "block.mineralogy.hornfels_smooth_stairs": "Hornfels Escaleras pulidas", - "block.mineralogy.hornfels_smooth_slab": "Hornfels Losa pulida", - "block.mineralogy.hornfels_smooth_brick": "Hornfels Ladrillo pulido", - "block.mineralogy.hornfels_smooth_brick_stairs": "Hornfels Polished Escaleras de ladrillo", - "block.mineralogy.hornfels_smooth_brick_slab": "Hornfels Polished Losa de ladrillo", - "block.mineralogy.hornfels_wall": "Hornfels pared", - "block.mineralogy.hornfels_brick_wall": "Hornfels Pared de ladrillo", - "block.mineralogy.hornfels_smooth_wall": "Hornfels Pared pulida", - "block.mineralogy.hornfels_smooth_brick_wall": "Hornfels Ladrillo pulido pared", - "block.mineralogy.hornfels_furnace": "Hornfels Horno", - "block.mineralogy.hornfels_brick_furnace": "Hornfels Horno de ladrillo", - "block.mineralogy.hornfels_smooth_furnace": "Hornfels Horno pulido", - "block.mineralogy.hornfels_smooth_brick_furnace": "Hornfels Ladrillo pulido Horno", + "block.mineralogy.rock_salt_stairs": "Escaleras de Sal de roca", + "block.mineralogy.rock_salt_slab": "Losa de Sal de roca", + "block.mineralogy.rock_salt_brick": "Ladrillos de Sal de roca", + "block.mineralogy.rock_salt_brick_stairs": "Escaleras de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_brick_slab": "Losa de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_smooth": "Bloque pulido de Sal de roca", + "block.mineralogy.rock_salt_smooth_stairs": "Escaleras pulidas de Sal de roca", + "block.mineralogy.rock_salt_smooth_slab": "Losa pulida de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick": "Ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_slab": "Losa de ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_wall": "Muro de Sal de roca", + "block.mineralogy.rock_salt_brick_wall": "Muro de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_smooth_wall": "Muro pulido de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_wall": "Muro de ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_furnace": "Horno de Sal de roca", + "block.mineralogy.rock_salt_brick_furnace": "Horno de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_smooth_furnace": "Horno pulido de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Horno de ladrillos pulidos de Sal de roca", + "block.mineralogy.hornfels": "Corneana", + "block.mineralogy.hornfels_stairs": "Escaleras de Corneana", + "block.mineralogy.hornfels_slab": "Losa de Corneana", + "block.mineralogy.hornfels_brick": "Ladrillos de Corneana", + "block.mineralogy.hornfels_brick_stairs": "Escaleras de ladrillos de Corneana", + "block.mineralogy.hornfels_brick_slab": "Losa de ladrillos de Corneana", + "block.mineralogy.hornfels_smooth": "Bloque pulido de Corneana", + "block.mineralogy.hornfels_smooth_stairs": "Escaleras pulidas de Corneana", + "block.mineralogy.hornfels_smooth_slab": "Losa pulida de Corneana", + "block.mineralogy.hornfels_smooth_brick": "Ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_smooth_brick_slab": "Losa de ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_wall": "Muro de Corneana", + "block.mineralogy.hornfels_brick_wall": "Muro de ladrillos de Corneana", + "block.mineralogy.hornfels_smooth_wall": "Muro pulido de Corneana", + "block.mineralogy.hornfels_smooth_brick_wall": "Muro de ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_furnace": "Horno de Corneana", + "block.mineralogy.hornfels_brick_furnace": "Horno de ladrillos de Corneana", + "block.mineralogy.hornfels_smooth_furnace": "Horno pulido de Corneana", + "block.mineralogy.hornfels_smooth_brick_furnace": "Horno de ladrillos pulidos de Corneana", "block.mineralogy.quartzite": "Cuarcita", - "block.mineralogy.quartzite_stairs": "Cuarcita Escalera", - "block.mineralogy.quartzite_slab": "Cuarcita Losa", - "block.mineralogy.quartzite_brick": "Cuarcita Ladrillo", - "block.mineralogy.quartzite_brick_stairs": "Cuarcita Escaleras de ladrillo", - "block.mineralogy.quartzite_brick_slab": "Cuarcita Losa de ladrillo", - "block.mineralogy.quartzite_smooth": "Polished Cuarcita", - "block.mineralogy.quartzite_smooth_stairs": "Cuarcita Escaleras pulidas", - "block.mineralogy.quartzite_smooth_slab": "Cuarcita Losa pulida", - "block.mineralogy.quartzite_smooth_brick": "Cuarcita Ladrillo pulido", - "block.mineralogy.quartzite_smooth_brick_stairs": "Cuarcita Polished Escaleras de ladrillo", - "block.mineralogy.quartzite_smooth_brick_slab": "Cuarcita Polished Losa de ladrillo", - "block.mineralogy.quartzite_wall": "Cuarcita pared", - "block.mineralogy.quartzite_brick_wall": "Cuarcita Pared de ladrillo", - "block.mineralogy.quartzite_smooth_wall": "Cuarcita Pared pulida", - "block.mineralogy.quartzite_smooth_brick_wall": "Cuarcita Ladrillo pulido pared", - "block.mineralogy.quartzite_furnace": "Cuarcita Horno", - "block.mineralogy.quartzite_brick_furnace": "Cuarcita Horno de ladrillo", - "block.mineralogy.quartzite_smooth_furnace": "Cuarcita Horno pulido", - "block.mineralogy.quartzite_smooth_brick_furnace": "Cuarcita Ladrillo pulido Horno", + "block.mineralogy.quartzite_stairs": "Escaleras de Cuarcita", + "block.mineralogy.quartzite_slab": "Losa de Cuarcita", + "block.mineralogy.quartzite_brick": "Ladrillos de Cuarcita", + "block.mineralogy.quartzite_brick_stairs": "Escaleras de ladrillos de Cuarcita", + "block.mineralogy.quartzite_brick_slab": "Losa de ladrillos de Cuarcita", + "block.mineralogy.quartzite_smooth": "Bloque pulido de Cuarcita", + "block.mineralogy.quartzite_smooth_stairs": "Escaleras pulidas de Cuarcita", + "block.mineralogy.quartzite_smooth_slab": "Losa pulida de Cuarcita", + "block.mineralogy.quartzite_smooth_brick": "Ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_slab": "Losa de ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_wall": "Muro de Cuarcita", + "block.mineralogy.quartzite_brick_wall": "Muro de ladrillos de Cuarcita", + "block.mineralogy.quartzite_smooth_wall": "Muro pulido de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_wall": "Muro de ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_furnace": "Horno de Cuarcita", + "block.mineralogy.quartzite_brick_furnace": "Horno de ladrillos de Cuarcita", + "block.mineralogy.quartzite_smooth_furnace": "Horno pulido de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_furnace": "Horno de ladrillos pulidos de Cuarcita", "block.mineralogy.novaculite": "Novaculita", - "block.mineralogy.novaculite_stairs": "Novaculita Escalera", - "block.mineralogy.novaculite_slab": "Novaculita Losa", - "block.mineralogy.novaculite_brick": "Novaculita Ladrillo", - "block.mineralogy.novaculite_brick_stairs": "Novaculita Escaleras de ladrillo", - "block.mineralogy.novaculite_brick_slab": "Novaculita Losa de ladrillo", - "block.mineralogy.novaculite_smooth": "Polished Novaculita", - "block.mineralogy.novaculite_smooth_stairs": "Novaculita Escaleras pulidas", - "block.mineralogy.novaculite_smooth_slab": "Novaculita Losa pulida", - "block.mineralogy.novaculite_smooth_brick": "Novaculita Ladrillo pulido", - "block.mineralogy.novaculite_smooth_brick_stairs": "Novaculita Polished Escaleras de ladrillo", - "block.mineralogy.novaculite_smooth_brick_slab": "Novaculita Polished Losa de ladrillo", - "block.mineralogy.novaculite_wall": "Novaculita pared", - "block.mineralogy.novaculite_brick_wall": "Novaculita Pared de ladrillo", - "block.mineralogy.novaculite_smooth_wall": "Novaculita Pared pulida", - "block.mineralogy.novaculite_smooth_brick_wall": "Novaculita Ladrillo pulido pared", - "block.mineralogy.novaculite_furnace": "Novaculita Horno", - "block.mineralogy.novaculite_brick_furnace": "Novaculita Horno de ladrillo", - "block.mineralogy.novaculite_smooth_furnace": "Novaculita Horno pulido", - "block.mineralogy.novaculite_smooth_brick_furnace": "Novaculita Ladrillo pulido Horno", + "block.mineralogy.novaculite_stairs": "Escaleras de Novaculita", + "block.mineralogy.novaculite_slab": "Losa de Novaculita", + "block.mineralogy.novaculite_brick": "Ladrillos de Novaculita", + "block.mineralogy.novaculite_brick_stairs": "Escaleras de ladrillos de Novaculita", + "block.mineralogy.novaculite_brick_slab": "Losa de ladrillos de Novaculita", + "block.mineralogy.novaculite_smooth": "Bloque pulido de Novaculita", + "block.mineralogy.novaculite_smooth_stairs": "Escaleras pulidas de Novaculita", + "block.mineralogy.novaculite_smooth_slab": "Losa pulida de Novaculita", + "block.mineralogy.novaculite_smooth_brick": "Ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_slab": "Losa de ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_wall": "Muro de Novaculita", + "block.mineralogy.novaculite_brick_wall": "Muro de ladrillos de Novaculita", + "block.mineralogy.novaculite_smooth_wall": "Muro pulido de Novaculita", + "block.mineralogy.novaculite_smooth_brick_wall": "Muro de ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_furnace": "Horno de Novaculita", + "block.mineralogy.novaculite_brick_furnace": "Horno de ladrillos de Novaculita", + "block.mineralogy.novaculite_smooth_furnace": "Horno pulido de Novaculita", + "block.mineralogy.novaculite_smooth_brick_furnace": "Horno de ladrillos pulidos de Novaculita", "block.mineralogy.chalk": "Tiza", "item.mineralogy.chalk_dust": "Polvo de tiza", "item.mineralogy.salt_dust": "Sal", "item.mineralogy.rock_salt_dust": "Cristales de sal de roca", "block.mineralogy.rocksaltlamp": "Lámpara de sal de roca", "block.mineralogy.rocksaltstreetlamp": "Farola de sal de roca", - "block.mineralogy.andesite_relief_axe": "Andesita Alivio del hacha", - "block.mineralogy.andesite_relief_blank": "Andesita Alivio en blanco", - "block.mineralogy.andesite_relief_cross": "Andesita Alivio cruzado", - "block.mineralogy.andesite_relief_hammer": "Andesita Alivio del martillo", - "block.mineralogy.andesite_relief_hoe": "Andesita Alivio de azada", - "block.mineralogy.andesite_relief_horizontal": "Andesita Alivio horizontal", - "block.mineralogy.andesite_relief_i": "Andesita I alivio", - "block.mineralogy.andesite_relief_left": "Andesita Alivio izquierdo", - "block.mineralogy.andesite_relief_pickaxe": "Andesita Alivio de pico", - "block.mineralogy.andesite_relief_plus": "Andesita Más alivio", - "block.mineralogy.andesite_relief_right": "Andesita Alivio correcto", - "block.mineralogy.andesite_relief_sword": "Andesita Alivio de espada", - "block.mineralogy.andesite_relief_vertical": "Andesita Alivio vertical", - "block.mineralogy.basalt_relief_axe": "Basalto Alivio del hacha", - "block.mineralogy.basalt_relief_blank": "Basalto Alivio en blanco", - "block.mineralogy.basalt_relief_cross": "Basalto Alivio cruzado", - "block.mineralogy.basalt_relief_hammer": "Basalto Alivio del martillo", - "block.mineralogy.basalt_relief_hoe": "Basalto Alivio de azada", - "block.mineralogy.basalt_relief_horizontal": "Basalto Alivio horizontal", - "block.mineralogy.basalt_relief_i": "Basalto I alivio", - "block.mineralogy.basalt_relief_left": "Basalto Alivio izquierdo", - "block.mineralogy.basalt_relief_pickaxe": "Basalto Alivio de pico", - "block.mineralogy.basalt_relief_plus": "Basalto Más alivio", - "block.mineralogy.basalt_relief_right": "Basalto Alivio correcto", - "block.mineralogy.basalt_relief_sword": "Basalto Alivio de espada", - "block.mineralogy.basalt_relief_vertical": "Basalto Alivio vertical", - "block.mineralogy.diorite_relief_axe": "Diorita Alivio del hacha", - "block.mineralogy.diorite_relief_blank": "Diorita Alivio en blanco", - "block.mineralogy.diorite_relief_cross": "Diorita Alivio cruzado", - "block.mineralogy.diorite_relief_hammer": "Diorita Alivio del martillo", - "block.mineralogy.diorite_relief_hoe": "Diorita Alivio de azada", - "block.mineralogy.diorite_relief_horizontal": "Diorita Alivio horizontal", - "block.mineralogy.diorite_relief_i": "Diorita I alivio", - "block.mineralogy.diorite_relief_left": "Diorita Alivio izquierdo", - "block.mineralogy.diorite_relief_pickaxe": "Diorita Alivio de pico", - "block.mineralogy.diorite_relief_plus": "Diorita Más alivio", - "block.mineralogy.diorite_relief_right": "Diorita Alivio correcto", - "block.mineralogy.diorite_relief_sword": "Diorita Alivio de espada", - "block.mineralogy.diorite_relief_vertical": "Diorita Alivio vertical", - "block.mineralogy.granite_relief_axe": "Granito Alivio del hacha", - "block.mineralogy.granite_relief_blank": "Granito Alivio en blanco", - "block.mineralogy.granite_relief_cross": "Granito Alivio cruzado", - "block.mineralogy.granite_relief_hammer": "Granito Alivio del martillo", - "block.mineralogy.granite_relief_hoe": "Granito Alivio de azada", - "block.mineralogy.granite_relief_horizontal": "Granito Alivio horizontal", - "block.mineralogy.granite_relief_i": "Granito I alivio", - "block.mineralogy.granite_relief_left": "Granito Alivio izquierdo", - "block.mineralogy.granite_relief_pickaxe": "Granito Alivio de pico", - "block.mineralogy.granite_relief_plus": "Granito Más alivio", - "block.mineralogy.granite_relief_right": "Granito Alivio correcto", - "block.mineralogy.granite_relief_sword": "Granito Alivio de espada", - "block.mineralogy.granite_relief_vertical": "Granito Alivio vertical", - "block.mineralogy.rhyolite_relief_axe": "Riolita Alivio del hacha", - "block.mineralogy.rhyolite_relief_blank": "Riolita Alivio en blanco", - "block.mineralogy.rhyolite_relief_cross": "Riolita Alivio cruzado", - "block.mineralogy.rhyolite_relief_hammer": "Riolita Alivio del martillo", - "block.mineralogy.rhyolite_relief_hoe": "Riolita Alivio de azada", - "block.mineralogy.rhyolite_relief_horizontal": "Riolita Alivio horizontal", - "block.mineralogy.rhyolite_relief_i": "Riolita I alivio", - "block.mineralogy.rhyolite_relief_left": "Riolita Alivio izquierdo", - "block.mineralogy.rhyolite_relief_pickaxe": "Riolita Alivio de pico", - "block.mineralogy.rhyolite_relief_plus": "Riolita Más alivio", - "block.mineralogy.rhyolite_relief_right": "Riolita Alivio correcto", - "block.mineralogy.rhyolite_relief_sword": "Riolita Alivio de espada", - "block.mineralogy.rhyolite_relief_vertical": "Riolita Alivio vertical", - "block.mineralogy.pegmatite_relief_axe": "Pegmatita Alivio del hacha", - "block.mineralogy.pegmatite_relief_blank": "Pegmatita Alivio en blanco", - "block.mineralogy.pegmatite_relief_cross": "Pegmatita Alivio cruzado", - "block.mineralogy.pegmatite_relief_hammer": "Pegmatita Alivio del martillo", - "block.mineralogy.pegmatite_relief_hoe": "Pegmatita Alivio de azada", - "block.mineralogy.pegmatite_relief_horizontal": "Pegmatita Alivio horizontal", - "block.mineralogy.pegmatite_relief_i": "Pegmatita I alivio", - "block.mineralogy.pegmatite_relief_left": "Pegmatita Alivio izquierdo", - "block.mineralogy.pegmatite_relief_pickaxe": "Pegmatita Alivio de pico", - "block.mineralogy.pegmatite_relief_plus": "Pegmatita Más alivio", - "block.mineralogy.pegmatite_relief_right": "Pegmatita Alivio correcto", - "block.mineralogy.pegmatite_relief_sword": "Pegmatita Alivio de espada", - "block.mineralogy.pegmatite_relief_vertical": "Pegmatita Alivio vertical", - "block.mineralogy.shale_relief_axe": "Esquisto Alivio del hacha", - "block.mineralogy.shale_relief_blank": "Esquisto Alivio en blanco", - "block.mineralogy.shale_relief_cross": "Esquisto Alivio cruzado", - "block.mineralogy.shale_relief_hammer": "Esquisto Alivio del martillo", - "block.mineralogy.shale_relief_hoe": "Esquisto Alivio de azada", - "block.mineralogy.shale_relief_horizontal": "Esquisto Alivio horizontal", - "block.mineralogy.shale_relief_i": "Esquisto I alivio", - "block.mineralogy.shale_relief_left": "Esquisto Alivio izquierdo", - "block.mineralogy.shale_relief_pickaxe": "Esquisto Alivio de pico", - "block.mineralogy.shale_relief_plus": "Esquisto Más alivio", - "block.mineralogy.shale_relief_right": "Esquisto Alivio correcto", - "block.mineralogy.shale_relief_sword": "Esquisto Alivio de espada", - "block.mineralogy.shale_relief_vertical": "Esquisto Alivio vertical", - "block.mineralogy.conglomerate_relief_axe": "Conglomerado Alivio del hacha", - "block.mineralogy.conglomerate_relief_blank": "Conglomerado Alivio en blanco", - "block.mineralogy.conglomerate_relief_cross": "Conglomerado Alivio cruzado", - "block.mineralogy.conglomerate_relief_hammer": "Conglomerado Alivio del martillo", - "block.mineralogy.conglomerate_relief_hoe": "Conglomerado Alivio de azada", - "block.mineralogy.conglomerate_relief_horizontal": "Conglomerado Alivio horizontal", - "block.mineralogy.conglomerate_relief_i": "Conglomerado I alivio", - "block.mineralogy.conglomerate_relief_left": "Conglomerado Alivio izquierdo", - "block.mineralogy.conglomerate_relief_pickaxe": "Conglomerado Alivio de pico", - "block.mineralogy.conglomerate_relief_plus": "Conglomerado Más alivio", - "block.mineralogy.conglomerate_relief_right": "Conglomerado Alivio correcto", - "block.mineralogy.conglomerate_relief_sword": "Conglomerado Alivio de espada", - "block.mineralogy.conglomerate_relief_vertical": "Conglomerado Alivio vertical", - "block.mineralogy.dolomite_relief_axe": "Dolomita Alivio del hacha", - "block.mineralogy.dolomite_relief_blank": "Dolomita Alivio en blanco", - "block.mineralogy.dolomite_relief_cross": "Dolomita Alivio cruzado", - "block.mineralogy.dolomite_relief_hammer": "Dolomita Alivio del martillo", - "block.mineralogy.dolomite_relief_hoe": "Dolomita Alivio de azada", - "block.mineralogy.dolomite_relief_horizontal": "Dolomita Alivio horizontal", - "block.mineralogy.dolomite_relief_i": "Dolomita I alivio", - "block.mineralogy.dolomite_relief_left": "Dolomita Alivio izquierdo", - "block.mineralogy.dolomite_relief_pickaxe": "Dolomita Alivio de pico", - "block.mineralogy.dolomite_relief_plus": "Dolomita Más alivio", - "block.mineralogy.dolomite_relief_right": "Dolomita Alivio correcto", - "block.mineralogy.dolomite_relief_sword": "Dolomita Alivio de espada", - "block.mineralogy.dolomite_relief_vertical": "Dolomita Alivio vertical", - "block.mineralogy.limestone_relief_axe": "Caliza Alivio del hacha", - "block.mineralogy.limestone_relief_blank": "Caliza Alivio en blanco", - "block.mineralogy.limestone_relief_cross": "Caliza Alivio cruzado", - "block.mineralogy.limestone_relief_hammer": "Caliza Alivio del martillo", - "block.mineralogy.limestone_relief_hoe": "Caliza Alivio de azada", - "block.mineralogy.limestone_relief_horizontal": "Caliza Alivio horizontal", - "block.mineralogy.limestone_relief_i": "Caliza I alivio", - "block.mineralogy.limestone_relief_left": "Caliza Alivio izquierdo", - "block.mineralogy.limestone_relief_pickaxe": "Caliza Alivio de pico", - "block.mineralogy.limestone_relief_plus": "Caliza Más alivio", - "block.mineralogy.limestone_relief_right": "Caliza Alivio correcto", - "block.mineralogy.limestone_relief_sword": "Caliza Alivio de espada", - "block.mineralogy.limestone_relief_vertical": "Caliza Alivio vertical", - "block.mineralogy.marble_relief_axe": "Mármol Alivio del hacha", - "block.mineralogy.marble_relief_blank": "Mármol Alivio en blanco", - "block.mineralogy.marble_relief_cross": "Mármol Alivio cruzado", - "block.mineralogy.marble_relief_hammer": "Mármol Alivio del martillo", - "block.mineralogy.marble_relief_hoe": "Mármol Alivio de azada", - "block.mineralogy.marble_relief_horizontal": "Mármol Alivio horizontal", - "block.mineralogy.marble_relief_i": "Mármol I alivio", - "block.mineralogy.marble_relief_left": "Mármol Alivio izquierdo", - "block.mineralogy.marble_relief_pickaxe": "Mármol Alivio de pico", - "block.mineralogy.marble_relief_plus": "Mármol Más alivio", - "block.mineralogy.marble_relief_right": "Mármol Alivio correcto", - "block.mineralogy.marble_relief_sword": "Mármol Alivio de espada", - "block.mineralogy.marble_relief_vertical": "Mármol Alivio vertical", - "block.mineralogy.slate_relief_axe": "Pizarra Alivio del hacha", - "block.mineralogy.slate_relief_blank": "Pizarra Alivio en blanco", - "block.mineralogy.slate_relief_cross": "Pizarra Alivio cruzado", - "block.mineralogy.slate_relief_hammer": "Pizarra Alivio del martillo", - "block.mineralogy.slate_relief_hoe": "Pizarra Alivio de azada", - "block.mineralogy.slate_relief_horizontal": "Pizarra Alivio horizontal", - "block.mineralogy.slate_relief_i": "Pizarra I alivio", - "block.mineralogy.slate_relief_left": "Pizarra Alivio izquierdo", - "block.mineralogy.slate_relief_pickaxe": "Pizarra Alivio de pico", - "block.mineralogy.slate_relief_plus": "Pizarra Más alivio", - "block.mineralogy.slate_relief_right": "Pizarra Alivio correcto", - "block.mineralogy.slate_relief_sword": "Pizarra Alivio de espada", - "block.mineralogy.slate_relief_vertical": "Pizarra Alivio vertical", - "block.mineralogy.schist_relief_axe": "Esquisto Alivio del hacha", - "block.mineralogy.schist_relief_blank": "Esquisto Alivio en blanco", - "block.mineralogy.schist_relief_cross": "Esquisto Alivio cruzado", - "block.mineralogy.schist_relief_hammer": "Esquisto Alivio del martillo", - "block.mineralogy.schist_relief_hoe": "Esquisto Alivio de azada", - "block.mineralogy.schist_relief_horizontal": "Esquisto Alivio horizontal", - "block.mineralogy.schist_relief_i": "Esquisto I alivio", - "block.mineralogy.schist_relief_left": "Esquisto Alivio izquierdo", - "block.mineralogy.schist_relief_pickaxe": "Esquisto Alivio de pico", - "block.mineralogy.schist_relief_plus": "Esquisto Más alivio", - "block.mineralogy.schist_relief_right": "Esquisto Alivio correcto", - "block.mineralogy.schist_relief_sword": "Esquisto Alivio de espada", - "block.mineralogy.schist_relief_vertical": "Esquisto Alivio vertical", - "block.mineralogy.gneiss_relief_axe": "Gneis Alivio del hacha", - "block.mineralogy.gneiss_relief_blank": "Gneis Alivio en blanco", - "block.mineralogy.gneiss_relief_cross": "Gneis Alivio cruzado", - "block.mineralogy.gneiss_relief_hammer": "Gneis Alivio del martillo", - "block.mineralogy.gneiss_relief_hoe": "Gneis Alivio de azada", - "block.mineralogy.gneiss_relief_horizontal": "Gneis Alivio horizontal", - "block.mineralogy.gneiss_relief_i": "Gneis I alivio", - "block.mineralogy.gneiss_relief_left": "Gneis Alivio izquierdo", - "block.mineralogy.gneiss_relief_pickaxe": "Gneis Alivio de pico", - "block.mineralogy.gneiss_relief_plus": "Gneis Más alivio", - "block.mineralogy.gneiss_relief_right": "Gneis Alivio correcto", - "block.mineralogy.gneiss_relief_sword": "Gneis Alivio de espada", - "block.mineralogy.gneiss_relief_vertical": "Gneis Alivio vertical", - "block.mineralogy.phyllite_relief_axe": "Filita Alivio del hacha", - "block.mineralogy.phyllite_relief_blank": "Filita Alivio en blanco", - "block.mineralogy.phyllite_relief_cross": "Filita Alivio cruzado", - "block.mineralogy.phyllite_relief_hammer": "Filita Alivio del martillo", - "block.mineralogy.phyllite_relief_hoe": "Filita Alivio de azada", - "block.mineralogy.phyllite_relief_horizontal": "Filita Alivio horizontal", - "block.mineralogy.phyllite_relief_i": "Filita I alivio", - "block.mineralogy.phyllite_relief_left": "Filita Alivio izquierdo", - "block.mineralogy.phyllite_relief_pickaxe": "Filita Alivio de pico", - "block.mineralogy.phyllite_relief_plus": "Filita Más alivio", - "block.mineralogy.phyllite_relief_right": "Filita Alivio correcto", - "block.mineralogy.phyllite_relief_sword": "Filita Alivio de espada", - "block.mineralogy.phyllite_relief_vertical": "Filita Alivio vertical", - "block.mineralogy.amphibolite_relief_axe": "Anfibolita Alivio del hacha", - "block.mineralogy.amphibolite_relief_blank": "Anfibolita Alivio en blanco", - "block.mineralogy.amphibolite_relief_cross": "Anfibolita Alivio cruzado", - "block.mineralogy.amphibolite_relief_hammer": "Anfibolita Alivio del martillo", - "block.mineralogy.amphibolite_relief_hoe": "Anfibolita Alivio de azada", - "block.mineralogy.amphibolite_relief_horizontal": "Anfibolita Alivio horizontal", - "block.mineralogy.amphibolite_relief_i": "Anfibolita I alivio", - "block.mineralogy.amphibolite_relief_left": "Anfibolita Alivio izquierdo", - "block.mineralogy.amphibolite_relief_pickaxe": "Anfibolita Alivio de pico", - "block.mineralogy.amphibolite_relief_plus": "Anfibolita Más alivio", - "block.mineralogy.amphibolite_relief_right": "Anfibolita Alivio correcto", - "block.mineralogy.amphibolite_relief_sword": "Anfibolita Alivio de espada", - "block.mineralogy.amphibolite_relief_vertical": "Anfibolita Alivio vertical", - "block.mineralogy.diabase_relief_axe": "Diabasa Alivio del hacha", - "block.mineralogy.diabase_relief_blank": "Diabasa Alivio en blanco", - "block.mineralogy.diabase_relief_cross": "Diabasa Alivio cruzado", - "block.mineralogy.diabase_relief_hammer": "Diabasa Alivio del martillo", - "block.mineralogy.diabase_relief_hoe": "Diabasa Alivio de azada", - "block.mineralogy.diabase_relief_horizontal": "Diabasa Alivio horizontal", - "block.mineralogy.diabase_relief_i": "Diabasa I alivio", - "block.mineralogy.diabase_relief_left": "Diabasa Alivio izquierdo", - "block.mineralogy.diabase_relief_pickaxe": "Diabasa Alivio de pico", - "block.mineralogy.diabase_relief_plus": "Diabasa Más alivio", - "block.mineralogy.diabase_relief_right": "Diabasa Alivio correcto", - "block.mineralogy.diabase_relief_sword": "Diabasa Alivio de espada", - "block.mineralogy.diabase_relief_vertical": "Diabasa Alivio vertical", - "block.mineralogy.gabbro_relief_axe": "Gabbro Alivio del hacha", - "block.mineralogy.gabbro_relief_blank": "Gabbro Alivio en blanco", - "block.mineralogy.gabbro_relief_cross": "Gabbro Alivio cruzado", - "block.mineralogy.gabbro_relief_hammer": "Gabbro Alivio del martillo", - "block.mineralogy.gabbro_relief_hoe": "Gabbro Alivio de azada", - "block.mineralogy.gabbro_relief_horizontal": "Gabbro Alivio horizontal", - "block.mineralogy.gabbro_relief_i": "Gabbro I alivio", - "block.mineralogy.gabbro_relief_left": "Gabbro Alivio izquierdo", - "block.mineralogy.gabbro_relief_pickaxe": "Gabbro Alivio de pico", - "block.mineralogy.gabbro_relief_plus": "Gabbro Más alivio", - "block.mineralogy.gabbro_relief_right": "Gabbro Alivio correcto", - "block.mineralogy.gabbro_relief_sword": "Gabbro Alivio de espada", - "block.mineralogy.gabbro_relief_vertical": "Gabbro Alivio vertical", - "block.mineralogy.peridotite_relief_axe": "Peridotita Alivio del hacha", - "block.mineralogy.peridotite_relief_blank": "Peridotita Alivio en blanco", - "block.mineralogy.peridotite_relief_cross": "Peridotita Alivio cruzado", - "block.mineralogy.peridotite_relief_hammer": "Peridotita Alivio del martillo", - "block.mineralogy.peridotite_relief_hoe": "Peridotita Alivio de azada", - "block.mineralogy.peridotite_relief_horizontal": "Peridotita Alivio horizontal", - "block.mineralogy.peridotite_relief_i": "Peridotita I alivio", - "block.mineralogy.peridotite_relief_left": "Peridotita Alivio izquierdo", - "block.mineralogy.peridotite_relief_pickaxe": "Peridotita Alivio de pico", - "block.mineralogy.peridotite_relief_plus": "Peridotita Más alivio", - "block.mineralogy.peridotite_relief_right": "Peridotita Alivio correcto", - "block.mineralogy.peridotite_relief_sword": "Peridotita Alivio de espada", - "block.mineralogy.peridotite_relief_vertical": "Peridotita Alivio vertical", - "block.mineralogy.basaltic_glass_relief_axe": "Vidrio basaltoico Alivio del hacha", - "block.mineralogy.basaltic_glass_relief_blank": "Vidrio basaltoico Alivio en blanco", - "block.mineralogy.basaltic_glass_relief_cross": "Vidrio basaltoico Alivio cruzado", - "block.mineralogy.basaltic_glass_relief_hammer": "Vidrio basaltoico Alivio del martillo", - "block.mineralogy.basaltic_glass_relief_hoe": "Vidrio basaltoico Alivio de azada", - "block.mineralogy.basaltic_glass_relief_horizontal": "Vidrio basaltoico Alivio horizontal", - "block.mineralogy.basaltic_glass_relief_i": "Vidrio basaltoico I alivio", - "block.mineralogy.basaltic_glass_relief_left": "Vidrio basaltoico Alivio izquierdo", - "block.mineralogy.basaltic_glass_relief_pickaxe": "Vidrio basaltoico Alivio de pico", - "block.mineralogy.basaltic_glass_relief_plus": "Vidrio basaltoico Más alivio", - "block.mineralogy.basaltic_glass_relief_right": "Vidrio basaltoico Alivio correcto", - "block.mineralogy.basaltic_glass_relief_sword": "Vidrio basaltoico Alivio de espada", - "block.mineralogy.basaltic_glass_relief_vertical": "Vidrio basaltoico Alivio vertical", - "block.mineralogy.scoria_relief_axe": "Escoria Alivio del hacha", - "block.mineralogy.scoria_relief_blank": "Escoria Alivio en blanco", - "block.mineralogy.scoria_relief_cross": "Escoria Alivio cruzado", - "block.mineralogy.scoria_relief_hammer": "Escoria Alivio del martillo", - "block.mineralogy.scoria_relief_hoe": "Escoria Alivio de azada", - "block.mineralogy.scoria_relief_horizontal": "Escoria Alivio horizontal", - "block.mineralogy.scoria_relief_i": "Escoria I alivio", - "block.mineralogy.scoria_relief_left": "Escoria Alivio izquierdo", - "block.mineralogy.scoria_relief_pickaxe": "Escoria Alivio de pico", - "block.mineralogy.scoria_relief_plus": "Escoria Más alivio", - "block.mineralogy.scoria_relief_right": "Escoria Alivio correcto", - "block.mineralogy.scoria_relief_sword": "Escoria Alivio de espada", - "block.mineralogy.scoria_relief_vertical": "Escoria Alivio vertical", - "block.mineralogy.tuff_relief_axe": "Toba Alivio del hacha", - "block.mineralogy.tuff_relief_blank": "Toba Alivio en blanco", - "block.mineralogy.tuff_relief_cross": "Toba Alivio cruzado", - "block.mineralogy.tuff_relief_hammer": "Toba Alivio del martillo", - "block.mineralogy.tuff_relief_hoe": "Toba Alivio de azada", - "block.mineralogy.tuff_relief_horizontal": "Toba Alivio horizontal", - "block.mineralogy.tuff_relief_i": "Toba I alivio", - "block.mineralogy.tuff_relief_left": "Toba Alivio izquierdo", - "block.mineralogy.tuff_relief_pickaxe": "Toba Alivio de pico", - "block.mineralogy.tuff_relief_plus": "Toba Más alivio", - "block.mineralogy.tuff_relief_right": "Toba Alivio correcto", - "block.mineralogy.tuff_relief_sword": "Toba Alivio de espada", - "block.mineralogy.tuff_relief_vertical": "Toba Alivio vertical", - "block.mineralogy.siltstone_relief_axe": "Siltstone Alivio del hacha", - "block.mineralogy.siltstone_relief_blank": "Siltstone Alivio en blanco", - "block.mineralogy.siltstone_relief_cross": "Siltstone Alivio cruzado", - "block.mineralogy.siltstone_relief_hammer": "Siltstone Alivio del martillo", - "block.mineralogy.siltstone_relief_hoe": "Siltstone Alivio de azada", - "block.mineralogy.siltstone_relief_horizontal": "Siltstone Alivio horizontal", - "block.mineralogy.siltstone_relief_i": "Siltstone I alivio", - "block.mineralogy.siltstone_relief_left": "Siltstone Alivio izquierdo", - "block.mineralogy.siltstone_relief_pickaxe": "Siltstone Alivio de pico", - "block.mineralogy.siltstone_relief_plus": "Siltstone Más alivio", - "block.mineralogy.siltstone_relief_right": "Siltstone Alivio correcto", - "block.mineralogy.siltstone_relief_sword": "Siltstone Alivio de espada", - "block.mineralogy.siltstone_relief_vertical": "Siltstone Alivio vertical", - "block.mineralogy.rock_salt_relief_axe": "Sal de roca Alivio del hacha", - "block.mineralogy.rock_salt_relief_blank": "Sal de roca Alivio en blanco", - "block.mineralogy.rock_salt_relief_cross": "Sal de roca Alivio cruzado", - "block.mineralogy.rock_salt_relief_hammer": "Sal de roca Alivio del martillo", - "block.mineralogy.rock_salt_relief_hoe": "Sal de roca Alivio de azada", - "block.mineralogy.rock_salt_relief_horizontal": "Sal de roca Alivio horizontal", - "block.mineralogy.rock_salt_relief_i": "Sal de roca I alivio", - "block.mineralogy.rock_salt_relief_left": "Sal de roca Alivio izquierdo", - "block.mineralogy.rock_salt_relief_pickaxe": "Sal de roca Alivio de pico", - "block.mineralogy.rock_salt_relief_plus": "Sal de roca Más alivio", - "block.mineralogy.rock_salt_relief_right": "Sal de roca Alivio correcto", - "block.mineralogy.rock_salt_relief_sword": "Sal de roca Alivio de espada", - "block.mineralogy.rock_salt_relief_vertical": "Sal de roca Alivio vertical", - "block.mineralogy.hornfels_relief_axe": "Hornfels Alivio del hacha", - "block.mineralogy.hornfels_relief_blank": "Hornfels Alivio en blanco", - "block.mineralogy.hornfels_relief_cross": "Hornfels Alivio cruzado", - "block.mineralogy.hornfels_relief_hammer": "Hornfels Alivio del martillo", - "block.mineralogy.hornfels_relief_hoe": "Hornfels Alivio de azada", - "block.mineralogy.hornfels_relief_horizontal": "Hornfels Alivio horizontal", - "block.mineralogy.hornfels_relief_i": "Hornfels I alivio", - "block.mineralogy.hornfels_relief_left": "Hornfels Alivio izquierdo", - "block.mineralogy.hornfels_relief_pickaxe": "Hornfels Alivio de pico", - "block.mineralogy.hornfels_relief_plus": "Hornfels Más alivio", - "block.mineralogy.hornfels_relief_right": "Hornfels Alivio correcto", - "block.mineralogy.hornfels_relief_sword": "Hornfels Alivio de espada", - "block.mineralogy.hornfels_relief_vertical": "Hornfels Alivio vertical", - "block.mineralogy.quartzite_relief_axe": "Cuarcita Alivio del hacha", - "block.mineralogy.quartzite_relief_blank": "Cuarcita Alivio en blanco", - "block.mineralogy.quartzite_relief_cross": "Cuarcita Alivio cruzado", - "block.mineralogy.quartzite_relief_hammer": "Cuarcita Alivio del martillo", - "block.mineralogy.quartzite_relief_hoe": "Cuarcita Alivio de azada", - "block.mineralogy.quartzite_relief_horizontal": "Cuarcita Alivio horizontal", - "block.mineralogy.quartzite_relief_i": "Cuarcita I alivio", - "block.mineralogy.quartzite_relief_left": "Cuarcita Alivio izquierdo", - "block.mineralogy.quartzite_relief_pickaxe": "Cuarcita Alivio de pico", - "block.mineralogy.quartzite_relief_plus": "Cuarcita Más alivio", - "block.mineralogy.quartzite_relief_right": "Cuarcita Alivio correcto", - "block.mineralogy.quartzite_relief_sword": "Cuarcita Alivio de espada", - "block.mineralogy.quartzite_relief_vertical": "Cuarcita Alivio vertical", - "block.mineralogy.novaculite_relief_axe": "Novaculita Alivio del hacha", - "block.mineralogy.novaculite_relief_blank": "Novaculita Alivio en blanco", - "block.mineralogy.novaculite_relief_cross": "Novaculita Alivio cruzado", - "block.mineralogy.novaculite_relief_hammer": "Novaculita Alivio del martillo", - "block.mineralogy.novaculite_relief_hoe": "Novaculita Alivio de azada", - "block.mineralogy.novaculite_relief_horizontal": "Novaculita Alivio horizontal", - "block.mineralogy.novaculite_relief_i": "Novaculita I alivio", - "block.mineralogy.novaculite_relief_left": "Novaculita Alivio izquierdo", - "block.mineralogy.novaculite_relief_pickaxe": "Novaculita Alivio de pico", - "block.mineralogy.novaculite_relief_plus": "Novaculita Más alivio", - "block.mineralogy.novaculite_relief_right": "Novaculita Alivio correcto", - "block.mineralogy.novaculite_relief_sword": "Novaculita Alivio de espada", - "block.mineralogy.novaculite_relief_vertical": "Novaculita Alivio vertical", - "itemGroup.mineralogy.mineralogy": "Mineralogía" + "block.mineralogy.andesite_relief_axe": "Relieve de Andesita (hacha)", + "block.mineralogy.andesite_relief_blank": "Relieve de Andesita (sin motivo)", + "block.mineralogy.andesite_relief_cross": "Relieve de Andesita (cruz)", + "block.mineralogy.andesite_relief_hammer": "Relieve de Andesita (martillo)", + "block.mineralogy.andesite_relief_hoe": "Relieve de Andesita (azada)", + "block.mineralogy.andesite_relief_horizontal": "Relieve de Andesita (horizontal)", + "block.mineralogy.andesite_relief_i": "Relieve de Andesita (I)", + "block.mineralogy.andesite_relief_left": "Relieve de Andesita (izquierda)", + "block.mineralogy.andesite_relief_pickaxe": "Relieve de Andesita (pico)", + "block.mineralogy.andesite_relief_plus": "Relieve de Andesita (signo más)", + "block.mineralogy.andesite_relief_right": "Relieve de Andesita (derecha)", + "block.mineralogy.andesite_relief_sword": "Relieve de Andesita (espada)", + "block.mineralogy.andesite_relief_vertical": "Relieve de Andesita (vertical)", + "block.mineralogy.basalt_relief_axe": "Relieve de Basalto (hacha)", + "block.mineralogy.basalt_relief_blank": "Relieve de Basalto (sin motivo)", + "block.mineralogy.basalt_relief_cross": "Relieve de Basalto (cruz)", + "block.mineralogy.basalt_relief_hammer": "Relieve de Basalto (martillo)", + "block.mineralogy.basalt_relief_hoe": "Relieve de Basalto (azada)", + "block.mineralogy.basalt_relief_horizontal": "Relieve de Basalto (horizontal)", + "block.mineralogy.basalt_relief_i": "Relieve de Basalto (I)", + "block.mineralogy.basalt_relief_left": "Relieve de Basalto (izquierda)", + "block.mineralogy.basalt_relief_pickaxe": "Relieve de Basalto (pico)", + "block.mineralogy.basalt_relief_plus": "Relieve de Basalto (signo más)", + "block.mineralogy.basalt_relief_right": "Relieve de Basalto (derecha)", + "block.mineralogy.basalt_relief_sword": "Relieve de Basalto (espada)", + "block.mineralogy.basalt_relief_vertical": "Relieve de Basalto (vertical)", + "block.mineralogy.diorite_relief_axe": "Relieve de Diorita (hacha)", + "block.mineralogy.diorite_relief_blank": "Relieve de Diorita (sin motivo)", + "block.mineralogy.diorite_relief_cross": "Relieve de Diorita (cruz)", + "block.mineralogy.diorite_relief_hammer": "Relieve de Diorita (martillo)", + "block.mineralogy.diorite_relief_hoe": "Relieve de Diorita (azada)", + "block.mineralogy.diorite_relief_horizontal": "Relieve de Diorita (horizontal)", + "block.mineralogy.diorite_relief_i": "Relieve de Diorita (I)", + "block.mineralogy.diorite_relief_left": "Relieve de Diorita (izquierda)", + "block.mineralogy.diorite_relief_pickaxe": "Relieve de Diorita (pico)", + "block.mineralogy.diorite_relief_plus": "Relieve de Diorita (signo más)", + "block.mineralogy.diorite_relief_right": "Relieve de Diorita (derecha)", + "block.mineralogy.diorite_relief_sword": "Relieve de Diorita (espada)", + "block.mineralogy.diorite_relief_vertical": "Relieve de Diorita (vertical)", + "block.mineralogy.granite_relief_axe": "Relieve de Granito (hacha)", + "block.mineralogy.granite_relief_blank": "Relieve de Granito (sin motivo)", + "block.mineralogy.granite_relief_cross": "Relieve de Granito (cruz)", + "block.mineralogy.granite_relief_hammer": "Relieve de Granito (martillo)", + "block.mineralogy.granite_relief_hoe": "Relieve de Granito (azada)", + "block.mineralogy.granite_relief_horizontal": "Relieve de Granito (horizontal)", + "block.mineralogy.granite_relief_i": "Relieve de Granito (I)", + "block.mineralogy.granite_relief_left": "Relieve de Granito (izquierda)", + "block.mineralogy.granite_relief_pickaxe": "Relieve de Granito (pico)", + "block.mineralogy.granite_relief_plus": "Relieve de Granito (signo más)", + "block.mineralogy.granite_relief_right": "Relieve de Granito (derecha)", + "block.mineralogy.granite_relief_sword": "Relieve de Granito (espada)", + "block.mineralogy.granite_relief_vertical": "Relieve de Granito (vertical)", + "block.mineralogy.rhyolite_relief_axe": "Relieve de Riolita (hacha)", + "block.mineralogy.rhyolite_relief_blank": "Relieve de Riolita (sin motivo)", + "block.mineralogy.rhyolite_relief_cross": "Relieve de Riolita (cruz)", + "block.mineralogy.rhyolite_relief_hammer": "Relieve de Riolita (martillo)", + "block.mineralogy.rhyolite_relief_hoe": "Relieve de Riolita (azada)", + "block.mineralogy.rhyolite_relief_horizontal": "Relieve de Riolita (horizontal)", + "block.mineralogy.rhyolite_relief_i": "Relieve de Riolita (I)", + "block.mineralogy.rhyolite_relief_left": "Relieve de Riolita (izquierda)", + "block.mineralogy.rhyolite_relief_pickaxe": "Relieve de Riolita (pico)", + "block.mineralogy.rhyolite_relief_plus": "Relieve de Riolita (signo más)", + "block.mineralogy.rhyolite_relief_right": "Relieve de Riolita (derecha)", + "block.mineralogy.rhyolite_relief_sword": "Relieve de Riolita (espada)", + "block.mineralogy.rhyolite_relief_vertical": "Relieve de Riolita (vertical)", + "block.mineralogy.pegmatite_relief_axe": "Relieve de Pegmatita (hacha)", + "block.mineralogy.pegmatite_relief_blank": "Relieve de Pegmatita (sin motivo)", + "block.mineralogy.pegmatite_relief_cross": "Relieve de Pegmatita (cruz)", + "block.mineralogy.pegmatite_relief_hammer": "Relieve de Pegmatita (martillo)", + "block.mineralogy.pegmatite_relief_hoe": "Relieve de Pegmatita (azada)", + "block.mineralogy.pegmatite_relief_horizontal": "Relieve de Pegmatita (horizontal)", + "block.mineralogy.pegmatite_relief_i": "Relieve de Pegmatita (I)", + "block.mineralogy.pegmatite_relief_left": "Relieve de Pegmatita (izquierda)", + "block.mineralogy.pegmatite_relief_pickaxe": "Relieve de Pegmatita (pico)", + "block.mineralogy.pegmatite_relief_plus": "Relieve de Pegmatita (signo más)", + "block.mineralogy.pegmatite_relief_right": "Relieve de Pegmatita (derecha)", + "block.mineralogy.pegmatite_relief_sword": "Relieve de Pegmatita (espada)", + "block.mineralogy.pegmatite_relief_vertical": "Relieve de Pegmatita (vertical)", + "block.mineralogy.shale_relief_axe": "Relieve de Lutita (hacha)", + "block.mineralogy.shale_relief_blank": "Relieve de Lutita (sin motivo)", + "block.mineralogy.shale_relief_cross": "Relieve de Lutita (cruz)", + "block.mineralogy.shale_relief_hammer": "Relieve de Lutita (martillo)", + "block.mineralogy.shale_relief_hoe": "Relieve de Lutita (azada)", + "block.mineralogy.shale_relief_horizontal": "Relieve de Lutita (horizontal)", + "block.mineralogy.shale_relief_i": "Relieve de Lutita (I)", + "block.mineralogy.shale_relief_left": "Relieve de Lutita (izquierda)", + "block.mineralogy.shale_relief_pickaxe": "Relieve de Lutita (pico)", + "block.mineralogy.shale_relief_plus": "Relieve de Lutita (signo más)", + "block.mineralogy.shale_relief_right": "Relieve de Lutita (derecha)", + "block.mineralogy.shale_relief_sword": "Relieve de Lutita (espada)", + "block.mineralogy.shale_relief_vertical": "Relieve de Lutita (vertical)", + "block.mineralogy.conglomerate_relief_axe": "Relieve de Conglomerado (hacha)", + "block.mineralogy.conglomerate_relief_blank": "Relieve de Conglomerado (sin motivo)", + "block.mineralogy.conglomerate_relief_cross": "Relieve de Conglomerado (cruz)", + "block.mineralogy.conglomerate_relief_hammer": "Relieve de Conglomerado (martillo)", + "block.mineralogy.conglomerate_relief_hoe": "Relieve de Conglomerado (azada)", + "block.mineralogy.conglomerate_relief_horizontal": "Relieve de Conglomerado (horizontal)", + "block.mineralogy.conglomerate_relief_i": "Relieve de Conglomerado (I)", + "block.mineralogy.conglomerate_relief_left": "Relieve de Conglomerado (izquierda)", + "block.mineralogy.conglomerate_relief_pickaxe": "Relieve de Conglomerado (pico)", + "block.mineralogy.conglomerate_relief_plus": "Relieve de Conglomerado (signo más)", + "block.mineralogy.conglomerate_relief_right": "Relieve de Conglomerado (derecha)", + "block.mineralogy.conglomerate_relief_sword": "Relieve de Conglomerado (espada)", + "block.mineralogy.conglomerate_relief_vertical": "Relieve de Conglomerado (vertical)", + "block.mineralogy.dolomite_relief_axe": "Relieve de Dolomita (hacha)", + "block.mineralogy.dolomite_relief_blank": "Relieve de Dolomita (sin motivo)", + "block.mineralogy.dolomite_relief_cross": "Relieve de Dolomita (cruz)", + "block.mineralogy.dolomite_relief_hammer": "Relieve de Dolomita (martillo)", + "block.mineralogy.dolomite_relief_hoe": "Relieve de Dolomita (azada)", + "block.mineralogy.dolomite_relief_horizontal": "Relieve de Dolomita (horizontal)", + "block.mineralogy.dolomite_relief_i": "Relieve de Dolomita (I)", + "block.mineralogy.dolomite_relief_left": "Relieve de Dolomita (izquierda)", + "block.mineralogy.dolomite_relief_pickaxe": "Relieve de Dolomita (pico)", + "block.mineralogy.dolomite_relief_plus": "Relieve de Dolomita (signo más)", + "block.mineralogy.dolomite_relief_right": "Relieve de Dolomita (derecha)", + "block.mineralogy.dolomite_relief_sword": "Relieve de Dolomita (espada)", + "block.mineralogy.dolomite_relief_vertical": "Relieve de Dolomita (vertical)", + "block.mineralogy.limestone_relief_axe": "Relieve de Caliza (hacha)", + "block.mineralogy.limestone_relief_blank": "Relieve de Caliza (sin motivo)", + "block.mineralogy.limestone_relief_cross": "Relieve de Caliza (cruz)", + "block.mineralogy.limestone_relief_hammer": "Relieve de Caliza (martillo)", + "block.mineralogy.limestone_relief_hoe": "Relieve de Caliza (azada)", + "block.mineralogy.limestone_relief_horizontal": "Relieve de Caliza (horizontal)", + "block.mineralogy.limestone_relief_i": "Relieve de Caliza (I)", + "block.mineralogy.limestone_relief_left": "Relieve de Caliza (izquierda)", + "block.mineralogy.limestone_relief_pickaxe": "Relieve de Caliza (pico)", + "block.mineralogy.limestone_relief_plus": "Relieve de Caliza (signo más)", + "block.mineralogy.limestone_relief_right": "Relieve de Caliza (derecha)", + "block.mineralogy.limestone_relief_sword": "Relieve de Caliza (espada)", + "block.mineralogy.limestone_relief_vertical": "Relieve de Caliza (vertical)", + "block.mineralogy.marble_relief_axe": "Relieve de Mármol (hacha)", + "block.mineralogy.marble_relief_blank": "Relieve de Mármol (sin motivo)", + "block.mineralogy.marble_relief_cross": "Relieve de Mármol (cruz)", + "block.mineralogy.marble_relief_hammer": "Relieve de Mármol (martillo)", + "block.mineralogy.marble_relief_hoe": "Relieve de Mármol (azada)", + "block.mineralogy.marble_relief_horizontal": "Relieve de Mármol (horizontal)", + "block.mineralogy.marble_relief_i": "Relieve de Mármol (I)", + "block.mineralogy.marble_relief_left": "Relieve de Mármol (izquierda)", + "block.mineralogy.marble_relief_pickaxe": "Relieve de Mármol (pico)", + "block.mineralogy.marble_relief_plus": "Relieve de Mármol (signo más)", + "block.mineralogy.marble_relief_right": "Relieve de Mármol (derecha)", + "block.mineralogy.marble_relief_sword": "Relieve de Mármol (espada)", + "block.mineralogy.marble_relief_vertical": "Relieve de Mármol (vertical)", + "block.mineralogy.slate_relief_axe": "Relieve de Pizarra (hacha)", + "block.mineralogy.slate_relief_blank": "Relieve de Pizarra (sin motivo)", + "block.mineralogy.slate_relief_cross": "Relieve de Pizarra (cruz)", + "block.mineralogy.slate_relief_hammer": "Relieve de Pizarra (martillo)", + "block.mineralogy.slate_relief_hoe": "Relieve de Pizarra (azada)", + "block.mineralogy.slate_relief_horizontal": "Relieve de Pizarra (horizontal)", + "block.mineralogy.slate_relief_i": "Relieve de Pizarra (I)", + "block.mineralogy.slate_relief_left": "Relieve de Pizarra (izquierda)", + "block.mineralogy.slate_relief_pickaxe": "Relieve de Pizarra (pico)", + "block.mineralogy.slate_relief_plus": "Relieve de Pizarra (signo más)", + "block.mineralogy.slate_relief_right": "Relieve de Pizarra (derecha)", + "block.mineralogy.slate_relief_sword": "Relieve de Pizarra (espada)", + "block.mineralogy.slate_relief_vertical": "Relieve de Pizarra (vertical)", + "block.mineralogy.schist_relief_axe": "Relieve de Esquisto (hacha)", + "block.mineralogy.schist_relief_blank": "Relieve de Esquisto (sin motivo)", + "block.mineralogy.schist_relief_cross": "Relieve de Esquisto (cruz)", + "block.mineralogy.schist_relief_hammer": "Relieve de Esquisto (martillo)", + "block.mineralogy.schist_relief_hoe": "Relieve de Esquisto (azada)", + "block.mineralogy.schist_relief_horizontal": "Relieve de Esquisto (horizontal)", + "block.mineralogy.schist_relief_i": "Relieve de Esquisto (I)", + "block.mineralogy.schist_relief_left": "Relieve de Esquisto (izquierda)", + "block.mineralogy.schist_relief_pickaxe": "Relieve de Esquisto (pico)", + "block.mineralogy.schist_relief_plus": "Relieve de Esquisto (signo más)", + "block.mineralogy.schist_relief_right": "Relieve de Esquisto (derecha)", + "block.mineralogy.schist_relief_sword": "Relieve de Esquisto (espada)", + "block.mineralogy.schist_relief_vertical": "Relieve de Esquisto (vertical)", + "block.mineralogy.gneiss_relief_axe": "Relieve de Gneis (hacha)", + "block.mineralogy.gneiss_relief_blank": "Relieve de Gneis (sin motivo)", + "block.mineralogy.gneiss_relief_cross": "Relieve de Gneis (cruz)", + "block.mineralogy.gneiss_relief_hammer": "Relieve de Gneis (martillo)", + "block.mineralogy.gneiss_relief_hoe": "Relieve de Gneis (azada)", + "block.mineralogy.gneiss_relief_horizontal": "Relieve de Gneis (horizontal)", + "block.mineralogy.gneiss_relief_i": "Relieve de Gneis (I)", + "block.mineralogy.gneiss_relief_left": "Relieve de Gneis (izquierda)", + "block.mineralogy.gneiss_relief_pickaxe": "Relieve de Gneis (pico)", + "block.mineralogy.gneiss_relief_plus": "Relieve de Gneis (signo más)", + "block.mineralogy.gneiss_relief_right": "Relieve de Gneis (derecha)", + "block.mineralogy.gneiss_relief_sword": "Relieve de Gneis (espada)", + "block.mineralogy.gneiss_relief_vertical": "Relieve de Gneis (vertical)", + "block.mineralogy.phyllite_relief_axe": "Relieve de Filita (hacha)", + "block.mineralogy.phyllite_relief_blank": "Relieve de Filita (sin motivo)", + "block.mineralogy.phyllite_relief_cross": "Relieve de Filita (cruz)", + "block.mineralogy.phyllite_relief_hammer": "Relieve de Filita (martillo)", + "block.mineralogy.phyllite_relief_hoe": "Relieve de Filita (azada)", + "block.mineralogy.phyllite_relief_horizontal": "Relieve de Filita (horizontal)", + "block.mineralogy.phyllite_relief_i": "Relieve de Filita (I)", + "block.mineralogy.phyllite_relief_left": "Relieve de Filita (izquierda)", + "block.mineralogy.phyllite_relief_pickaxe": "Relieve de Filita (pico)", + "block.mineralogy.phyllite_relief_plus": "Relieve de Filita (signo más)", + "block.mineralogy.phyllite_relief_right": "Relieve de Filita (derecha)", + "block.mineralogy.phyllite_relief_sword": "Relieve de Filita (espada)", + "block.mineralogy.phyllite_relief_vertical": "Relieve de Filita (vertical)", + "block.mineralogy.amphibolite_relief_axe": "Relieve de Anfibolita (hacha)", + "block.mineralogy.amphibolite_relief_blank": "Relieve de Anfibolita (sin motivo)", + "block.mineralogy.amphibolite_relief_cross": "Relieve de Anfibolita (cruz)", + "block.mineralogy.amphibolite_relief_hammer": "Relieve de Anfibolita (martillo)", + "block.mineralogy.amphibolite_relief_hoe": "Relieve de Anfibolita (azada)", + "block.mineralogy.amphibolite_relief_horizontal": "Relieve de Anfibolita (horizontal)", + "block.mineralogy.amphibolite_relief_i": "Relieve de Anfibolita (I)", + "block.mineralogy.amphibolite_relief_left": "Relieve de Anfibolita (izquierda)", + "block.mineralogy.amphibolite_relief_pickaxe": "Relieve de Anfibolita (pico)", + "block.mineralogy.amphibolite_relief_plus": "Relieve de Anfibolita (signo más)", + "block.mineralogy.amphibolite_relief_right": "Relieve de Anfibolita (derecha)", + "block.mineralogy.amphibolite_relief_sword": "Relieve de Anfibolita (espada)", + "block.mineralogy.amphibolite_relief_vertical": "Relieve de Anfibolita (vertical)", + "block.mineralogy.diabase_relief_axe": "Relieve de Diabasa (hacha)", + "block.mineralogy.diabase_relief_blank": "Relieve de Diabasa (sin motivo)", + "block.mineralogy.diabase_relief_cross": "Relieve de Diabasa (cruz)", + "block.mineralogy.diabase_relief_hammer": "Relieve de Diabasa (martillo)", + "block.mineralogy.diabase_relief_hoe": "Relieve de Diabasa (azada)", + "block.mineralogy.diabase_relief_horizontal": "Relieve de Diabasa (horizontal)", + "block.mineralogy.diabase_relief_i": "Relieve de Diabasa (I)", + "block.mineralogy.diabase_relief_left": "Relieve de Diabasa (izquierda)", + "block.mineralogy.diabase_relief_pickaxe": "Relieve de Diabasa (pico)", + "block.mineralogy.diabase_relief_plus": "Relieve de Diabasa (signo más)", + "block.mineralogy.diabase_relief_right": "Relieve de Diabasa (derecha)", + "block.mineralogy.diabase_relief_sword": "Relieve de Diabasa (espada)", + "block.mineralogy.diabase_relief_vertical": "Relieve de Diabasa (vertical)", + "block.mineralogy.gabbro_relief_axe": "Relieve de Gabro (hacha)", + "block.mineralogy.gabbro_relief_blank": "Relieve de Gabro (sin motivo)", + "block.mineralogy.gabbro_relief_cross": "Relieve de Gabro (cruz)", + "block.mineralogy.gabbro_relief_hammer": "Relieve de Gabro (martillo)", + "block.mineralogy.gabbro_relief_hoe": "Relieve de Gabro (azada)", + "block.mineralogy.gabbro_relief_horizontal": "Relieve de Gabro (horizontal)", + "block.mineralogy.gabbro_relief_i": "Relieve de Gabro (I)", + "block.mineralogy.gabbro_relief_left": "Relieve de Gabro (izquierda)", + "block.mineralogy.gabbro_relief_pickaxe": "Relieve de Gabro (pico)", + "block.mineralogy.gabbro_relief_plus": "Relieve de Gabro (signo más)", + "block.mineralogy.gabbro_relief_right": "Relieve de Gabro (derecha)", + "block.mineralogy.gabbro_relief_sword": "Relieve de Gabro (espada)", + "block.mineralogy.gabbro_relief_vertical": "Relieve de Gabro (vertical)", + "block.mineralogy.peridotite_relief_axe": "Relieve de Peridotita (hacha)", + "block.mineralogy.peridotite_relief_blank": "Relieve de Peridotita (sin motivo)", + "block.mineralogy.peridotite_relief_cross": "Relieve de Peridotita (cruz)", + "block.mineralogy.peridotite_relief_hammer": "Relieve de Peridotita (martillo)", + "block.mineralogy.peridotite_relief_hoe": "Relieve de Peridotita (azada)", + "block.mineralogy.peridotite_relief_horizontal": "Relieve de Peridotita (horizontal)", + "block.mineralogy.peridotite_relief_i": "Relieve de Peridotita (I)", + "block.mineralogy.peridotite_relief_left": "Relieve de Peridotita (izquierda)", + "block.mineralogy.peridotite_relief_pickaxe": "Relieve de Peridotita (pico)", + "block.mineralogy.peridotite_relief_plus": "Relieve de Peridotita (signo más)", + "block.mineralogy.peridotite_relief_right": "Relieve de Peridotita (derecha)", + "block.mineralogy.peridotite_relief_sword": "Relieve de Peridotita (espada)", + "block.mineralogy.peridotite_relief_vertical": "Relieve de Peridotita (vertical)", + "block.mineralogy.basaltic_glass_relief_axe": "Relieve de Vidrio basáltico (hacha)", + "block.mineralogy.basaltic_glass_relief_blank": "Relieve de Vidrio basáltico (sin motivo)", + "block.mineralogy.basaltic_glass_relief_cross": "Relieve de Vidrio basáltico (cruz)", + "block.mineralogy.basaltic_glass_relief_hammer": "Relieve de Vidrio basáltico (martillo)", + "block.mineralogy.basaltic_glass_relief_hoe": "Relieve de Vidrio basáltico (azada)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Relieve de Vidrio basáltico (horizontal)", + "block.mineralogy.basaltic_glass_relief_i": "Relieve de Vidrio basáltico (I)", + "block.mineralogy.basaltic_glass_relief_left": "Relieve de Vidrio basáltico (izquierda)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Relieve de Vidrio basáltico (pico)", + "block.mineralogy.basaltic_glass_relief_plus": "Relieve de Vidrio basáltico (signo más)", + "block.mineralogy.basaltic_glass_relief_right": "Relieve de Vidrio basáltico (derecha)", + "block.mineralogy.basaltic_glass_relief_sword": "Relieve de Vidrio basáltico (espada)", + "block.mineralogy.basaltic_glass_relief_vertical": "Relieve de Vidrio basáltico (vertical)", + "block.mineralogy.scoria_relief_axe": "Relieve de Escoria (hacha)", + "block.mineralogy.scoria_relief_blank": "Relieve de Escoria (sin motivo)", + "block.mineralogy.scoria_relief_cross": "Relieve de Escoria (cruz)", + "block.mineralogy.scoria_relief_hammer": "Relieve de Escoria (martillo)", + "block.mineralogy.scoria_relief_hoe": "Relieve de Escoria (azada)", + "block.mineralogy.scoria_relief_horizontal": "Relieve de Escoria (horizontal)", + "block.mineralogy.scoria_relief_i": "Relieve de Escoria (I)", + "block.mineralogy.scoria_relief_left": "Relieve de Escoria (izquierda)", + "block.mineralogy.scoria_relief_pickaxe": "Relieve de Escoria (pico)", + "block.mineralogy.scoria_relief_plus": "Relieve de Escoria (signo más)", + "block.mineralogy.scoria_relief_right": "Relieve de Escoria (derecha)", + "block.mineralogy.scoria_relief_sword": "Relieve de Escoria (espada)", + "block.mineralogy.scoria_relief_vertical": "Relieve de Escoria (vertical)", + "block.mineralogy.tuff_relief_axe": "Relieve de Toba (hacha)", + "block.mineralogy.tuff_relief_blank": "Relieve de Toba (sin motivo)", + "block.mineralogy.tuff_relief_cross": "Relieve de Toba (cruz)", + "block.mineralogy.tuff_relief_hammer": "Relieve de Toba (martillo)", + "block.mineralogy.tuff_relief_hoe": "Relieve de Toba (azada)", + "block.mineralogy.tuff_relief_horizontal": "Relieve de Toba (horizontal)", + "block.mineralogy.tuff_relief_i": "Relieve de Toba (I)", + "block.mineralogy.tuff_relief_left": "Relieve de Toba (izquierda)", + "block.mineralogy.tuff_relief_pickaxe": "Relieve de Toba (pico)", + "block.mineralogy.tuff_relief_plus": "Relieve de Toba (signo más)", + "block.mineralogy.tuff_relief_right": "Relieve de Toba (derecha)", + "block.mineralogy.tuff_relief_sword": "Relieve de Toba (espada)", + "block.mineralogy.tuff_relief_vertical": "Relieve de Toba (vertical)", + "block.mineralogy.siltstone_relief_axe": "Relieve de Limolita (hacha)", + "block.mineralogy.siltstone_relief_blank": "Relieve de Limolita (sin motivo)", + "block.mineralogy.siltstone_relief_cross": "Relieve de Limolita (cruz)", + "block.mineralogy.siltstone_relief_hammer": "Relieve de Limolita (martillo)", + "block.mineralogy.siltstone_relief_hoe": "Relieve de Limolita (azada)", + "block.mineralogy.siltstone_relief_horizontal": "Relieve de Limolita (horizontal)", + "block.mineralogy.siltstone_relief_i": "Relieve de Limolita (I)", + "block.mineralogy.siltstone_relief_left": "Relieve de Limolita (izquierda)", + "block.mineralogy.siltstone_relief_pickaxe": "Relieve de Limolita (pico)", + "block.mineralogy.siltstone_relief_plus": "Relieve de Limolita (signo más)", + "block.mineralogy.siltstone_relief_right": "Relieve de Limolita (derecha)", + "block.mineralogy.siltstone_relief_sword": "Relieve de Limolita (espada)", + "block.mineralogy.siltstone_relief_vertical": "Relieve de Limolita (vertical)", + "block.mineralogy.rock_salt_relief_axe": "Relieve de Sal de roca (hacha)", + "block.mineralogy.rock_salt_relief_blank": "Relieve de Sal de roca (sin motivo)", + "block.mineralogy.rock_salt_relief_cross": "Relieve de Sal de roca (cruz)", + "block.mineralogy.rock_salt_relief_hammer": "Relieve de Sal de roca (martillo)", + "block.mineralogy.rock_salt_relief_hoe": "Relieve de Sal de roca (azada)", + "block.mineralogy.rock_salt_relief_horizontal": "Relieve de Sal de roca (horizontal)", + "block.mineralogy.rock_salt_relief_i": "Relieve de Sal de roca (I)", + "block.mineralogy.rock_salt_relief_left": "Relieve de Sal de roca (izquierda)", + "block.mineralogy.rock_salt_relief_pickaxe": "Relieve de Sal de roca (pico)", + "block.mineralogy.rock_salt_relief_plus": "Relieve de Sal de roca (signo más)", + "block.mineralogy.rock_salt_relief_right": "Relieve de Sal de roca (derecha)", + "block.mineralogy.rock_salt_relief_sword": "Relieve de Sal de roca (espada)", + "block.mineralogy.rock_salt_relief_vertical": "Relieve de Sal de roca (vertical)", + "block.mineralogy.hornfels_relief_axe": "Relieve de Corneana (hacha)", + "block.mineralogy.hornfels_relief_blank": "Relieve de Corneana (sin motivo)", + "block.mineralogy.hornfels_relief_cross": "Relieve de Corneana (cruz)", + "block.mineralogy.hornfels_relief_hammer": "Relieve de Corneana (martillo)", + "block.mineralogy.hornfels_relief_hoe": "Relieve de Corneana (azada)", + "block.mineralogy.hornfels_relief_horizontal": "Relieve de Corneana (horizontal)", + "block.mineralogy.hornfels_relief_i": "Relieve de Corneana (I)", + "block.mineralogy.hornfels_relief_left": "Relieve de Corneana (izquierda)", + "block.mineralogy.hornfels_relief_pickaxe": "Relieve de Corneana (pico)", + "block.mineralogy.hornfels_relief_plus": "Relieve de Corneana (signo más)", + "block.mineralogy.hornfels_relief_right": "Relieve de Corneana (derecha)", + "block.mineralogy.hornfels_relief_sword": "Relieve de Corneana (espada)", + "block.mineralogy.hornfels_relief_vertical": "Relieve de Corneana (vertical)", + "block.mineralogy.quartzite_relief_axe": "Relieve de Cuarcita (hacha)", + "block.mineralogy.quartzite_relief_blank": "Relieve de Cuarcita (sin motivo)", + "block.mineralogy.quartzite_relief_cross": "Relieve de Cuarcita (cruz)", + "block.mineralogy.quartzite_relief_hammer": "Relieve de Cuarcita (martillo)", + "block.mineralogy.quartzite_relief_hoe": "Relieve de Cuarcita (azada)", + "block.mineralogy.quartzite_relief_horizontal": "Relieve de Cuarcita (horizontal)", + "block.mineralogy.quartzite_relief_i": "Relieve de Cuarcita (I)", + "block.mineralogy.quartzite_relief_left": "Relieve de Cuarcita (izquierda)", + "block.mineralogy.quartzite_relief_pickaxe": "Relieve de Cuarcita (pico)", + "block.mineralogy.quartzite_relief_plus": "Relieve de Cuarcita (signo más)", + "block.mineralogy.quartzite_relief_right": "Relieve de Cuarcita (derecha)", + "block.mineralogy.quartzite_relief_sword": "Relieve de Cuarcita (espada)", + "block.mineralogy.quartzite_relief_vertical": "Relieve de Cuarcita (vertical)", + "block.mineralogy.novaculite_relief_axe": "Relieve de Novaculita (hacha)", + "block.mineralogy.novaculite_relief_blank": "Relieve de Novaculita (sin motivo)", + "block.mineralogy.novaculite_relief_cross": "Relieve de Novaculita (cruz)", + "block.mineralogy.novaculite_relief_hammer": "Relieve de Novaculita (martillo)", + "block.mineralogy.novaculite_relief_hoe": "Relieve de Novaculita (azada)", + "block.mineralogy.novaculite_relief_horizontal": "Relieve de Novaculita (horizontal)", + "block.mineralogy.novaculite_relief_i": "Relieve de Novaculita (I)", + "block.mineralogy.novaculite_relief_left": "Relieve de Novaculita (izquierda)", + "block.mineralogy.novaculite_relief_pickaxe": "Relieve de Novaculita (pico)", + "block.mineralogy.novaculite_relief_plus": "Relieve de Novaculita (signo más)", + "block.mineralogy.novaculite_relief_right": "Relieve de Novaculita (derecha)", + "block.mineralogy.novaculite_relief_sword": "Relieve de Novaculita (espada)", + "block.mineralogy.novaculite_relief_vertical": "Relieve de Novaculita (vertical)", + "itemGroup.mineralogy.mineralogy": "Mineralogía", + "itemGroup.mineralogy.rock": "Rocas de Mineralogía", + "itemGroup.mineralogy.stair": "Escaleras de Mineralogía", + "itemGroup.mineralogy.slab": "Losas de Mineralogía", + "itemGroup.mineralogy.wall": "Muros de Mineralogía", + "itemGroup.mineralogy.item": "Objetos de Mineralogía", + "block.mineralogy.crude_oil": "Petróleo crudo", + "item.mineralogy.crude_oil_bucket": "Cubo de petróleo crudo", + "fluid.mineralogy.crude_oil": "Petróleo crudo", + "advancements.mineralogy.all_the_rocks.title": "Todas las rocas", + "advancements.mineralogy.all_the_rocks.description": "¡Has encontrado todos los tipos de roca estándar de Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/es_mx.json b/src/main/resources/assets/mineralogy/lang/es_mx.json index 84e335cd5..5738497f7 100644 --- a/src/main/resources/assets/mineralogy/lang/es_mx.json +++ b/src/main/resources/assets/mineralogy/lang/es_mx.json @@ -2,929 +2,939 @@ "block.mineralogy.andesite": "Andesita", "block.mineralogy.andesite_stairs": "Escaleras de Andesita", "block.mineralogy.andesite_slab": "Losa de Andesita", - "block.mineralogy.andesite_brick": "Ladrillo de Andesita", - "block.mineralogy.andesite_brick_stairs": "Escaleras de ladrillo Andesita", - "block.mineralogy.andesite_brick_slab": "Losa de ladrillo andesita", - "block.mineralogy.andesite_smooth": "Andesita Pulida", - "block.mineralogy.andesite_smooth_stairs": "Escalera de andesita pulida", + "block.mineralogy.andesite_brick": "Ladrillos de Andesita", + "block.mineralogy.andesite_brick_stairs": "Escaleras de ladrillos de Andesita", + "block.mineralogy.andesite_brick_slab": "Losa de ladrillos de Andesita", + "block.mineralogy.andesite_smooth": "Bloque pulido de Andesita", + "block.mineralogy.andesite_smooth_stairs": "Escaleras pulidas de Andesita", "block.mineralogy.andesite_smooth_slab": "Losa pulida de Andesita", - "block.mineralogy.andesite_smooth_brick": "Ladrillo de andesita pulido", - "block.mineralogy.andesite_smooth_brick_stairs": "Escalera de ladrillo anodizado pulido", - "block.mineralogy.andesite_smooth_brick_slab": "Losa de ladrillo anodizado pulido", + "block.mineralogy.andesite_smooth_brick": "Ladrillos pulidos de Andesita", + "block.mineralogy.andesite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Andesita", + "block.mineralogy.andesite_smooth_brick_slab": "Losa de ladrillos pulidos de Andesita", "block.mineralogy.basalt": "Basalto", - "block.mineralogy.basalt_stairs": "Escaleras de basalto", - "block.mineralogy.basalt_slab": "Losa de basalto", - "block.mineralogy.basalt_brick": "Ladrillo de basalto", - "block.mineralogy.basalt_brick_stairs": "Escaleras de ladrillo de basalto", - "block.mineralogy.basalt_brick_slab": "Losa de ladrillo de basalto", - "block.mineralogy.basalt_smooth": "Basalto pulido", - "block.mineralogy.basalt_smooth_stairs": "Escaleras de basalto pulido", - "block.mineralogy.basalt_smooth_slab": "Losa de basalto pulida", - "block.mineralogy.basalt_smooth_brick": "Ladrillo de basalto pulido", - "block.mineralogy.basalt_smooth_brick_stairs": "Escaleras de ladrillo de basalto pulido", - "block.mineralogy.basalt_smooth_brick_slab": "Losa de ladrillo pulido de basalto", + "block.mineralogy.basalt_stairs": "Escaleras de Basalto", + "block.mineralogy.basalt_slab": "Losa de Basalto", + "block.mineralogy.basalt_brick": "Ladrillos de Basalto", + "block.mineralogy.basalt_brick_stairs": "Escaleras de ladrillos de Basalto", + "block.mineralogy.basalt_brick_slab": "Losa de ladrillos de Basalto", + "block.mineralogy.basalt_smooth": "Bloque pulido de Basalto", + "block.mineralogy.basalt_smooth_stairs": "Escaleras pulidas de Basalto", + "block.mineralogy.basalt_smooth_slab": "Losa pulida de Basalto", + "block.mineralogy.basalt_smooth_brick": "Ladrillos pulidos de Basalto", + "block.mineralogy.basalt_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Basalto", + "block.mineralogy.basalt_smooth_brick_slab": "Losa de ladrillos pulidos de Basalto", "block.mineralogy.diorite": "Diorita", "block.mineralogy.diorite_stairs": "Escaleras de Diorita", "block.mineralogy.diorite_slab": "Losa de Diorita", - "block.mineralogy.diorite_brick": "Ladrillo de Diorita", - "block.mineralogy.diorite_brick_stairs": "Escaleras de ladrillo de Diorita", - "block.mineralogy.diorite_brick_slab": "Losa de ladrillo de Diorita", - "block.mineralogy.diorite_smooth": "Diorita pulida", - "block.mineralogy.diorite_smooth_stairs": "Escaleras de Diorita pulida", - "block.mineralogy.diorite_smooth_slab": "Losa de Diorita pulida", - "block.mineralogy.diorite_smooth_brick": "Ladrillo de Diorita pulido", - "block.mineralogy.diorite_smooth_brick_stairs": "Escaleras de ladrillo de Diorita pulida", - "block.mineralogy.diorite_smooth_brick_slab": "Losa de ladrillo de Diorita pulida", + "block.mineralogy.diorite_brick": "Ladrillos de Diorita", + "block.mineralogy.diorite_brick_stairs": "Escaleras de ladrillos de Diorita", + "block.mineralogy.diorite_brick_slab": "Losa de ladrillos de Diorita", + "block.mineralogy.diorite_smooth": "Bloque pulido de Diorita", + "block.mineralogy.diorite_smooth_stairs": "Escaleras pulidas de Diorita", + "block.mineralogy.diorite_smooth_slab": "Losa pulida de Diorita", + "block.mineralogy.diorite_smooth_brick": "Ladrillos pulidos de Diorita", + "block.mineralogy.diorite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Diorita", + "block.mineralogy.diorite_smooth_brick_slab": "Losa de ladrillos pulidos de Diorita", "block.mineralogy.granite": "Granito", "block.mineralogy.granite_stairs": "Escaleras de Granito", "block.mineralogy.granite_slab": "Losa de Granito", - "block.mineralogy.granite_brick": "Ladrillo de Granito", - "block.mineralogy.granite_brick_stairs": "Escaleras de ladrillo de Granito", - "block.mineralogy.granite_brick_slab": "Losa de ladrillo de Granito", - "block.mineralogy.granite_smooth": "Granito pulida", - "block.mineralogy.granite_smooth_stairs": "Escaleras de Granito pulida", - "block.mineralogy.granite_smooth_slab": "Losa de Granito pulida", - "block.mineralogy.granite_smooth_brick": "Ladrillo de Granito pulido", - "block.mineralogy.granite_smooth_brick_stairs": "Escaleras de ladrillo de Granito pulida", - "block.mineralogy.granite_smooth_brick_slab": "Losa de ladrillo de Granito pulida", + "block.mineralogy.granite_brick": "Ladrillos de Granito", + "block.mineralogy.granite_brick_stairs": "Escaleras de ladrillos de Granito", + "block.mineralogy.granite_brick_slab": "Losa de ladrillos de Granito", + "block.mineralogy.granite_smooth": "Bloque pulido de Granito", + "block.mineralogy.granite_smooth_stairs": "Escaleras pulidas de Granito", + "block.mineralogy.granite_smooth_slab": "Losa pulida de Granito", + "block.mineralogy.granite_smooth_brick": "Ladrillos pulidos de Granito", + "block.mineralogy.granite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Granito", + "block.mineralogy.granite_smooth_brick_slab": "Losa de ladrillos pulidos de Granito", "block.mineralogy.rhyolite": "Riolita", "block.mineralogy.rhyolite_stairs": "Escaleras de Riolita", "block.mineralogy.rhyolite_slab": "Losa de Riolita", - "block.mineralogy.rhyolite_brick": "Ladrillo de Riolita", - "block.mineralogy.rhyolite_brick_stairs": "Escaleras de ladrillo de Riolita", - "block.mineralogy.rhyolite_brick_slab": "Losa de ladrillo de Riolita", - "block.mineralogy.rhyolite_smooth": "Riolita pulida", - "block.mineralogy.rhyolite_smooth_stairs": "Escaleras de Riolita pulida", - "block.mineralogy.rhyolite_smooth_slab": "Losa de Riolita pulida", - "block.mineralogy.rhyolite_smooth_brick": "Ladrillo de Riolita pulido", - "block.mineralogy.rhyolite_smooth_brick_stairs": "Escaleras de ladrillo de Riolita pulida", - "block.mineralogy.rhyolite_smooth_brick_slab": "Losa de ladrillo de Riolita pulida", + "block.mineralogy.rhyolite_brick": "Ladrillos de Riolita", + "block.mineralogy.rhyolite_brick_stairs": "Escaleras de ladrillos de Riolita", + "block.mineralogy.rhyolite_brick_slab": "Losa de ladrillos de Riolita", + "block.mineralogy.rhyolite_smooth": "Bloque pulido de Riolita", + "block.mineralogy.rhyolite_smooth_stairs": "Escaleras pulidas de Riolita", + "block.mineralogy.rhyolite_smooth_slab": "Losa pulida de Riolita", + "block.mineralogy.rhyolite_smooth_brick": "Ladrillos pulidos de Riolita", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Riolita", + "block.mineralogy.rhyolite_smooth_brick_slab": "Losa de ladrillos pulidos de Riolita", "block.mineralogy.pegmatite": "Pegmatita", "block.mineralogy.pegmatite_stairs": "Escaleras de Pegmatita", "block.mineralogy.pegmatite_slab": "Losa de Pegmatita", - "block.mineralogy.pegmatite_brick": "Ladrillo de Pegmatita", - "block.mineralogy.pegmatite_brick_stairs": "Escaleras de ladrillo de Pegmatita", - "block.mineralogy.pegmatite_brick_slab": "Losa de ladrillo de Pegmatita", - "block.mineralogy.pegmatite_smooth": "Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_stairs": "Escaleras de Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_slab": "Losa de Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_brick": "Ladrillo de Pegmatita pulido", - "block.mineralogy.pegmatite_smooth_brick_stairs": "Escaleras de ladrillo de Pegmatita pulida", - "block.mineralogy.pegmatite_smooth_brick_slab": "Losa de ladrillo de Pegmatita pulida", - "block.mineralogy.shale": "Esquisto", - "block.mineralogy.shale_stairs": "Escaleras de Esquisto", - "block.mineralogy.shale_slab": "Losa de Esquisto", - "block.mineralogy.shale_brick": "Ladrillo de Esquisto", - "block.mineralogy.shale_brick_stairs": "Escaleras de ladrillo de Esquisto", - "block.mineralogy.shale_brick_slab": "Losa de ladrillo de Esquisto", - "block.mineralogy.shale_smooth": "Esquisto pulida", - "block.mineralogy.shale_smooth_stairs": "Escaleras de Esquisto pulida", - "block.mineralogy.shale_smooth_slab": "Losa de Esquisto pulida", - "block.mineralogy.shale_smooth_brick": "Ladrillo de Esquisto pulido", - "block.mineralogy.shale_smooth_brick_stairs": "Escaleras de ladrillo de Esquisto pulida", - "block.mineralogy.shale_smooth_brick_slab": "Losa de ladrillo de Esquisto pulida", + "block.mineralogy.pegmatite_brick": "Ladrillos de Pegmatita", + "block.mineralogy.pegmatite_brick_stairs": "Escaleras de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_brick_slab": "Losa de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_smooth": "Bloque pulido de Pegmatita", + "block.mineralogy.pegmatite_smooth_stairs": "Escaleras pulidas de Pegmatita", + "block.mineralogy.pegmatite_smooth_slab": "Losa pulida de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick": "Ladrillos pulidos de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_slab": "Losa de ladrillos pulidos de Pegmatita", + "block.mineralogy.shale": "Lutita", + "block.mineralogy.shale_stairs": "Escaleras de Lutita", + "block.mineralogy.shale_slab": "Losa de Lutita", + "block.mineralogy.shale_brick": "Ladrillos de Lutita", + "block.mineralogy.shale_brick_stairs": "Escaleras de ladrillos de Lutita", + "block.mineralogy.shale_brick_slab": "Losa de ladrillos de Lutita", + "block.mineralogy.shale_smooth": "Bloque pulido de Lutita", + "block.mineralogy.shale_smooth_stairs": "Escaleras pulidas de Lutita", + "block.mineralogy.shale_smooth_slab": "Losa pulida de Lutita", + "block.mineralogy.shale_smooth_brick": "Ladrillos pulidos de Lutita", + "block.mineralogy.shale_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Lutita", + "block.mineralogy.shale_smooth_brick_slab": "Losa de ladrillos pulidos de Lutita", "block.mineralogy.conglomerate": "Conglomerado", "block.mineralogy.conglomerate_stairs": "Escaleras de Conglomerado", "block.mineralogy.conglomerate_slab": "Losa de Conglomerado", - "block.mineralogy.conglomerate_brick": "Ladrillo de Conglomerado", - "block.mineralogy.conglomerate_brick_stairs": "Escaleras de ladrillo de Conglomerado", - "block.mineralogy.conglomerate_brick_slab": "Losa de ladrillo de Conglomerado", - "block.mineralogy.conglomerate_smooth": "Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_stairs": "Escaleras de Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_slab": "Losa de Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_brick": "Ladrillo de Conglomerado pulido", - "block.mineralogy.conglomerate_smooth_brick_stairs": "Escaleras de ladrillo de Conglomerado pulida", - "block.mineralogy.conglomerate_smooth_brick_slab": "Losa de ladrillo de Conglomerado pulida", + "block.mineralogy.conglomerate_brick": "Ladrillos de Conglomerado", + "block.mineralogy.conglomerate_brick_stairs": "Escaleras de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_brick_slab": "Losa de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_smooth": "Bloque pulido de Conglomerado", + "block.mineralogy.conglomerate_smooth_stairs": "Escaleras pulidas de Conglomerado", + "block.mineralogy.conglomerate_smooth_slab": "Losa pulida de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick": "Ladrillos pulidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_slab": "Losa de ladrillos pulidos de Conglomerado", "block.mineralogy.dolomite": "Dolomita", "block.mineralogy.dolomite_stairs": "Escaleras de Dolomita", "block.mineralogy.dolomite_slab": "Losa de Dolomita", - "block.mineralogy.dolomite_brick": "Ladrillo de Dolomita", - "block.mineralogy.dolomite_brick_stairs": "Escaleras de ladrillo de Dolomita", - "block.mineralogy.dolomite_brick_slab": "Losa de ladrillo de Dolomita", - "block.mineralogy.dolomite_smooth": "Dolomita pulida", - "block.mineralogy.dolomite_smooth_stairs": "Escaleras de Dolomita pulida", - "block.mineralogy.dolomite_smooth_slab": "Losa de Dolomita pulida", - "block.mineralogy.dolomite_smooth_brick": "Ladrillo de Dolomita pulido", - "block.mineralogy.dolomite_smooth_brick_stairs": "Escaleras de ladrillo de Dolomita pulida", - "block.mineralogy.dolomite_smooth_brick_slab": "Losa de ladrillo de Dolomita pulida", + "block.mineralogy.dolomite_brick": "Ladrillos de Dolomita", + "block.mineralogy.dolomite_brick_stairs": "Escaleras de ladrillos de Dolomita", + "block.mineralogy.dolomite_brick_slab": "Losa de ladrillos de Dolomita", + "block.mineralogy.dolomite_smooth": "Bloque pulido de Dolomita", + "block.mineralogy.dolomite_smooth_stairs": "Escaleras pulidas de Dolomita", + "block.mineralogy.dolomite_smooth_slab": "Losa pulida de Dolomita", + "block.mineralogy.dolomite_smooth_brick": "Ladrillos pulidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_slab": "Losa de ladrillos pulidos de Dolomita", "block.mineralogy.limestone": "Caliza", "block.mineralogy.limestone_stairs": "Escaleras de Caliza", "block.mineralogy.limestone_slab": "Losa de Caliza", - "block.mineralogy.limestone_brick": "Ladrillo de Caliza", - "block.mineralogy.limestone_brick_stairs": "Escaleras de ladrillo de Caliza", - "block.mineralogy.limestone_brick_slab": "Losa de ladrillo de Caliza", - "block.mineralogy.limestone_smooth": "Caliza pulida", - "block.mineralogy.limestone_smooth_stairs": "Escaleras de Caliza pulida", - "block.mineralogy.limestone_smooth_slab": "Losa de Caliza pulida", - "block.mineralogy.limestone_smooth_brick": "Ladrillo de Caliza pulido", - "block.mineralogy.limestone_smooth_brick_stairs": "Escaleras de ladrillo de Caliza pulida", - "block.mineralogy.limestone_smooth_brick_slab": "Losa de ladrillo de Caliza pulida", + "block.mineralogy.limestone_brick": "Ladrillos de Caliza", + "block.mineralogy.limestone_brick_stairs": "Escaleras de ladrillos de Caliza", + "block.mineralogy.limestone_brick_slab": "Losa de ladrillos de Caliza", + "block.mineralogy.limestone_smooth": "Bloque pulido de Caliza", + "block.mineralogy.limestone_smooth_stairs": "Escaleras pulidas de Caliza", + "block.mineralogy.limestone_smooth_slab": "Losa pulida de Caliza", + "block.mineralogy.limestone_smooth_brick": "Ladrillos pulidos de Caliza", + "block.mineralogy.limestone_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Caliza", + "block.mineralogy.limestone_smooth_brick_slab": "Losa de ladrillos pulidos de Caliza", "block.mineralogy.slate": "Pizarra", "block.mineralogy.slate_stairs": "Escaleras de Pizarra", "block.mineralogy.slate_slab": "Losa de Pizarra", - "block.mineralogy.slate_brick": "Ladrillo de Pizarra", - "block.mineralogy.slate_brick_stairs": "Escaleras de ladrillo de Pizarra", - "block.mineralogy.slate_brick_slab": "Losa de ladrillo de Pizarra", - "block.mineralogy.slate_smooth": "Pizarra pulida", - "block.mineralogy.slate_smooth_stairs": "Escaleras de Pizarra pulida", - "block.mineralogy.slate_smooth_slab": "Losa de Pizarra pulida", - "block.mineralogy.slate_smooth_brick": "Ladrillo de Pizarra pulido", - "block.mineralogy.slate_smooth_brick_stairs": "Escaleras de ladrillo de Pizarra pulida", - "block.mineralogy.slate_smooth_brick_slab": "Losa de ladrillo de Pizarra pulida", + "block.mineralogy.slate_brick": "Ladrillos de Pizarra", + "block.mineralogy.slate_brick_stairs": "Escaleras de ladrillos de Pizarra", + "block.mineralogy.slate_brick_slab": "Losa de ladrillos de Pizarra", + "block.mineralogy.slate_smooth": "Bloque pulido de Pizarra", + "block.mineralogy.slate_smooth_stairs": "Escaleras pulidas de Pizarra", + "block.mineralogy.slate_smooth_slab": "Losa pulida de Pizarra", + "block.mineralogy.slate_smooth_brick": "Ladrillos pulidos de Pizarra", + "block.mineralogy.slate_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Pizarra", + "block.mineralogy.slate_smooth_brick_slab": "Losa de ladrillos pulidos de Pizarra", "block.mineralogy.schist": "Esquisto", "block.mineralogy.schist_stairs": "Escaleras de Esquisto", "block.mineralogy.schist_slab": "Losa de Esquisto", - "block.mineralogy.schist_brick": "Ladrillo de Esquisto", - "block.mineralogy.schist_brick_stairs": "Escaleras de ladrillo de Esquisto", - "block.mineralogy.schist_brick_slab": "Losa de ladrillo de Esquisto", - "block.mineralogy.schist_smooth": "Esquisto pulida", - "block.mineralogy.schist_smooth_stairs": "Escaleras de Esquisto pulida", - "block.mineralogy.schist_smooth_slab": "Losa de Esquisto pulida", - "block.mineralogy.schist_smooth_brick": "Ladrillo de Esquisto pulido", - "block.mineralogy.schist_smooth_brick_stairs": "Escaleras de ladrillo de Esquisto pulida", - "block.mineralogy.schist_smooth_brick_slab": "Losa de ladrillo de Esquisto pulida", + "block.mineralogy.schist_brick": "Ladrillos de Esquisto", + "block.mineralogy.schist_brick_stairs": "Escaleras de ladrillos de Esquisto", + "block.mineralogy.schist_brick_slab": "Losa de ladrillos de Esquisto", + "block.mineralogy.schist_smooth": "Bloque pulido de Esquisto", + "block.mineralogy.schist_smooth_stairs": "Escaleras pulidas de Esquisto", + "block.mineralogy.schist_smooth_slab": "Losa pulida de Esquisto", + "block.mineralogy.schist_smooth_brick": "Ladrillos pulidos de Esquisto", + "block.mineralogy.schist_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Esquisto", + "block.mineralogy.schist_smooth_brick_slab": "Losa de ladrillos pulidos de Esquisto", "block.mineralogy.gneiss": "Gneis", "block.mineralogy.gneiss_stairs": "Escaleras de Gneis", "block.mineralogy.gneiss_slab": "Losa de Gneis", - "block.mineralogy.gneiss_brick": "Ladrillo de Gneis", - "block.mineralogy.gneiss_brick_stairs": "Escaleras de ladrillo de Gneis", - "block.mineralogy.gneiss_brick_slab": "Losa de ladrillo de Gneis", - "block.mineralogy.gneiss_smooth": "Gneis pulida", - "block.mineralogy.gneiss_smooth_stairs": "Escaleras de Gneis pulida", - "block.mineralogy.gneiss_smooth_slab": "Losa de Gneis pulida", - "block.mineralogy.gneiss_smooth_brick": "Ladrillo de Gneis pulido", - "block.mineralogy.gneiss_smooth_brick_stairs": "Escaleras de ladrillo de Gneis pulida", - "block.mineralogy.gneiss_smooth_brick_slab": "Losa de ladrillo de Gneis pulida", + "block.mineralogy.gneiss_brick": "Ladrillos de Gneis", + "block.mineralogy.gneiss_brick_stairs": "Escaleras de ladrillos de Gneis", + "block.mineralogy.gneiss_brick_slab": "Losa de ladrillos de Gneis", + "block.mineralogy.gneiss_smooth": "Bloque pulido de Gneis", + "block.mineralogy.gneiss_smooth_stairs": "Escaleras pulidas de Gneis", + "block.mineralogy.gneiss_smooth_slab": "Losa pulida de Gneis", + "block.mineralogy.gneiss_smooth_brick": "Ladrillos pulidos de Gneis", + "block.mineralogy.gneiss_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Gneis", + "block.mineralogy.gneiss_smooth_brick_slab": "Losa de ladrillos pulidos de Gneis", "block.mineralogy.marble": "Mármol", "block.mineralogy.marble_stairs": "Escaleras de Mármol", "block.mineralogy.marble_slab": "Losa de Mármol", - "block.mineralogy.marble_brick": "Ladrillo de Mármol", - "block.mineralogy.marble_brick_stairs": "Escaleras de ladrillo de Mármol", - "block.mineralogy.marble_brick_slab": "Losa de ladrillo de Mármol", - "block.mineralogy.marble_smooth": "Mármol pulida", - "block.mineralogy.marble_smooth_stairs": "Escaleras de Mármol pulida", - "block.mineralogy.marble_smooth_slab": "Losa de Mármol pulida", - "block.mineralogy.marble_smooth_brick": "Ladrillo de Mármol pulido", - "block.mineralogy.marble_smooth_brick_stairs": "Escaleras de ladrillo de Mármol pulida", - "block.mineralogy.marble_smooth_brick_slab": "Losa de ladrillo de Mármol pulida", - "block.mineralogy.phyllite": "Phyllite", - "block.mineralogy.phyllite_stairs": "Escaleras de Phyllite", - "block.mineralogy.phyllite_slab": "Losa de Phyllite", - "block.mineralogy.phyllite_brick": "Ladrillo de Phyllite", - "block.mineralogy.phyllite_brick_stairs": "Escaleras de ladrillo de Phyllite", - "block.mineralogy.phyllite_brick_slab": "Losa de ladrillo de Phyllite", - "block.mineralogy.phyllite_smooth": "Phyllite pulida", - "block.mineralogy.phyllite_smooth_stairs": "Escaleras de Phyllite pulida", - "block.mineralogy.phyllite_smooth_slab": "Losa de Phyllite pulida", - "block.mineralogy.phyllite_smooth_brick": "Ladrillo de Phyllite pulido", - "block.mineralogy.phyllite_smooth_brick_stairs": "Escaleras de ladrillo de Phyllite pulida", - "block.mineralogy.phyllite_smooth_brick_slab": "Losa de ladrillo de Phyllite pulida", - "block.mineralogy.amphibolite": "Amphibolita", - "block.mineralogy.amphibolite_stairs": "Escaleras de Amphibolita", - "block.mineralogy.amphibolite_slab": "Losa de Amphibolita", - "block.mineralogy.amphibolite_brick": "Ladrillo de Amphibolita", - "block.mineralogy.amphibolite_brick_stairs": "Escaleras de ladrillo de Amphibolita", - "block.mineralogy.amphibolite_brick_slab": "Losa de ladrillo de Amphibolita", - "block.mineralogy.amphibolite_smooth": "Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_stairs": "Escaleras de Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_slab": "Losa de Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_brick": "Ladrillo de Amphibolita pulido", - "block.mineralogy.amphibolite_smooth_brick_stairs": "Escaleras de ladrillo de Amphibolita pulida", - "block.mineralogy.amphibolite_smooth_brick_slab": "Losa de ladrillo de Amphibolita pulida", + "block.mineralogy.marble_brick": "Ladrillos de Mármol", + "block.mineralogy.marble_brick_stairs": "Escaleras de ladrillos de Mármol", + "block.mineralogy.marble_brick_slab": "Losa de ladrillos de Mármol", + "block.mineralogy.marble_smooth": "Bloque pulido de Mármol", + "block.mineralogy.marble_smooth_stairs": "Escaleras pulidas de Mármol", + "block.mineralogy.marble_smooth_slab": "Losa pulida de Mármol", + "block.mineralogy.marble_smooth_brick": "Ladrillos pulidos de Mármol", + "block.mineralogy.marble_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Mármol", + "block.mineralogy.marble_smooth_brick_slab": "Losa de ladrillos pulidos de Mármol", + "block.mineralogy.phyllite": "Filita", + "block.mineralogy.phyllite_stairs": "Escaleras de Filita", + "block.mineralogy.phyllite_slab": "Losa de Filita", + "block.mineralogy.phyllite_brick": "Ladrillos de Filita", + "block.mineralogy.phyllite_brick_stairs": "Escaleras de ladrillos de Filita", + "block.mineralogy.phyllite_brick_slab": "Losa de ladrillos de Filita", + "block.mineralogy.phyllite_smooth": "Bloque pulido de Filita", + "block.mineralogy.phyllite_smooth_stairs": "Escaleras pulidas de Filita", + "block.mineralogy.phyllite_smooth_slab": "Losa pulida de Filita", + "block.mineralogy.phyllite_smooth_brick": "Ladrillos pulidos de Filita", + "block.mineralogy.phyllite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Filita", + "block.mineralogy.phyllite_smooth_brick_slab": "Losa de ladrillos pulidos de Filita", + "block.mineralogy.amphibolite": "Anfibolita", + "block.mineralogy.amphibolite_stairs": "Escaleras de Anfibolita", + "block.mineralogy.amphibolite_slab": "Losa de Anfibolita", + "block.mineralogy.amphibolite_brick": "Ladrillos de Anfibolita", + "block.mineralogy.amphibolite_brick_stairs": "Escaleras de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_brick_slab": "Losa de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_smooth": "Bloque pulido de Anfibolita", + "block.mineralogy.amphibolite_smooth_stairs": "Escaleras pulidas de Anfibolita", + "block.mineralogy.amphibolite_smooth_slab": "Losa pulida de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick": "Ladrillos pulidos de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_slab": "Losa de ladrillos pulidos de Anfibolita", "item.mineralogy.gypsum_dust": "Polvo de yeso", "item.mineralogy.sulfur_dust": "Polvo de azufre", "item.mineralogy.phosphorous_dust": "Polvo de fósforo", "item.mineralogy.nitrate_dust": "Polvo de nitrato", "item.mineralogy.mineral_fertilizer": "Fertilizante mineral", - "block.mineralogy.chert": "Esquisto", + "block.mineralogy.chert": "Sílex", "block.mineralogy.gypsum": "Yeso", - "block.mineralogy.pumice": "Piedra Pómez", + "block.mineralogy.pumice": "Piedra pómez", "block.mineralogy.sulfur_block": "Azufre", - "block.mineralogy.sulfur_ore": "Mineral de azufre", + "block.mineralogy.sulfur_ore": "Mena de azufre", "block.mineralogy.phosphorous_block": "Fósforo", - "block.mineralogy.phosphorous_ore": "Mineral de fósforo", + "block.mineralogy.phosphorous_ore": "Mena de fósforo", "block.mineralogy.nitrate_block": "Nitrato", - "block.mineralogy.nitrate_ore": "Mineral de nitrato", - "block.mineralogy.drywall_black": "Negro panel de yeso", - "block.mineralogy.drywall_red": "Rojo panel de yeso", - "block.mineralogy.drywall_green": "Verde panel de yeso", - "block.mineralogy.drywall_brown": "Marrón panel de yeso", - "block.mineralogy.drywall_blue": "Azul panel de yeso", - "block.mineralogy.drywall_purple": "Púrpura panel de yeso", - "block.mineralogy.drywall_cyan": "Cyan panel de yeso", - "block.mineralogy.drywall_silver": "Plata panel de yeso", - "block.mineralogy.drywall_gray": "Gris panel de yeso", - "block.mineralogy.drywall_pink": "Rosado panel de yeso", - "block.mineralogy.drywall_lime": "Lima panel de yeso", - "block.mineralogy.drywall_yellow": "Amarillo panel de yeso", - "block.mineralogy.drywall_light_blue": "Azul claro panel de yeso", - "block.mineralogy.drywall_magenta": "Magenta panel de yeso", - "block.mineralogy.drywall_orange": "Naranja panel de yeso", - "block.mineralogy.drywall_white": "Blanco panel de yeso", - "block.mineralogy.andesite_wall": "Pared de andesita", - "block.mineralogy.andesite_brick_wall": "Pared de ladrillo de andesita", - "block.mineralogy.andesite_smooth_wall": "Pared Pulida de Andesita", - "block.mineralogy.andesite_smooth_brick_wall": "Pared de ladrillo pulido Andesite", - "block.mineralogy.basalt_wall": "Pared de basalto", - "block.mineralogy.basalt_brick_wall": "Pared de ladrillo de basalto", - "block.mineralogy.basalt_smooth_wall": "Muro pulido de basalto", - "block.mineralogy.basalt_smooth_brick_wall": "Pared de ladrillo pulido de basalto", - "block.mineralogy.diorite_wall": "Pared de Diorita", - "block.mineralogy.diorite_brick_wall": "Pared de ladrillo de diorita", - "block.mineralogy.diorite_smooth_wall": "Diorite pulido de pared", - "block.mineralogy.diorite_smooth_brick_wall": "Pared de ladrillo pulido de diorita", - "block.mineralogy.granite_wall": "Pared de granito", - "block.mineralogy.granite_brick_wall": "Pared de ladrillo de granito", - "block.mineralogy.granite_smooth_wall": "Muro pulido de granito", - "block.mineralogy.granite_smooth_brick_wall": "Pared de ladrillo pulido de granito", - "block.mineralogy.rhyolite_wall": "Pared de riolita", - "block.mineralogy.rhyolite_brick_wall": "Pared de ladrillos de riolita", - "block.mineralogy.rhyolite_smooth_wall": "Pared pulida de riolita", - "block.mineralogy.rhyolite_smooth_brick_wall": "Pared de ladrillo pulido de riolita", - "block.mineralogy.pegmatite_wall": "Pared de Pegmatita", - "block.mineralogy.pegmatite_brick_wall": "Pared de ladrillo de pegmatita", - "block.mineralogy.pegmatite_smooth_wall": "Pared pulida de pegmatita", - "block.mineralogy.pegmatite_smooth_brick_wall": "Pared de ladrillo pulido de pegmatita", - "block.mineralogy.shale_wall": "Muro de pizarra", - "block.mineralogy.shale_brick_wall": "Pared de ladrillo de pizarra", - "block.mineralogy.shale_smooth_wall": "Pared pulida de pizarra", - "block.mineralogy.shale_smooth_brick_wall": "Pizarra, pulido, pared de ladrillo", - "block.mineralogy.conglomerate_wall": "Pared de conglomerado", - "block.mineralogy.conglomerate_brick_wall": "Pared de ladrillo conglomerado", - "block.mineralogy.conglomerate_smooth_wall": "Pared pulida de conglomerado", - "block.mineralogy.conglomerate_smooth_brick_wall": "Conglomerado, pulido, pared de ladrillo", + "block.mineralogy.nitrate_ore": "Mena de nitrato", + "block.mineralogy.drywall_black": "Panel de yeso negro", + "block.mineralogy.drywall_red": "Panel de yeso rojo", + "block.mineralogy.drywall_green": "Panel de yeso verde", + "block.mineralogy.drywall_brown": "Panel de yeso marrón", + "block.mineralogy.drywall_blue": "Panel de yeso azul", + "block.mineralogy.drywall_purple": "Panel de yeso morado", + "block.mineralogy.drywall_cyan": "Panel de yeso cian", + "block.mineralogy.drywall_silver": "Panel de yeso gris claro", + "block.mineralogy.drywall_gray": "Panel de yeso gris", + "block.mineralogy.drywall_pink": "Panel de yeso rosa", + "block.mineralogy.drywall_lime": "Panel de yeso verde lima", + "block.mineralogy.drywall_yellow": "Panel de yeso amarillo", + "block.mineralogy.drywall_light_blue": "Panel de yeso azul claro", + "block.mineralogy.drywall_magenta": "Panel de yeso magenta", + "block.mineralogy.drywall_orange": "Panel de yeso naranja", + "block.mineralogy.drywall_white": "Panel de yeso blanco", + "block.mineralogy.andesite_wall": "Muro de Andesita", + "block.mineralogy.andesite_brick_wall": "Muro de ladrillos de Andesita", + "block.mineralogy.andesite_smooth_wall": "Muro pulido de Andesita", + "block.mineralogy.andesite_smooth_brick_wall": "Muro de ladrillos pulidos de Andesita", + "block.mineralogy.basalt_wall": "Muro de Basalto", + "block.mineralogy.basalt_brick_wall": "Muro de ladrillos de Basalto", + "block.mineralogy.basalt_smooth_wall": "Muro pulido de Basalto", + "block.mineralogy.basalt_smooth_brick_wall": "Muro de ladrillos pulidos de Basalto", + "block.mineralogy.diorite_wall": "Muro de Diorita", + "block.mineralogy.diorite_brick_wall": "Muro de ladrillos de Diorita", + "block.mineralogy.diorite_smooth_wall": "Muro pulido de Diorita", + "block.mineralogy.diorite_smooth_brick_wall": "Muro de ladrillos pulidos de Diorita", + "block.mineralogy.granite_wall": "Muro de Granito", + "block.mineralogy.granite_brick_wall": "Muro de ladrillos de Granito", + "block.mineralogy.granite_smooth_wall": "Muro pulido de Granito", + "block.mineralogy.granite_smooth_brick_wall": "Muro de ladrillos pulidos de Granito", + "block.mineralogy.rhyolite_wall": "Muro de Riolita", + "block.mineralogy.rhyolite_brick_wall": "Muro de ladrillos de Riolita", + "block.mineralogy.rhyolite_smooth_wall": "Muro pulido de Riolita", + "block.mineralogy.rhyolite_smooth_brick_wall": "Muro de ladrillos pulidos de Riolita", + "block.mineralogy.pegmatite_wall": "Muro de Pegmatita", + "block.mineralogy.pegmatite_brick_wall": "Muro de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_smooth_wall": "Muro pulido de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_wall": "Muro de ladrillos pulidos de Pegmatita", + "block.mineralogy.shale_wall": "Muro de Lutita", + "block.mineralogy.shale_brick_wall": "Muro de ladrillos de Lutita", + "block.mineralogy.shale_smooth_wall": "Muro pulido de Lutita", + "block.mineralogy.shale_smooth_brick_wall": "Muro de ladrillos pulidos de Lutita", + "block.mineralogy.conglomerate_wall": "Muro de Conglomerado", + "block.mineralogy.conglomerate_brick_wall": "Muro de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_smooth_wall": "Muro pulido de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_wall": "Muro de ladrillos pulidos de Conglomerado", "block.mineralogy.dolomite_wall": "Muro de Dolomita", - "block.mineralogy.dolomite_brick_wall": "Pared de ladrillos de dolomita", - "block.mineralogy.dolomite_smooth_wall": "Pared pulida de dolomita", - "block.mineralogy.dolomite_smooth_brick_wall": "Pared de ladrillo pulido de dolomita", - "block.mineralogy.limestone_wall": "Muro de piedra caliza", - "block.mineralogy.limestone_brick_wall": "Pared de ladrillo de piedra caliza", - "block.mineralogy.limestone_smooth_wall": "Muro pulido de piedra caliza", - "block.mineralogy.limestone_smooth_brick_wall": "Pared de ladrillo pulido de piedra caliza", - "block.mineralogy.marble_wall": "Muro de mármol", - "block.mineralogy.marble_brick_wall": "Pared de ladrillo de mármol", - "block.mineralogy.marble_smooth_wall": "Mármol pulido de la pared", - "block.mineralogy.marble_smooth_brick_wall": "Mármol pulido de la pared de ladrillo", - "block.mineralogy.slate_wall": "Pared de pizarra", - "block.mineralogy.slate_brick_wall": "Pared de ladrillo de pizarra", - "block.mineralogy.slate_smooth_wall": "Pared pulida pizarra", - "block.mineralogy.slate_smooth_brick_wall": "Pared de ladrillo pulido pizarra", - "block.mineralogy.schist_wall": "Muro de esquisto", - "block.mineralogy.schist_brick_wall": "Pared de ladrillo esquist", - "block.mineralogy.schist_smooth_wall": "Esquisto de pared pulida", - "block.mineralogy.schist_smooth_brick_wall": "Pared de ladrillo pulido de esquisto", - "block.mineralogy.gneiss_wall": "Muro de gneis", - "block.mineralogy.gneiss_brick_wall": "Pared de ladrillo gneis", - "block.mineralogy.gneiss_smooth_wall": "Gneis pulido de la pared", - "block.mineralogy.gneiss_smooth_brick_wall": "Gneis pulido de la pared de ladrillo", - "block.mineralogy.phyllite_wall": "Pared de Phyllite", - "block.mineralogy.phyllite_brick_wall": "Pared de ladrillo Phyllite", - "block.mineralogy.phyllite_smooth_wall": "Phyllite pulido de pared", - "block.mineralogy.phyllite_smooth_brick_wall": "Pared de ladrillo pulido de Phyllite", - "block.mineralogy.amphibolite_wall": "Pared de anfibolita", - "block.mineralogy.amphibolite_brick_wall": "Pared de ladrillo de anfibolita", - "block.mineralogy.amphibolite_smooth_wall": "Pared pulida de anfibolita", - "block.mineralogy.amphibolite_smooth_brick_wall": "Pared de ladrillo pulido de anfibolita", - "block.mineralogy.andesite_furnace": "Horno de andesita", - "block.mineralogy.andesite_brick_furnace": "Horno de ladrillo de andesita", - "block.mineralogy.andesite_smooth_furnace": "Horno Pulida de Andesita", - "block.mineralogy.andesite_smooth_brick_furnace": "Horno de ladrillo pulido Andesite", - "block.mineralogy.basalt_furnace": "Horno de basalto", - "block.mineralogy.basalt_brick_furnace": "Horno de ladrillo de basalto", - "block.mineralogy.basalt_smooth_furnace": "Muro pulido de basalto", - "block.mineralogy.basalt_smooth_brick_furnace": "Horno de ladrillo pulido de basalto", + "block.mineralogy.dolomite_brick_wall": "Muro de ladrillos de Dolomita", + "block.mineralogy.dolomite_smooth_wall": "Muro pulido de Dolomita", + "block.mineralogy.dolomite_smooth_brick_wall": "Muro de ladrillos pulidos de Dolomita", + "block.mineralogy.limestone_wall": "Muro de Caliza", + "block.mineralogy.limestone_brick_wall": "Muro de ladrillos de Caliza", + "block.mineralogy.limestone_smooth_wall": "Muro pulido de Caliza", + "block.mineralogy.limestone_smooth_brick_wall": "Muro de ladrillos pulidos de Caliza", + "block.mineralogy.marble_wall": "Muro de Mármol", + "block.mineralogy.marble_brick_wall": "Muro de ladrillos de Mármol", + "block.mineralogy.marble_smooth_wall": "Muro pulido de Mármol", + "block.mineralogy.marble_smooth_brick_wall": "Muro de ladrillos pulidos de Mármol", + "block.mineralogy.slate_wall": "Muro de Pizarra", + "block.mineralogy.slate_brick_wall": "Muro de ladrillos de Pizarra", + "block.mineralogy.slate_smooth_wall": "Muro pulido de Pizarra", + "block.mineralogy.slate_smooth_brick_wall": "Muro de ladrillos pulidos de Pizarra", + "block.mineralogy.schist_wall": "Muro de Esquisto", + "block.mineralogy.schist_brick_wall": "Muro de ladrillos de Esquisto", + "block.mineralogy.schist_smooth_wall": "Muro pulido de Esquisto", + "block.mineralogy.schist_smooth_brick_wall": "Muro de ladrillos pulidos de Esquisto", + "block.mineralogy.gneiss_wall": "Muro de Gneis", + "block.mineralogy.gneiss_brick_wall": "Muro de ladrillos de Gneis", + "block.mineralogy.gneiss_smooth_wall": "Muro pulido de Gneis", + "block.mineralogy.gneiss_smooth_brick_wall": "Muro de ladrillos pulidos de Gneis", + "block.mineralogy.phyllite_wall": "Muro de Filita", + "block.mineralogy.phyllite_brick_wall": "Muro de ladrillos de Filita", + "block.mineralogy.phyllite_smooth_wall": "Muro pulido de Filita", + "block.mineralogy.phyllite_smooth_brick_wall": "Muro de ladrillos pulidos de Filita", + "block.mineralogy.amphibolite_wall": "Muro de Anfibolita", + "block.mineralogy.amphibolite_brick_wall": "Muro de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_smooth_wall": "Muro pulido de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_wall": "Muro de ladrillos pulidos de Anfibolita", + "block.mineralogy.andesite_furnace": "Horno de Andesita", + "block.mineralogy.andesite_brick_furnace": "Horno de ladrillos de Andesita", + "block.mineralogy.andesite_smooth_furnace": "Horno pulido de Andesita", + "block.mineralogy.andesite_smooth_brick_furnace": "Horno de ladrillos pulidos de Andesita", + "block.mineralogy.basalt_furnace": "Horno de Basalto", + "block.mineralogy.basalt_brick_furnace": "Horno de ladrillos de Basalto", + "block.mineralogy.basalt_smooth_furnace": "Horno pulido de Basalto", + "block.mineralogy.basalt_smooth_brick_furnace": "Horno de ladrillos pulidos de Basalto", "block.mineralogy.diorite_furnace": "Horno de Diorita", - "block.mineralogy.diorite_brick_furnace": "Horno de ladrillo de diorita", - "block.mineralogy.diorite_smooth_furnace": "Diorite pulido de pared", - "block.mineralogy.diorite_smooth_brick_furnace": "Horno de ladrillo pulido de diorita", - "block.mineralogy.granite_furnace": "Horno de granito", - "block.mineralogy.granite_brick_furnace": "Horno de ladrillo de granito", - "block.mineralogy.granite_smooth_furnace": "Muro pulido de granito", - "block.mineralogy.granite_smooth_brick_furnace": "Horno de ladrillo pulido de granito", - "block.mineralogy.rhyolite_furnace": "Horno de riolita", - "block.mineralogy.rhyolite_brick_furnace": "Horno de ladrillos de riolita", - "block.mineralogy.rhyolite_smooth_furnace": "Horno pulida de riolita", - "block.mineralogy.rhyolite_smooth_brick_furnace": "Horno de ladrillo pulido de riolita", + "block.mineralogy.diorite_brick_furnace": "Horno de ladrillos de Diorita", + "block.mineralogy.diorite_smooth_furnace": "Horno pulido de Diorita", + "block.mineralogy.diorite_smooth_brick_furnace": "Horno de ladrillos pulidos de Diorita", + "block.mineralogy.granite_furnace": "Horno de Granito", + "block.mineralogy.granite_brick_furnace": "Horno de ladrillos de Granito", + "block.mineralogy.granite_smooth_furnace": "Horno pulido de Granito", + "block.mineralogy.granite_smooth_brick_furnace": "Horno de ladrillos pulidos de Granito", + "block.mineralogy.rhyolite_furnace": "Horno de Riolita", + "block.mineralogy.rhyolite_brick_furnace": "Horno de ladrillos de Riolita", + "block.mineralogy.rhyolite_smooth_furnace": "Horno pulido de Riolita", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Horno de ladrillos pulidos de Riolita", "block.mineralogy.pegmatite_furnace": "Horno de Pegmatita", - "block.mineralogy.pegmatite_brick_furnace": "Horno de ladrillo de pegmatita", - "block.mineralogy.pegmatite_smooth_furnace": "Horno pulida de pegmatita", - "block.mineralogy.pegmatite_smooth_brick_furnace": "Horno de ladrillo pulido de pegmatita", - "block.mineralogy.shale_furnace": "Muro de pizarra", - "block.mineralogy.shale_brick_furnace": "Horno de ladrillo de pizarra", - "block.mineralogy.shale_smooth_furnace": "Horno pulida de pizarra", - "block.mineralogy.shale_smooth_brick_furnace": "Pizarra, pulido, pared de ladrillo", - "block.mineralogy.conglomerate_furnace": "Horno de conglomerado", - "block.mineralogy.conglomerate_brick_furnace": "Horno de ladrillo conglomerado", - "block.mineralogy.conglomerate_smooth_furnace": "Horno pulida de conglomerado", - "block.mineralogy.conglomerate_smooth_brick_furnace": "Conglomerado, pulido, pared de ladrillo", - "block.mineralogy.dolomite_furnace": "Muro de Dolomita", - "block.mineralogy.dolomite_brick_furnace": "Horno de ladrillos de dolomita", - "block.mineralogy.dolomite_smooth_furnace": "Horno pulida de dolomita", - "block.mineralogy.dolomite_smooth_brick_furnace": "Horno de ladrillo pulido de dolomita", - "block.mineralogy.limestone_furnace": "Muro de piedra caliza", - "block.mineralogy.limestone_brick_furnace": "Horno de ladrillo de piedra caliza", - "block.mineralogy.limestone_smooth_furnace": "Muro pulido de piedra caliza", - "block.mineralogy.limestone_smooth_brick_furnace": "Horno de ladrillo pulido de piedra caliza", - "block.mineralogy.marble_furnace": "Muro de mármol", - "block.mineralogy.marble_brick_furnace": "Horno de ladrillo de mármol", - "block.mineralogy.marble_smooth_furnace": "Mármol pulido de la pared", - "block.mineralogy.marble_smooth_brick_furnace": "Mármol pulido de la pared de ladrillo", - "block.mineralogy.slate_furnace": "Horno de pizarra", - "block.mineralogy.slate_brick_furnace": "Horno de ladrillo de pizarra", - "block.mineralogy.slate_smooth_furnace": "Horno pulida pizarra", - "block.mineralogy.slate_smooth_brick_furnace": "Horno de ladrillo pulido pizarra", - "block.mineralogy.schist_furnace": "Muro de esquisto", - "block.mineralogy.schist_brick_furnace": "Horno de ladrillo esquist", - "block.mineralogy.schist_smooth_furnace": "Esquisto de pared pulida", - "block.mineralogy.schist_smooth_brick_furnace": "Horno de ladrillo pulido de esquisto", - "block.mineralogy.gneiss_furnace": "Muro de gneis", - "block.mineralogy.gneiss_brick_furnace": "Horno de ladrillo gneis", - "block.mineralogy.gneiss_smooth_furnace": "Gneis pulido de la pared", - "block.mineralogy.gneiss_smooth_brick_furnace": "Gneis pulido de la pared de ladrillo", - "block.mineralogy.phyllite_furnace": "Horno de Phyllite", - "block.mineralogy.phyllite_brick_furnace": "Horno de ladrillo Phyllite", - "block.mineralogy.phyllite_smooth_furnace": "Phyllite pulido de pared", - "block.mineralogy.phyllite_smooth_brick_furnace": "Horno de ladrillo pulido de Phyllite", - "block.mineralogy.amphibolite_furnace": "Horno de anfibolita", - "block.mineralogy.amphibolite_brick_furnace": "Horno de ladrillo de anfibolita", - "block.mineralogy.amphibolite_smooth_furnace": "Horno pulida de anfibolita", - "block.mineralogy.amphibolite_smooth_brick_furnace": "Horno de ladrillo pulido de anfibolita", + "block.mineralogy.pegmatite_brick_furnace": "Horno de ladrillos de Pegmatita", + "block.mineralogy.pegmatite_smooth_furnace": "Horno pulido de Pegmatita", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Horno de ladrillos pulidos de Pegmatita", + "block.mineralogy.shale_furnace": "Horno de Lutita", + "block.mineralogy.shale_brick_furnace": "Horno de ladrillos de Lutita", + "block.mineralogy.shale_smooth_furnace": "Horno pulido de Lutita", + "block.mineralogy.shale_smooth_brick_furnace": "Horno de ladrillos pulidos de Lutita", + "block.mineralogy.conglomerate_furnace": "Horno de Conglomerado", + "block.mineralogy.conglomerate_brick_furnace": "Horno de ladrillos de Conglomerado", + "block.mineralogy.conglomerate_smooth_furnace": "Horno pulido de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Horno de ladrillos pulidos de Conglomerado", + "block.mineralogy.dolomite_furnace": "Horno de Dolomita", + "block.mineralogy.dolomite_brick_furnace": "Horno de ladrillos de Dolomita", + "block.mineralogy.dolomite_smooth_furnace": "Horno pulido de Dolomita", + "block.mineralogy.dolomite_smooth_brick_furnace": "Horno de ladrillos pulidos de Dolomita", + "block.mineralogy.limestone_furnace": "Horno de Caliza", + "block.mineralogy.limestone_brick_furnace": "Horno de ladrillos de Caliza", + "block.mineralogy.limestone_smooth_furnace": "Horno pulido de Caliza", + "block.mineralogy.limestone_smooth_brick_furnace": "Horno de ladrillos pulidos de Caliza", + "block.mineralogy.marble_furnace": "Horno de Mármol", + "block.mineralogy.marble_brick_furnace": "Horno de ladrillos de Mármol", + "block.mineralogy.marble_smooth_furnace": "Horno pulido de Mármol", + "block.mineralogy.marble_smooth_brick_furnace": "Horno de ladrillos pulidos de Mármol", + "block.mineralogy.slate_furnace": "Horno de Pizarra", + "block.mineralogy.slate_brick_furnace": "Horno de ladrillos de Pizarra", + "block.mineralogy.slate_smooth_furnace": "Horno pulido de Pizarra", + "block.mineralogy.slate_smooth_brick_furnace": "Horno de ladrillos pulidos de Pizarra", + "block.mineralogy.schist_furnace": "Horno de Esquisto", + "block.mineralogy.schist_brick_furnace": "Horno de ladrillos de Esquisto", + "block.mineralogy.schist_smooth_furnace": "Horno pulido de Esquisto", + "block.mineralogy.schist_smooth_brick_furnace": "Horno de ladrillos pulidos de Esquisto", + "block.mineralogy.gneiss_furnace": "Horno de Gneis", + "block.mineralogy.gneiss_brick_furnace": "Horno de ladrillos de Gneis", + "block.mineralogy.gneiss_smooth_furnace": "Horno pulido de Gneis", + "block.mineralogy.gneiss_smooth_brick_furnace": "Horno de ladrillos pulidos de Gneis", + "block.mineralogy.phyllite_furnace": "Horno de Filita", + "block.mineralogy.phyllite_brick_furnace": "Horno de ladrillos de Filita", + "block.mineralogy.phyllite_smooth_furnace": "Horno pulido de Filita", + "block.mineralogy.phyllite_smooth_brick_furnace": "Horno de ladrillos pulidos de Filita", + "block.mineralogy.amphibolite_furnace": "Horno de Anfibolita", + "block.mineralogy.amphibolite_brick_furnace": "Horno de ladrillos de Anfibolita", + "block.mineralogy.amphibolite_smooth_furnace": "Horno pulido de Anfibolita", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Horno de ladrillos pulidos de Anfibolita", "block.mineralogy.diabase": "Diabasa", - "block.mineralogy.diabase_stairs": "Diabasa Escalera", - "block.mineralogy.diabase_slab": "Diabasa Losa", - "block.mineralogy.diabase_brick": "Diabasa Ladrillo", - "block.mineralogy.diabase_brick_stairs": "Diabasa Escaleras de ladrillo", - "block.mineralogy.diabase_brick_slab": "Diabasa Losa de ladrillo", - "block.mineralogy.diabase_smooth": "Polished Diabasa", - "block.mineralogy.diabase_smooth_stairs": "Diabasa Escaleras pulidas", - "block.mineralogy.diabase_smooth_slab": "Diabasa Losa pulida", - "block.mineralogy.diabase_smooth_brick": "Diabasa Ladrillo pulido", - "block.mineralogy.diabase_smooth_brick_stairs": "Diabasa Polished Escaleras de ladrillo", - "block.mineralogy.diabase_smooth_brick_slab": "Diabasa Polished Losa de ladrillo", - "block.mineralogy.diabase_wall": "Diabasa pared", - "block.mineralogy.diabase_brick_wall": "Diabasa Pared de ladrillo", - "block.mineralogy.diabase_smooth_wall": "Diabasa Pared pulida", - "block.mineralogy.diabase_smooth_brick_wall": "Diabasa Ladrillo pulido pared", - "block.mineralogy.diabase_furnace": "Diabasa Horno", - "block.mineralogy.diabase_brick_furnace": "Diabasa Horno de ladrillo", - "block.mineralogy.diabase_smooth_furnace": "Diabasa Horno pulido", - "block.mineralogy.diabase_smooth_brick_furnace": "Diabasa Ladrillo pulido Horno", - "block.mineralogy.gabbro": "Gabbro", - "block.mineralogy.gabbro_stairs": "Gabbro Escalera", - "block.mineralogy.gabbro_slab": "Gabbro Losa", - "block.mineralogy.gabbro_brick": "Gabbro Ladrillo", - "block.mineralogy.gabbro_brick_stairs": "Gabbro Escaleras de ladrillo", - "block.mineralogy.gabbro_brick_slab": "Gabbro Losa de ladrillo", - "block.mineralogy.gabbro_smooth": "Polished Gabbro", - "block.mineralogy.gabbro_smooth_stairs": "Gabbro Escaleras pulidas", - "block.mineralogy.gabbro_smooth_slab": "Gabbro Losa pulida", - "block.mineralogy.gabbro_smooth_brick": "Gabbro Ladrillo pulido", - "block.mineralogy.gabbro_smooth_brick_stairs": "Gabbro Polished Escaleras de ladrillo", - "block.mineralogy.gabbro_smooth_brick_slab": "Gabbro Polished Losa de ladrillo", - "block.mineralogy.gabbro_wall": "Gabbro pared", - "block.mineralogy.gabbro_brick_wall": "Gabbro Pared de ladrillo", - "block.mineralogy.gabbro_smooth_wall": "Gabbro Pared pulida", - "block.mineralogy.gabbro_smooth_brick_wall": "Gabbro Ladrillo pulido pared", - "block.mineralogy.gabbro_furnace": "Gabbro Horno", - "block.mineralogy.gabbro_brick_furnace": "Gabbro Horno de ladrillo", - "block.mineralogy.gabbro_smooth_furnace": "Gabbro Horno pulido", - "block.mineralogy.gabbro_smooth_brick_furnace": "Gabbro Ladrillo pulido Horno", + "block.mineralogy.diabase_stairs": "Escaleras de Diabasa", + "block.mineralogy.diabase_slab": "Losa de Diabasa", + "block.mineralogy.diabase_brick": "Ladrillos de Diabasa", + "block.mineralogy.diabase_brick_stairs": "Escaleras de ladrillos de Diabasa", + "block.mineralogy.diabase_brick_slab": "Losa de ladrillos de Diabasa", + "block.mineralogy.diabase_smooth": "Bloque pulido de Diabasa", + "block.mineralogy.diabase_smooth_stairs": "Escaleras pulidas de Diabasa", + "block.mineralogy.diabase_smooth_slab": "Losa pulida de Diabasa", + "block.mineralogy.diabase_smooth_brick": "Ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_smooth_brick_slab": "Losa de ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_wall": "Muro de Diabasa", + "block.mineralogy.diabase_brick_wall": "Muro de ladrillos de Diabasa", + "block.mineralogy.diabase_smooth_wall": "Muro pulido de Diabasa", + "block.mineralogy.diabase_smooth_brick_wall": "Muro de ladrillos pulidos de Diabasa", + "block.mineralogy.diabase_furnace": "Horno de Diabasa", + "block.mineralogy.diabase_brick_furnace": "Horno de ladrillos de Diabasa", + "block.mineralogy.diabase_smooth_furnace": "Horno pulido de Diabasa", + "block.mineralogy.diabase_smooth_brick_furnace": "Horno de ladrillos pulidos de Diabasa", + "block.mineralogy.gabbro": "Gabro", + "block.mineralogy.gabbro_stairs": "Escaleras de Gabro", + "block.mineralogy.gabbro_slab": "Losa de Gabro", + "block.mineralogy.gabbro_brick": "Ladrillos de Gabro", + "block.mineralogy.gabbro_brick_stairs": "Escaleras de ladrillos de Gabro", + "block.mineralogy.gabbro_brick_slab": "Losa de ladrillos de Gabro", + "block.mineralogy.gabbro_smooth": "Bloque pulido de Gabro", + "block.mineralogy.gabbro_smooth_stairs": "Escaleras pulidas de Gabro", + "block.mineralogy.gabbro_smooth_slab": "Losa pulida de Gabro", + "block.mineralogy.gabbro_smooth_brick": "Ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_slab": "Losa de ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_wall": "Muro de Gabro", + "block.mineralogy.gabbro_brick_wall": "Muro de ladrillos de Gabro", + "block.mineralogy.gabbro_smooth_wall": "Muro pulido de Gabro", + "block.mineralogy.gabbro_smooth_brick_wall": "Muro de ladrillos pulidos de Gabro", + "block.mineralogy.gabbro_furnace": "Horno de Gabro", + "block.mineralogy.gabbro_brick_furnace": "Horno de ladrillos de Gabro", + "block.mineralogy.gabbro_smooth_furnace": "Horno pulido de Gabro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Horno de ladrillos pulidos de Gabro", "block.mineralogy.peridotite": "Peridotita", - "block.mineralogy.peridotite_stairs": "Peridotita Escalera", - "block.mineralogy.peridotite_slab": "Peridotita Losa", - "block.mineralogy.peridotite_brick": "Peridotita Ladrillo", - "block.mineralogy.peridotite_brick_stairs": "Peridotita Escaleras de ladrillo", - "block.mineralogy.peridotite_brick_slab": "Peridotita Losa de ladrillo", - "block.mineralogy.peridotite_smooth": "Polished Peridotita", - "block.mineralogy.peridotite_smooth_stairs": "Peridotita Escaleras pulidas", - "block.mineralogy.peridotite_smooth_slab": "Peridotita Losa pulida", - "block.mineralogy.peridotite_smooth_brick": "Peridotita Ladrillo pulido", - "block.mineralogy.peridotite_smooth_brick_stairs": "Peridotita Polished Escaleras de ladrillo", - "block.mineralogy.peridotite_smooth_brick_slab": "Peridotita Polished Losa de ladrillo", - "block.mineralogy.peridotite_wall": "Peridotita pared", - "block.mineralogy.peridotite_brick_wall": "Peridotita Pared de ladrillo", - "block.mineralogy.peridotite_smooth_wall": "Peridotita Pared pulida", - "block.mineralogy.peridotite_smooth_brick_wall": "Peridotita Ladrillo pulido pared", - "block.mineralogy.peridotite_furnace": "Peridotita Horno", - "block.mineralogy.peridotite_brick_furnace": "Peridotita Horno de ladrillo", - "block.mineralogy.peridotite_smooth_furnace": "Peridotita Horno pulido", - "block.mineralogy.peridotite_smooth_brick_furnace": "Peridotita Ladrillo pulido Horno", + "block.mineralogy.peridotite_stairs": "Escaleras de Peridotita", + "block.mineralogy.peridotite_slab": "Losa de Peridotita", + "block.mineralogy.peridotite_brick": "Ladrillos de Peridotita", + "block.mineralogy.peridotite_brick_stairs": "Escaleras de ladrillos de Peridotita", + "block.mineralogy.peridotite_brick_slab": "Losa de ladrillos de Peridotita", + "block.mineralogy.peridotite_smooth": "Bloque pulido de Peridotita", + "block.mineralogy.peridotite_smooth_stairs": "Escaleras pulidas de Peridotita", + "block.mineralogy.peridotite_smooth_slab": "Losa pulida de Peridotita", + "block.mineralogy.peridotite_smooth_brick": "Ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_smooth_brick_slab": "Losa de ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_wall": "Muro de Peridotita", + "block.mineralogy.peridotite_brick_wall": "Muro de ladrillos de Peridotita", + "block.mineralogy.peridotite_smooth_wall": "Muro pulido de Peridotita", + "block.mineralogy.peridotite_smooth_brick_wall": "Muro de ladrillos pulidos de Peridotita", + "block.mineralogy.peridotite_furnace": "Horno de Peridotita", + "block.mineralogy.peridotite_brick_furnace": "Horno de ladrillos de Peridotita", + "block.mineralogy.peridotite_smooth_furnace": "Horno pulido de Peridotita", + "block.mineralogy.peridotite_smooth_brick_furnace": "Horno de ladrillos pulidos de Peridotita", "block.mineralogy.basaltic_glass": "Vidrio basáltico", - "block.mineralogy.basaltic_glass_stairs": "Vidrio basáltico Escalera", - "block.mineralogy.basaltic_glass_slab": "Vidrio basáltico Losa", - "block.mineralogy.basaltic_glass_brick": "Vidrio basáltico Ladrillo", - "block.mineralogy.basaltic_glass_brick_stairs": "Vidrio basáltico Escaleras de ladrillo", - "block.mineralogy.basaltic_glass_brick_slab": "Vidrio basáltico Losa de ladrillo", - "block.mineralogy.basaltic_glass_smooth": "Polished Vidrio basáltico", - "block.mineralogy.basaltic_glass_smooth_stairs": "Vidrio basáltico Escaleras pulidas", - "block.mineralogy.basaltic_glass_smooth_slab": "Vidrio basáltico Losa pulida", - "block.mineralogy.basaltic_glass_smooth_brick": "Vidrio basáltico Ladrillo pulido", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Vidrio basáltico Polished Escaleras de ladrillo", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "Vidrio basáltico Polished Losa de ladrillo", - "block.mineralogy.basaltic_glass_wall": "Vidrio basáltico pared", - "block.mineralogy.basaltic_glass_brick_wall": "Vidrio basáltico Pared de ladrillo", - "block.mineralogy.basaltic_glass_smooth_wall": "Vidrio basáltico Pared pulida", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "Vidrio basáltico Ladrillo pulido pared", - "block.mineralogy.basaltic_glass_furnace": "Vidrio basáltico Horno", - "block.mineralogy.basaltic_glass_brick_furnace": "Vidrio basáltico Horno de ladrillo", - "block.mineralogy.basaltic_glass_smooth_furnace": "Vidrio basáltico Horno pulido", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Vidrio basáltico Ladrillo pulido Horno", + "block.mineralogy.basaltic_glass_stairs": "Escaleras de Vidrio basáltico", + "block.mineralogy.basaltic_glass_slab": "Losa de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick": "Ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_stairs": "Escaleras de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_slab": "Losa de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth": "Bloque pulido de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_stairs": "Escaleras pulidas de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_slab": "Losa pulida de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick": "Ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Losa de ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_wall": "Muro de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_wall": "Muro de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_wall": "Muro pulido de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Muro de ladrillos pulidos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_furnace": "Horno de Vidrio basáltico", + "block.mineralogy.basaltic_glass_brick_furnace": "Horno de ladrillos de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_furnace": "Horno pulido de Vidrio basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Horno de ladrillos pulidos de Vidrio basáltico", "block.mineralogy.scoria": "Escoria", - "block.mineralogy.scoria_stairs": "Escoria Escalera", - "block.mineralogy.scoria_slab": "Escoria Losa", - "block.mineralogy.scoria_brick": "Escoria Ladrillo", - "block.mineralogy.scoria_brick_stairs": "Escoria Escaleras de ladrillo", - "block.mineralogy.scoria_brick_slab": "Escoria Losa de ladrillo", - "block.mineralogy.scoria_smooth": "Polished Escoria", - "block.mineralogy.scoria_smooth_stairs": "Escoria Escaleras pulidas", - "block.mineralogy.scoria_smooth_slab": "Escoria Losa pulida", - "block.mineralogy.scoria_smooth_brick": "Escoria Ladrillo pulido", - "block.mineralogy.scoria_smooth_brick_stairs": "Escoria Polished Escaleras de ladrillo", - "block.mineralogy.scoria_smooth_brick_slab": "Escoria Polished Losa de ladrillo", - "block.mineralogy.scoria_wall": "Escoria pared", - "block.mineralogy.scoria_brick_wall": "Escoria Pared de ladrillo", - "block.mineralogy.scoria_smooth_wall": "Escoria Pared pulida", - "block.mineralogy.scoria_smooth_brick_wall": "Escoria Ladrillo pulido pared", - "block.mineralogy.scoria_furnace": "Escoria Horno", - "block.mineralogy.scoria_brick_furnace": "Escoria Horno de ladrillo", - "block.mineralogy.scoria_smooth_furnace": "Escoria Horno pulido", - "block.mineralogy.scoria_smooth_brick_furnace": "Escoria Ladrillo pulido Horno", + "block.mineralogy.scoria_stairs": "Escaleras de Escoria", + "block.mineralogy.scoria_slab": "Losa de Escoria", + "block.mineralogy.scoria_brick": "Ladrillos de Escoria", + "block.mineralogy.scoria_brick_stairs": "Escaleras de ladrillos de Escoria", + "block.mineralogy.scoria_brick_slab": "Losa de ladrillos de Escoria", + "block.mineralogy.scoria_smooth": "Bloque pulido de Escoria", + "block.mineralogy.scoria_smooth_stairs": "Escaleras pulidas de Escoria", + "block.mineralogy.scoria_smooth_slab": "Losa pulida de Escoria", + "block.mineralogy.scoria_smooth_brick": "Ladrillos pulidos de Escoria", + "block.mineralogy.scoria_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Escoria", + "block.mineralogy.scoria_smooth_brick_slab": "Losa de ladrillos pulidos de Escoria", + "block.mineralogy.scoria_wall": "Muro de Escoria", + "block.mineralogy.scoria_brick_wall": "Muro de ladrillos de Escoria", + "block.mineralogy.scoria_smooth_wall": "Muro pulido de Escoria", + "block.mineralogy.scoria_smooth_brick_wall": "Muro de ladrillos pulidos de Escoria", + "block.mineralogy.scoria_furnace": "Horno de Escoria", + "block.mineralogy.scoria_brick_furnace": "Horno de ladrillos de Escoria", + "block.mineralogy.scoria_smooth_furnace": "Horno pulido de Escoria", + "block.mineralogy.scoria_smooth_brick_furnace": "Horno de ladrillos pulidos de Escoria", "block.mineralogy.tuff": "Toba", - "block.mineralogy.tuff_stairs": "Toba Escalera", - "block.mineralogy.tuff_slab": "Toba Losa", - "block.mineralogy.tuff_brick": "Toba Ladrillo", - "block.mineralogy.tuff_brick_stairs": "Toba Escaleras de ladrillo", - "block.mineralogy.tuff_brick_slab": "Toba Losa de ladrillo", - "block.mineralogy.tuff_smooth": "Polished Toba", - "block.mineralogy.tuff_smooth_stairs": "Toba Escaleras pulidas", - "block.mineralogy.tuff_smooth_slab": "Toba Losa pulida", - "block.mineralogy.tuff_smooth_brick": "Toba Ladrillo pulido", - "block.mineralogy.tuff_smooth_brick_stairs": "Toba Polished Escaleras de ladrillo", - "block.mineralogy.tuff_smooth_brick_slab": "Toba Polished Losa de ladrillo", - "block.mineralogy.tuff_wall": "Toba pared", - "block.mineralogy.tuff_brick_wall": "Toba Pared de ladrillo", - "block.mineralogy.tuff_smooth_wall": "Toba Pared pulida", - "block.mineralogy.tuff_smooth_brick_wall": "Toba Ladrillo pulido pared", - "block.mineralogy.tuff_furnace": "Toba Horno", - "block.mineralogy.tuff_brick_furnace": "Toba Horno de ladrillo", - "block.mineralogy.tuff_smooth_furnace": "Toba Horno pulido", - "block.mineralogy.tuff_smooth_brick_furnace": "Toba Ladrillo pulido Horno", - "block.mineralogy.siltstone": "Siltstone", - "block.mineralogy.siltstone_stairs": "Siltstone Escalera", - "block.mineralogy.siltstone_slab": "Siltstone Losa", - "block.mineralogy.siltstone_brick": "Siltstone Ladrillo", - "block.mineralogy.siltstone_brick_stairs": "Siltstone Escaleras de ladrillo", - "block.mineralogy.siltstone_brick_slab": "Siltstone Losa de ladrillo", - "block.mineralogy.siltstone_smooth": "Polished Siltstone", - "block.mineralogy.siltstone_smooth_stairs": "Siltstone Escaleras pulidas", - "block.mineralogy.siltstone_smooth_slab": "Siltstone Losa pulida", - "block.mineralogy.siltstone_smooth_brick": "Siltstone Ladrillo pulido", - "block.mineralogy.siltstone_smooth_brick_stairs": "Siltstone Polished Escaleras de ladrillo", - "block.mineralogy.siltstone_smooth_brick_slab": "Siltstone Polished Losa de ladrillo", - "block.mineralogy.siltstone_wall": "Siltstone pared", - "block.mineralogy.siltstone_brick_wall": "Siltstone Pared de ladrillo", - "block.mineralogy.siltstone_smooth_wall": "Siltstone Pared pulida", - "block.mineralogy.siltstone_smooth_brick_wall": "Siltstone Ladrillo pulido pared", - "block.mineralogy.siltstone_furnace": "Siltstone Horno", - "block.mineralogy.siltstone_brick_furnace": "Siltstone Horno de ladrillo", - "block.mineralogy.siltstone_smooth_furnace": "Siltstone Horno pulido", - "block.mineralogy.siltstone_smooth_brick_furnace": "Siltstone Ladrillo pulido Horno", + "block.mineralogy.tuff_stairs": "Escaleras de Toba", + "block.mineralogy.tuff_slab": "Losa de Toba", + "block.mineralogy.tuff_brick": "Ladrillos de Toba", + "block.mineralogy.tuff_brick_stairs": "Escaleras de ladrillos de Toba", + "block.mineralogy.tuff_brick_slab": "Losa de ladrillos de Toba", + "block.mineralogy.tuff_smooth": "Bloque pulido de Toba", + "block.mineralogy.tuff_smooth_stairs": "Escaleras pulidas de Toba", + "block.mineralogy.tuff_smooth_slab": "Losa pulida de Toba", + "block.mineralogy.tuff_smooth_brick": "Ladrillos pulidos de Toba", + "block.mineralogy.tuff_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Toba", + "block.mineralogy.tuff_smooth_brick_slab": "Losa de ladrillos pulidos de Toba", + "block.mineralogy.tuff_wall": "Muro de Toba", + "block.mineralogy.tuff_brick_wall": "Muro de ladrillos de Toba", + "block.mineralogy.tuff_smooth_wall": "Muro pulido de Toba", + "block.mineralogy.tuff_smooth_brick_wall": "Muro de ladrillos pulidos de Toba", + "block.mineralogy.tuff_furnace": "Horno de Toba", + "block.mineralogy.tuff_brick_furnace": "Horno de ladrillos de Toba", + "block.mineralogy.tuff_smooth_furnace": "Horno pulido de Toba", + "block.mineralogy.tuff_smooth_brick_furnace": "Horno de ladrillos pulidos de Toba", + "block.mineralogy.siltstone": "Limolita", + "block.mineralogy.siltstone_stairs": "Escaleras de Limolita", + "block.mineralogy.siltstone_slab": "Losa de Limolita", + "block.mineralogy.siltstone_brick": "Ladrillos de Limolita", + "block.mineralogy.siltstone_brick_stairs": "Escaleras de ladrillos de Limolita", + "block.mineralogy.siltstone_brick_slab": "Losa de ladrillos de Limolita", + "block.mineralogy.siltstone_smooth": "Bloque pulido de Limolita", + "block.mineralogy.siltstone_smooth_stairs": "Escaleras pulidas de Limolita", + "block.mineralogy.siltstone_smooth_slab": "Losa pulida de Limolita", + "block.mineralogy.siltstone_smooth_brick": "Ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_smooth_brick_slab": "Losa de ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_wall": "Muro de Limolita", + "block.mineralogy.siltstone_brick_wall": "Muro de ladrillos de Limolita", + "block.mineralogy.siltstone_smooth_wall": "Muro pulido de Limolita", + "block.mineralogy.siltstone_smooth_brick_wall": "Muro de ladrillos pulidos de Limolita", + "block.mineralogy.siltstone_furnace": "Horno de Limolita", + "block.mineralogy.siltstone_brick_furnace": "Horno de ladrillos de Limolita", + "block.mineralogy.siltstone_smooth_furnace": "Horno pulido de Limolita", + "block.mineralogy.siltstone_smooth_brick_furnace": "Horno de ladrillos pulidos de Limolita", "block.mineralogy.rock_salt": "Sal de roca", - "block.mineralogy.rock_salt_stairs": "Sal de roca Escalera", - "block.mineralogy.rock_salt_slab": "Sal de roca Losa", - "block.mineralogy.rock_salt_brick": "Sal de roca Ladrillo", - "block.mineralogy.rock_salt_brick_stairs": "Sal de roca Escaleras de ladrillo", - "block.mineralogy.rock_salt_brick_slab": "Sal de roca Losa de ladrillo", - "block.mineralogy.rock_salt_smooth": "Polished Sal de roca", - "block.mineralogy.rock_salt_smooth_stairs": "Sal de roca Escaleras pulidas", - "block.mineralogy.rock_salt_smooth_slab": "Sal de roca Losa pulida", - "block.mineralogy.rock_salt_smooth_brick": "Sal de roca Ladrillo pulido", - "block.mineralogy.rock_salt_smooth_brick_stairs": "Sal de roca Polished Escaleras de ladrillo", - "block.mineralogy.rock_salt_smooth_brick_slab": "Sal de roca Polished Losa de ladrillo", - "block.mineralogy.rock_salt_wall": "Sal de roca pared", - "block.mineralogy.rock_salt_brick_wall": "Sal de roca Pared de ladrillo", - "block.mineralogy.rock_salt_smooth_wall": "Sal de roca Pared pulida", - "block.mineralogy.rock_salt_smooth_brick_wall": "Sal de roca Ladrillo pulido pared", - "block.mineralogy.rock_salt_furnace": "Sal de roca Horno", - "block.mineralogy.rock_salt_brick_furnace": "Sal de roca Horno de ladrillo", - "block.mineralogy.rock_salt_smooth_furnace": "Sal de roca Horno pulido", - "block.mineralogy.rock_salt_smooth_brick_furnace": "Sal de roca Ladrillo pulido Horno", - "block.mineralogy.hornfels": "Hornfels", - "block.mineralogy.hornfels_stairs": "Hornfels Escalera", - "block.mineralogy.hornfels_slab": "Hornfels Losa", - "block.mineralogy.hornfels_brick": "Hornfels Ladrillo", - "block.mineralogy.hornfels_brick_stairs": "Hornfels Escaleras de ladrillo", - "block.mineralogy.hornfels_brick_slab": "Hornfels Losa de ladrillo", - "block.mineralogy.hornfels_smooth": "Polished Hornfels", - "block.mineralogy.hornfels_smooth_stairs": "Hornfels Escaleras pulidas", - "block.mineralogy.hornfels_smooth_slab": "Hornfels Losa pulida", - "block.mineralogy.hornfels_smooth_brick": "Hornfels Ladrillo pulido", - "block.mineralogy.hornfels_smooth_brick_stairs": "Hornfels Polished Escaleras de ladrillo", - "block.mineralogy.hornfels_smooth_brick_slab": "Hornfels Polished Losa de ladrillo", - "block.mineralogy.hornfels_wall": "Hornfels pared", - "block.mineralogy.hornfels_brick_wall": "Hornfels Pared de ladrillo", - "block.mineralogy.hornfels_smooth_wall": "Hornfels Pared pulida", - "block.mineralogy.hornfels_smooth_brick_wall": "Hornfels Ladrillo pulido pared", - "block.mineralogy.hornfels_furnace": "Hornfels Horno", - "block.mineralogy.hornfels_brick_furnace": "Hornfels Horno de ladrillo", - "block.mineralogy.hornfels_smooth_furnace": "Hornfels Horno pulido", - "block.mineralogy.hornfels_smooth_brick_furnace": "Hornfels Ladrillo pulido Horno", + "block.mineralogy.rock_salt_stairs": "Escaleras de Sal de roca", + "block.mineralogy.rock_salt_slab": "Losa de Sal de roca", + "block.mineralogy.rock_salt_brick": "Ladrillos de Sal de roca", + "block.mineralogy.rock_salt_brick_stairs": "Escaleras de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_brick_slab": "Losa de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_smooth": "Bloque pulido de Sal de roca", + "block.mineralogy.rock_salt_smooth_stairs": "Escaleras pulidas de Sal de roca", + "block.mineralogy.rock_salt_smooth_slab": "Losa pulida de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick": "Ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_slab": "Losa de ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_wall": "Muro de Sal de roca", + "block.mineralogy.rock_salt_brick_wall": "Muro de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_smooth_wall": "Muro pulido de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_wall": "Muro de ladrillos pulidos de Sal de roca", + "block.mineralogy.rock_salt_furnace": "Horno de Sal de roca", + "block.mineralogy.rock_salt_brick_furnace": "Horno de ladrillos de Sal de roca", + "block.mineralogy.rock_salt_smooth_furnace": "Horno pulido de Sal de roca", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Horno de ladrillos pulidos de Sal de roca", + "block.mineralogy.hornfels": "Corneana", + "block.mineralogy.hornfels_stairs": "Escaleras de Corneana", + "block.mineralogy.hornfels_slab": "Losa de Corneana", + "block.mineralogy.hornfels_brick": "Ladrillos de Corneana", + "block.mineralogy.hornfels_brick_stairs": "Escaleras de ladrillos de Corneana", + "block.mineralogy.hornfels_brick_slab": "Losa de ladrillos de Corneana", + "block.mineralogy.hornfels_smooth": "Bloque pulido de Corneana", + "block.mineralogy.hornfels_smooth_stairs": "Escaleras pulidas de Corneana", + "block.mineralogy.hornfels_smooth_slab": "Losa pulida de Corneana", + "block.mineralogy.hornfels_smooth_brick": "Ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_smooth_brick_slab": "Losa de ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_wall": "Muro de Corneana", + "block.mineralogy.hornfels_brick_wall": "Muro de ladrillos de Corneana", + "block.mineralogy.hornfels_smooth_wall": "Muro pulido de Corneana", + "block.mineralogy.hornfels_smooth_brick_wall": "Muro de ladrillos pulidos de Corneana", + "block.mineralogy.hornfels_furnace": "Horno de Corneana", + "block.mineralogy.hornfels_brick_furnace": "Horno de ladrillos de Corneana", + "block.mineralogy.hornfels_smooth_furnace": "Horno pulido de Corneana", + "block.mineralogy.hornfels_smooth_brick_furnace": "Horno de ladrillos pulidos de Corneana", "block.mineralogy.quartzite": "Cuarcita", - "block.mineralogy.quartzite_stairs": "Cuarcita Escalera", - "block.mineralogy.quartzite_slab": "Cuarcita Losa", - "block.mineralogy.quartzite_brick": "Cuarcita Ladrillo", - "block.mineralogy.quartzite_brick_stairs": "Cuarcita Escaleras de ladrillo", - "block.mineralogy.quartzite_brick_slab": "Cuarcita Losa de ladrillo", - "block.mineralogy.quartzite_smooth": "Polished Cuarcita", - "block.mineralogy.quartzite_smooth_stairs": "Cuarcita Escaleras pulidas", - "block.mineralogy.quartzite_smooth_slab": "Cuarcita Losa pulida", - "block.mineralogy.quartzite_smooth_brick": "Cuarcita Ladrillo pulido", - "block.mineralogy.quartzite_smooth_brick_stairs": "Cuarcita Polished Escaleras de ladrillo", - "block.mineralogy.quartzite_smooth_brick_slab": "Cuarcita Polished Losa de ladrillo", - "block.mineralogy.quartzite_wall": "Cuarcita pared", - "block.mineralogy.quartzite_brick_wall": "Cuarcita Pared de ladrillo", - "block.mineralogy.quartzite_smooth_wall": "Cuarcita Pared pulida", - "block.mineralogy.quartzite_smooth_brick_wall": "Cuarcita Ladrillo pulido pared", - "block.mineralogy.quartzite_furnace": "Cuarcita Horno", - "block.mineralogy.quartzite_brick_furnace": "Cuarcita Horno de ladrillo", - "block.mineralogy.quartzite_smooth_furnace": "Cuarcita Horno pulido", - "block.mineralogy.quartzite_smooth_brick_furnace": "Cuarcita Ladrillo pulido Horno", + "block.mineralogy.quartzite_stairs": "Escaleras de Cuarcita", + "block.mineralogy.quartzite_slab": "Losa de Cuarcita", + "block.mineralogy.quartzite_brick": "Ladrillos de Cuarcita", + "block.mineralogy.quartzite_brick_stairs": "Escaleras de ladrillos de Cuarcita", + "block.mineralogy.quartzite_brick_slab": "Losa de ladrillos de Cuarcita", + "block.mineralogy.quartzite_smooth": "Bloque pulido de Cuarcita", + "block.mineralogy.quartzite_smooth_stairs": "Escaleras pulidas de Cuarcita", + "block.mineralogy.quartzite_smooth_slab": "Losa pulida de Cuarcita", + "block.mineralogy.quartzite_smooth_brick": "Ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_slab": "Losa de ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_wall": "Muro de Cuarcita", + "block.mineralogy.quartzite_brick_wall": "Muro de ladrillos de Cuarcita", + "block.mineralogy.quartzite_smooth_wall": "Muro pulido de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_wall": "Muro de ladrillos pulidos de Cuarcita", + "block.mineralogy.quartzite_furnace": "Horno de Cuarcita", + "block.mineralogy.quartzite_brick_furnace": "Horno de ladrillos de Cuarcita", + "block.mineralogy.quartzite_smooth_furnace": "Horno pulido de Cuarcita", + "block.mineralogy.quartzite_smooth_brick_furnace": "Horno de ladrillos pulidos de Cuarcita", "block.mineralogy.novaculite": "Novaculita", - "block.mineralogy.novaculite_stairs": "Novaculita Escalera", - "block.mineralogy.novaculite_slab": "Novaculita Losa", - "block.mineralogy.novaculite_brick": "Novaculita Ladrillo", - "block.mineralogy.novaculite_brick_stairs": "Novaculita Escaleras de ladrillo", - "block.mineralogy.novaculite_brick_slab": "Novaculita Losa de ladrillo", - "block.mineralogy.novaculite_smooth": "Polished Novaculita", - "block.mineralogy.novaculite_smooth_stairs": "Novaculita Escaleras pulidas", - "block.mineralogy.novaculite_smooth_slab": "Novaculita Losa pulida", - "block.mineralogy.novaculite_smooth_brick": "Novaculita Ladrillo pulido", - "block.mineralogy.novaculite_smooth_brick_stairs": "Novaculita Polished Escaleras de ladrillo", - "block.mineralogy.novaculite_smooth_brick_slab": "Novaculita Polished Losa de ladrillo", - "block.mineralogy.novaculite_wall": "Novaculita pared", - "block.mineralogy.novaculite_brick_wall": "Novaculita Pared de ladrillo", - "block.mineralogy.novaculite_smooth_wall": "Novaculita Pared pulida", - "block.mineralogy.novaculite_smooth_brick_wall": "Novaculita Ladrillo pulido pared", - "block.mineralogy.novaculite_furnace": "Novaculita Horno", - "block.mineralogy.novaculite_brick_furnace": "Novaculita Horno de ladrillo", - "block.mineralogy.novaculite_smooth_furnace": "Novaculita Horno pulido", - "block.mineralogy.novaculite_smooth_brick_furnace": "Novaculita Ladrillo pulido Horno", + "block.mineralogy.novaculite_stairs": "Escaleras de Novaculita", + "block.mineralogy.novaculite_slab": "Losa de Novaculita", + "block.mineralogy.novaculite_brick": "Ladrillos de Novaculita", + "block.mineralogy.novaculite_brick_stairs": "Escaleras de ladrillos de Novaculita", + "block.mineralogy.novaculite_brick_slab": "Losa de ladrillos de Novaculita", + "block.mineralogy.novaculite_smooth": "Bloque pulido de Novaculita", + "block.mineralogy.novaculite_smooth_stairs": "Escaleras pulidas de Novaculita", + "block.mineralogy.novaculite_smooth_slab": "Losa pulida de Novaculita", + "block.mineralogy.novaculite_smooth_brick": "Ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_stairs": "Escaleras de ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_slab": "Losa de ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_wall": "Muro de Novaculita", + "block.mineralogy.novaculite_brick_wall": "Muro de ladrillos de Novaculita", + "block.mineralogy.novaculite_smooth_wall": "Muro pulido de Novaculita", + "block.mineralogy.novaculite_smooth_brick_wall": "Muro de ladrillos pulidos de Novaculita", + "block.mineralogy.novaculite_furnace": "Horno de Novaculita", + "block.mineralogy.novaculite_brick_furnace": "Horno de ladrillos de Novaculita", + "block.mineralogy.novaculite_smooth_furnace": "Horno pulido de Novaculita", + "block.mineralogy.novaculite_smooth_brick_furnace": "Horno de ladrillos pulidos de Novaculita", "block.mineralogy.chalk": "Tiza", "item.mineralogy.chalk_dust": "Polvo de tiza", "item.mineralogy.salt_dust": "Sal", "item.mineralogy.rock_salt_dust": "Cristales de sal de roca", "block.mineralogy.rocksaltlamp": "Lámpara de sal de roca", "block.mineralogy.rocksaltstreetlamp": "Farola de sal de roca", - "block.mineralogy.andesite_relief_axe": "Andesita Alivio del hacha", - "block.mineralogy.andesite_relief_blank": "Andesita Alivio en blanco", - "block.mineralogy.andesite_relief_cross": "Andesita Alivio cruzado", - "block.mineralogy.andesite_relief_hammer": "Andesita Alivio del martillo", - "block.mineralogy.andesite_relief_hoe": "Andesita Alivio de azada", - "block.mineralogy.andesite_relief_horizontal": "Andesita Alivio horizontal", - "block.mineralogy.andesite_relief_i": "Andesita I alivio", - "block.mineralogy.andesite_relief_left": "Andesita Alivio izquierdo", - "block.mineralogy.andesite_relief_pickaxe": "Andesita Alivio de pico", - "block.mineralogy.andesite_relief_plus": "Andesita Más alivio", - "block.mineralogy.andesite_relief_right": "Andesita Alivio correcto", - "block.mineralogy.andesite_relief_sword": "Andesita Alivio de espada", - "block.mineralogy.andesite_relief_vertical": "Andesita Alivio vertical", - "block.mineralogy.basalt_relief_axe": "Basalto Alivio del hacha", - "block.mineralogy.basalt_relief_blank": "Basalto Alivio en blanco", - "block.mineralogy.basalt_relief_cross": "Basalto Alivio cruzado", - "block.mineralogy.basalt_relief_hammer": "Basalto Alivio del martillo", - "block.mineralogy.basalt_relief_hoe": "Basalto Alivio de azada", - "block.mineralogy.basalt_relief_horizontal": "Basalto Alivio horizontal", - "block.mineralogy.basalt_relief_i": "Basalto I alivio", - "block.mineralogy.basalt_relief_left": "Basalto Alivio izquierdo", - "block.mineralogy.basalt_relief_pickaxe": "Basalto Alivio de pico", - "block.mineralogy.basalt_relief_plus": "Basalto Más alivio", - "block.mineralogy.basalt_relief_right": "Basalto Alivio correcto", - "block.mineralogy.basalt_relief_sword": "Basalto Alivio de espada", - "block.mineralogy.basalt_relief_vertical": "Basalto Alivio vertical", - "block.mineralogy.diorite_relief_axe": "Diorita Alivio del hacha", - "block.mineralogy.diorite_relief_blank": "Diorita Alivio en blanco", - "block.mineralogy.diorite_relief_cross": "Diorita Alivio cruzado", - "block.mineralogy.diorite_relief_hammer": "Diorita Alivio del martillo", - "block.mineralogy.diorite_relief_hoe": "Diorita Alivio de azada", - "block.mineralogy.diorite_relief_horizontal": "Diorita Alivio horizontal", - "block.mineralogy.diorite_relief_i": "Diorita I alivio", - "block.mineralogy.diorite_relief_left": "Diorita Alivio izquierdo", - "block.mineralogy.diorite_relief_pickaxe": "Diorita Alivio de pico", - "block.mineralogy.diorite_relief_plus": "Diorita Más alivio", - "block.mineralogy.diorite_relief_right": "Diorita Alivio correcto", - "block.mineralogy.diorite_relief_sword": "Diorita Alivio de espada", - "block.mineralogy.diorite_relief_vertical": "Diorita Alivio vertical", - "block.mineralogy.granite_relief_axe": "Granito Alivio del hacha", - "block.mineralogy.granite_relief_blank": "Granito Alivio en blanco", - "block.mineralogy.granite_relief_cross": "Granito Alivio cruzado", - "block.mineralogy.granite_relief_hammer": "Granito Alivio del martillo", - "block.mineralogy.granite_relief_hoe": "Granito Alivio de azada", - "block.mineralogy.granite_relief_horizontal": "Granito Alivio horizontal", - "block.mineralogy.granite_relief_i": "Granito I alivio", - "block.mineralogy.granite_relief_left": "Granito Alivio izquierdo", - "block.mineralogy.granite_relief_pickaxe": "Granito Alivio de pico", - "block.mineralogy.granite_relief_plus": "Granito Más alivio", - "block.mineralogy.granite_relief_right": "Granito Alivio correcto", - "block.mineralogy.granite_relief_sword": "Granito Alivio de espada", - "block.mineralogy.granite_relief_vertical": "Granito Alivio vertical", - "block.mineralogy.rhyolite_relief_axe": "Riolita Alivio del hacha", - "block.mineralogy.rhyolite_relief_blank": "Riolita Alivio en blanco", - "block.mineralogy.rhyolite_relief_cross": "Riolita Alivio cruzado", - "block.mineralogy.rhyolite_relief_hammer": "Riolita Alivio del martillo", - "block.mineralogy.rhyolite_relief_hoe": "Riolita Alivio de azada", - "block.mineralogy.rhyolite_relief_horizontal": "Riolita Alivio horizontal", - "block.mineralogy.rhyolite_relief_i": "Riolita I alivio", - "block.mineralogy.rhyolite_relief_left": "Riolita Alivio izquierdo", - "block.mineralogy.rhyolite_relief_pickaxe": "Riolita Alivio de pico", - "block.mineralogy.rhyolite_relief_plus": "Riolita Más alivio", - "block.mineralogy.rhyolite_relief_right": "Riolita Alivio correcto", - "block.mineralogy.rhyolite_relief_sword": "Riolita Alivio de espada", - "block.mineralogy.rhyolite_relief_vertical": "Riolita Alivio vertical", - "block.mineralogy.pegmatite_relief_axe": "Pegmatita Alivio del hacha", - "block.mineralogy.pegmatite_relief_blank": "Pegmatita Alivio en blanco", - "block.mineralogy.pegmatite_relief_cross": "Pegmatita Alivio cruzado", - "block.mineralogy.pegmatite_relief_hammer": "Pegmatita Alivio del martillo", - "block.mineralogy.pegmatite_relief_hoe": "Pegmatita Alivio de azada", - "block.mineralogy.pegmatite_relief_horizontal": "Pegmatita Alivio horizontal", - "block.mineralogy.pegmatite_relief_i": "Pegmatita I alivio", - "block.mineralogy.pegmatite_relief_left": "Pegmatita Alivio izquierdo", - "block.mineralogy.pegmatite_relief_pickaxe": "Pegmatita Alivio de pico", - "block.mineralogy.pegmatite_relief_plus": "Pegmatita Más alivio", - "block.mineralogy.pegmatite_relief_right": "Pegmatita Alivio correcto", - "block.mineralogy.pegmatite_relief_sword": "Pegmatita Alivio de espada", - "block.mineralogy.pegmatite_relief_vertical": "Pegmatita Alivio vertical", - "block.mineralogy.shale_relief_axe": "Esquisto Alivio del hacha", - "block.mineralogy.shale_relief_blank": "Esquisto Alivio en blanco", - "block.mineralogy.shale_relief_cross": "Esquisto Alivio cruzado", - "block.mineralogy.shale_relief_hammer": "Esquisto Alivio del martillo", - "block.mineralogy.shale_relief_hoe": "Esquisto Alivio de azada", - "block.mineralogy.shale_relief_horizontal": "Esquisto Alivio horizontal", - "block.mineralogy.shale_relief_i": "Esquisto I alivio", - "block.mineralogy.shale_relief_left": "Esquisto Alivio izquierdo", - "block.mineralogy.shale_relief_pickaxe": "Esquisto Alivio de pico", - "block.mineralogy.shale_relief_plus": "Esquisto Más alivio", - "block.mineralogy.shale_relief_right": "Esquisto Alivio correcto", - "block.mineralogy.shale_relief_sword": "Esquisto Alivio de espada", - "block.mineralogy.shale_relief_vertical": "Esquisto Alivio vertical", - "block.mineralogy.conglomerate_relief_axe": "Conglomerado Alivio del hacha", - "block.mineralogy.conglomerate_relief_blank": "Conglomerado Alivio en blanco", - "block.mineralogy.conglomerate_relief_cross": "Conglomerado Alivio cruzado", - "block.mineralogy.conglomerate_relief_hammer": "Conglomerado Alivio del martillo", - "block.mineralogy.conglomerate_relief_hoe": "Conglomerado Alivio de azada", - "block.mineralogy.conglomerate_relief_horizontal": "Conglomerado Alivio horizontal", - "block.mineralogy.conglomerate_relief_i": "Conglomerado I alivio", - "block.mineralogy.conglomerate_relief_left": "Conglomerado Alivio izquierdo", - "block.mineralogy.conglomerate_relief_pickaxe": "Conglomerado Alivio de pico", - "block.mineralogy.conglomerate_relief_plus": "Conglomerado Más alivio", - "block.mineralogy.conglomerate_relief_right": "Conglomerado Alivio correcto", - "block.mineralogy.conglomerate_relief_sword": "Conglomerado Alivio de espada", - "block.mineralogy.conglomerate_relief_vertical": "Conglomerado Alivio vertical", - "block.mineralogy.dolomite_relief_axe": "Dolomita Alivio del hacha", - "block.mineralogy.dolomite_relief_blank": "Dolomita Alivio en blanco", - "block.mineralogy.dolomite_relief_cross": "Dolomita Alivio cruzado", - "block.mineralogy.dolomite_relief_hammer": "Dolomita Alivio del martillo", - "block.mineralogy.dolomite_relief_hoe": "Dolomita Alivio de azada", - "block.mineralogy.dolomite_relief_horizontal": "Dolomita Alivio horizontal", - "block.mineralogy.dolomite_relief_i": "Dolomita I alivio", - "block.mineralogy.dolomite_relief_left": "Dolomita Alivio izquierdo", - "block.mineralogy.dolomite_relief_pickaxe": "Dolomita Alivio de pico", - "block.mineralogy.dolomite_relief_plus": "Dolomita Más alivio", - "block.mineralogy.dolomite_relief_right": "Dolomita Alivio correcto", - "block.mineralogy.dolomite_relief_sword": "Dolomita Alivio de espada", - "block.mineralogy.dolomite_relief_vertical": "Dolomita Alivio vertical", - "block.mineralogy.limestone_relief_axe": "Caliza Alivio del hacha", - "block.mineralogy.limestone_relief_blank": "Caliza Alivio en blanco", - "block.mineralogy.limestone_relief_cross": "Caliza Alivio cruzado", - "block.mineralogy.limestone_relief_hammer": "Caliza Alivio del martillo", - "block.mineralogy.limestone_relief_hoe": "Caliza Alivio de azada", - "block.mineralogy.limestone_relief_horizontal": "Caliza Alivio horizontal", - "block.mineralogy.limestone_relief_i": "Caliza I alivio", - "block.mineralogy.limestone_relief_left": "Caliza Alivio izquierdo", - "block.mineralogy.limestone_relief_pickaxe": "Caliza Alivio de pico", - "block.mineralogy.limestone_relief_plus": "Caliza Más alivio", - "block.mineralogy.limestone_relief_right": "Caliza Alivio correcto", - "block.mineralogy.limestone_relief_sword": "Caliza Alivio de espada", - "block.mineralogy.limestone_relief_vertical": "Caliza Alivio vertical", - "block.mineralogy.marble_relief_axe": "Mármol Alivio del hacha", - "block.mineralogy.marble_relief_blank": "Mármol Alivio en blanco", - "block.mineralogy.marble_relief_cross": "Mármol Alivio cruzado", - "block.mineralogy.marble_relief_hammer": "Mármol Alivio del martillo", - "block.mineralogy.marble_relief_hoe": "Mármol Alivio de azada", - "block.mineralogy.marble_relief_horizontal": "Mármol Alivio horizontal", - "block.mineralogy.marble_relief_i": "Mármol I alivio", - "block.mineralogy.marble_relief_left": "Mármol Alivio izquierdo", - "block.mineralogy.marble_relief_pickaxe": "Mármol Alivio de pico", - "block.mineralogy.marble_relief_plus": "Mármol Más alivio", - "block.mineralogy.marble_relief_right": "Mármol Alivio correcto", - "block.mineralogy.marble_relief_sword": "Mármol Alivio de espada", - "block.mineralogy.marble_relief_vertical": "Mármol Alivio vertical", - "block.mineralogy.slate_relief_axe": "Pizarra Alivio del hacha", - "block.mineralogy.slate_relief_blank": "Pizarra Alivio en blanco", - "block.mineralogy.slate_relief_cross": "Pizarra Alivio cruzado", - "block.mineralogy.slate_relief_hammer": "Pizarra Alivio del martillo", - "block.mineralogy.slate_relief_hoe": "Pizarra Alivio de azada", - "block.mineralogy.slate_relief_horizontal": "Pizarra Alivio horizontal", - "block.mineralogy.slate_relief_i": "Pizarra I alivio", - "block.mineralogy.slate_relief_left": "Pizarra Alivio izquierdo", - "block.mineralogy.slate_relief_pickaxe": "Pizarra Alivio de pico", - "block.mineralogy.slate_relief_plus": "Pizarra Más alivio", - "block.mineralogy.slate_relief_right": "Pizarra Alivio correcto", - "block.mineralogy.slate_relief_sword": "Pizarra Alivio de espada", - "block.mineralogy.slate_relief_vertical": "Pizarra Alivio vertical", - "block.mineralogy.schist_relief_axe": "Esquisto Alivio del hacha", - "block.mineralogy.schist_relief_blank": "Esquisto Alivio en blanco", - "block.mineralogy.schist_relief_cross": "Esquisto Alivio cruzado", - "block.mineralogy.schist_relief_hammer": "Esquisto Alivio del martillo", - "block.mineralogy.schist_relief_hoe": "Esquisto Alivio de azada", - "block.mineralogy.schist_relief_horizontal": "Esquisto Alivio horizontal", - "block.mineralogy.schist_relief_i": "Esquisto I alivio", - "block.mineralogy.schist_relief_left": "Esquisto Alivio izquierdo", - "block.mineralogy.schist_relief_pickaxe": "Esquisto Alivio de pico", - "block.mineralogy.schist_relief_plus": "Esquisto Más alivio", - "block.mineralogy.schist_relief_right": "Esquisto Alivio correcto", - "block.mineralogy.schist_relief_sword": "Esquisto Alivio de espada", - "block.mineralogy.schist_relief_vertical": "Esquisto Alivio vertical", - "block.mineralogy.gneiss_relief_axe": "Gneis Alivio del hacha", - "block.mineralogy.gneiss_relief_blank": "Gneis Alivio en blanco", - "block.mineralogy.gneiss_relief_cross": "Gneis Alivio cruzado", - "block.mineralogy.gneiss_relief_hammer": "Gneis Alivio del martillo", - "block.mineralogy.gneiss_relief_hoe": "Gneis Alivio de azada", - "block.mineralogy.gneiss_relief_horizontal": "Gneis Alivio horizontal", - "block.mineralogy.gneiss_relief_i": "Gneis I alivio", - "block.mineralogy.gneiss_relief_left": "Gneis Alivio izquierdo", - "block.mineralogy.gneiss_relief_pickaxe": "Gneis Alivio de pico", - "block.mineralogy.gneiss_relief_plus": "Gneis Más alivio", - "block.mineralogy.gneiss_relief_right": "Gneis Alivio correcto", - "block.mineralogy.gneiss_relief_sword": "Gneis Alivio de espada", - "block.mineralogy.gneiss_relief_vertical": "Gneis Alivio vertical", - "block.mineralogy.phyllite_relief_axe": "Filita Alivio del hacha", - "block.mineralogy.phyllite_relief_blank": "Filita Alivio en blanco", - "block.mineralogy.phyllite_relief_cross": "Filita Alivio cruzado", - "block.mineralogy.phyllite_relief_hammer": "Filita Alivio del martillo", - "block.mineralogy.phyllite_relief_hoe": "Filita Alivio de azada", - "block.mineralogy.phyllite_relief_horizontal": "Filita Alivio horizontal", - "block.mineralogy.phyllite_relief_i": "Filita I alivio", - "block.mineralogy.phyllite_relief_left": "Filita Alivio izquierdo", - "block.mineralogy.phyllite_relief_pickaxe": "Filita Alivio de pico", - "block.mineralogy.phyllite_relief_plus": "Filita Más alivio", - "block.mineralogy.phyllite_relief_right": "Filita Alivio correcto", - "block.mineralogy.phyllite_relief_sword": "Filita Alivio de espada", - "block.mineralogy.phyllite_relief_vertical": "Filita Alivio vertical", - "block.mineralogy.amphibolite_relief_axe": "Anfibolita Alivio del hacha", - "block.mineralogy.amphibolite_relief_blank": "Anfibolita Alivio en blanco", - "block.mineralogy.amphibolite_relief_cross": "Anfibolita Alivio cruzado", - "block.mineralogy.amphibolite_relief_hammer": "Anfibolita Alivio del martillo", - "block.mineralogy.amphibolite_relief_hoe": "Anfibolita Alivio de azada", - "block.mineralogy.amphibolite_relief_horizontal": "Anfibolita Alivio horizontal", - "block.mineralogy.amphibolite_relief_i": "Anfibolita I alivio", - "block.mineralogy.amphibolite_relief_left": "Anfibolita Alivio izquierdo", - "block.mineralogy.amphibolite_relief_pickaxe": "Anfibolita Alivio de pico", - "block.mineralogy.amphibolite_relief_plus": "Anfibolita Más alivio", - "block.mineralogy.amphibolite_relief_right": "Anfibolita Alivio correcto", - "block.mineralogy.amphibolite_relief_sword": "Anfibolita Alivio de espada", - "block.mineralogy.amphibolite_relief_vertical": "Anfibolita Alivio vertical", - "block.mineralogy.diabase_relief_axe": "Diabasa Alivio del hacha", - "block.mineralogy.diabase_relief_blank": "Diabasa Alivio en blanco", - "block.mineralogy.diabase_relief_cross": "Diabasa Alivio cruzado", - "block.mineralogy.diabase_relief_hammer": "Diabasa Alivio del martillo", - "block.mineralogy.diabase_relief_hoe": "Diabasa Alivio de azada", - "block.mineralogy.diabase_relief_horizontal": "Diabasa Alivio horizontal", - "block.mineralogy.diabase_relief_i": "Diabasa I alivio", - "block.mineralogy.diabase_relief_left": "Diabasa Alivio izquierdo", - "block.mineralogy.diabase_relief_pickaxe": "Diabasa Alivio de pico", - "block.mineralogy.diabase_relief_plus": "Diabasa Más alivio", - "block.mineralogy.diabase_relief_right": "Diabasa Alivio correcto", - "block.mineralogy.diabase_relief_sword": "Diabasa Alivio de espada", - "block.mineralogy.diabase_relief_vertical": "Diabasa Alivio vertical", - "block.mineralogy.gabbro_relief_axe": "Gabbro Alivio del hacha", - "block.mineralogy.gabbro_relief_blank": "Gabbro Alivio en blanco", - "block.mineralogy.gabbro_relief_cross": "Gabbro Alivio cruzado", - "block.mineralogy.gabbro_relief_hammer": "Gabbro Alivio del martillo", - "block.mineralogy.gabbro_relief_hoe": "Gabbro Alivio de azada", - "block.mineralogy.gabbro_relief_horizontal": "Gabbro Alivio horizontal", - "block.mineralogy.gabbro_relief_i": "Gabbro I alivio", - "block.mineralogy.gabbro_relief_left": "Gabbro Alivio izquierdo", - "block.mineralogy.gabbro_relief_pickaxe": "Gabbro Alivio de pico", - "block.mineralogy.gabbro_relief_plus": "Gabbro Más alivio", - "block.mineralogy.gabbro_relief_right": "Gabbro Alivio correcto", - "block.mineralogy.gabbro_relief_sword": "Gabbro Alivio de espada", - "block.mineralogy.gabbro_relief_vertical": "Gabbro Alivio vertical", - "block.mineralogy.peridotite_relief_axe": "Peridotita Alivio del hacha", - "block.mineralogy.peridotite_relief_blank": "Peridotita Alivio en blanco", - "block.mineralogy.peridotite_relief_cross": "Peridotita Alivio cruzado", - "block.mineralogy.peridotite_relief_hammer": "Peridotita Alivio del martillo", - "block.mineralogy.peridotite_relief_hoe": "Peridotita Alivio de azada", - "block.mineralogy.peridotite_relief_horizontal": "Peridotita Alivio horizontal", - "block.mineralogy.peridotite_relief_i": "Peridotita I alivio", - "block.mineralogy.peridotite_relief_left": "Peridotita Alivio izquierdo", - "block.mineralogy.peridotite_relief_pickaxe": "Peridotita Alivio de pico", - "block.mineralogy.peridotite_relief_plus": "Peridotita Más alivio", - "block.mineralogy.peridotite_relief_right": "Peridotita Alivio correcto", - "block.mineralogy.peridotite_relief_sword": "Peridotita Alivio de espada", - "block.mineralogy.peridotite_relief_vertical": "Peridotita Alivio vertical", - "block.mineralogy.basaltic_glass_relief_axe": "Vidrio basaltoico Alivio del hacha", - "block.mineralogy.basaltic_glass_relief_blank": "Vidrio basaltoico Alivio en blanco", - "block.mineralogy.basaltic_glass_relief_cross": "Vidrio basaltoico Alivio cruzado", - "block.mineralogy.basaltic_glass_relief_hammer": "Vidrio basaltoico Alivio del martillo", - "block.mineralogy.basaltic_glass_relief_hoe": "Vidrio basaltoico Alivio de azada", - "block.mineralogy.basaltic_glass_relief_horizontal": "Vidrio basaltoico Alivio horizontal", - "block.mineralogy.basaltic_glass_relief_i": "Vidrio basaltoico I alivio", - "block.mineralogy.basaltic_glass_relief_left": "Vidrio basaltoico Alivio izquierdo", - "block.mineralogy.basaltic_glass_relief_pickaxe": "Vidrio basaltoico Alivio de pico", - "block.mineralogy.basaltic_glass_relief_plus": "Vidrio basaltoico Más alivio", - "block.mineralogy.basaltic_glass_relief_right": "Vidrio basaltoico Alivio correcto", - "block.mineralogy.basaltic_glass_relief_sword": "Vidrio basaltoico Alivio de espada", - "block.mineralogy.basaltic_glass_relief_vertical": "Vidrio basaltoico Alivio vertical", - "block.mineralogy.scoria_relief_axe": "Escoria Alivio del hacha", - "block.mineralogy.scoria_relief_blank": "Escoria Alivio en blanco", - "block.mineralogy.scoria_relief_cross": "Escoria Alivio cruzado", - "block.mineralogy.scoria_relief_hammer": "Escoria Alivio del martillo", - "block.mineralogy.scoria_relief_hoe": "Escoria Alivio de azada", - "block.mineralogy.scoria_relief_horizontal": "Escoria Alivio horizontal", - "block.mineralogy.scoria_relief_i": "Escoria I alivio", - "block.mineralogy.scoria_relief_left": "Escoria Alivio izquierdo", - "block.mineralogy.scoria_relief_pickaxe": "Escoria Alivio de pico", - "block.mineralogy.scoria_relief_plus": "Escoria Más alivio", - "block.mineralogy.scoria_relief_right": "Escoria Alivio correcto", - "block.mineralogy.scoria_relief_sword": "Escoria Alivio de espada", - "block.mineralogy.scoria_relief_vertical": "Escoria Alivio vertical", - "block.mineralogy.tuff_relief_axe": "Toba Alivio del hacha", - "block.mineralogy.tuff_relief_blank": "Toba Alivio en blanco", - "block.mineralogy.tuff_relief_cross": "Toba Alivio cruzado", - "block.mineralogy.tuff_relief_hammer": "Toba Alivio del martillo", - "block.mineralogy.tuff_relief_hoe": "Toba Alivio de azada", - "block.mineralogy.tuff_relief_horizontal": "Toba Alivio horizontal", - "block.mineralogy.tuff_relief_i": "Toba I alivio", - "block.mineralogy.tuff_relief_left": "Toba Alivio izquierdo", - "block.mineralogy.tuff_relief_pickaxe": "Toba Alivio de pico", - "block.mineralogy.tuff_relief_plus": "Toba Más alivio", - "block.mineralogy.tuff_relief_right": "Toba Alivio correcto", - "block.mineralogy.tuff_relief_sword": "Toba Alivio de espada", - "block.mineralogy.tuff_relief_vertical": "Toba Alivio vertical", - "block.mineralogy.siltstone_relief_axe": "Siltstone Alivio del hacha", - "block.mineralogy.siltstone_relief_blank": "Siltstone Alivio en blanco", - "block.mineralogy.siltstone_relief_cross": "Siltstone Alivio cruzado", - "block.mineralogy.siltstone_relief_hammer": "Siltstone Alivio del martillo", - "block.mineralogy.siltstone_relief_hoe": "Siltstone Alivio de azada", - "block.mineralogy.siltstone_relief_horizontal": "Siltstone Alivio horizontal", - "block.mineralogy.siltstone_relief_i": "Siltstone I alivio", - "block.mineralogy.siltstone_relief_left": "Siltstone Alivio izquierdo", - "block.mineralogy.siltstone_relief_pickaxe": "Siltstone Alivio de pico", - "block.mineralogy.siltstone_relief_plus": "Siltstone Más alivio", - "block.mineralogy.siltstone_relief_right": "Siltstone Alivio correcto", - "block.mineralogy.siltstone_relief_sword": "Siltstone Alivio de espada", - "block.mineralogy.siltstone_relief_vertical": "Siltstone Alivio vertical", - "block.mineralogy.rock_salt_relief_axe": "Sal de roca Alivio del hacha", - "block.mineralogy.rock_salt_relief_blank": "Sal de roca Alivio en blanco", - "block.mineralogy.rock_salt_relief_cross": "Sal de roca Alivio cruzado", - "block.mineralogy.rock_salt_relief_hammer": "Sal de roca Alivio del martillo", - "block.mineralogy.rock_salt_relief_hoe": "Sal de roca Alivio de azada", - "block.mineralogy.rock_salt_relief_horizontal": "Sal de roca Alivio horizontal", - "block.mineralogy.rock_salt_relief_i": "Sal de roca I alivio", - "block.mineralogy.rock_salt_relief_left": "Sal de roca Alivio izquierdo", - "block.mineralogy.rock_salt_relief_pickaxe": "Sal de roca Alivio de pico", - "block.mineralogy.rock_salt_relief_plus": "Sal de roca Más alivio", - "block.mineralogy.rock_salt_relief_right": "Sal de roca Alivio correcto", - "block.mineralogy.rock_salt_relief_sword": "Sal de roca Alivio de espada", - "block.mineralogy.rock_salt_relief_vertical": "Sal de roca Alivio vertical", - "block.mineralogy.hornfels_relief_axe": "Hornfels Alivio del hacha", - "block.mineralogy.hornfels_relief_blank": "Hornfels Alivio en blanco", - "block.mineralogy.hornfels_relief_cross": "Hornfels Alivio cruzado", - "block.mineralogy.hornfels_relief_hammer": "Hornfels Alivio del martillo", - "block.mineralogy.hornfels_relief_hoe": "Hornfels Alivio de azada", - "block.mineralogy.hornfels_relief_horizontal": "Hornfels Alivio horizontal", - "block.mineralogy.hornfels_relief_i": "Hornfels I alivio", - "block.mineralogy.hornfels_relief_left": "Hornfels Alivio izquierdo", - "block.mineralogy.hornfels_relief_pickaxe": "Hornfels Alivio de pico", - "block.mineralogy.hornfels_relief_plus": "Hornfels Más alivio", - "block.mineralogy.hornfels_relief_right": "Hornfels Alivio correcto", - "block.mineralogy.hornfels_relief_sword": "Hornfels Alivio de espada", - "block.mineralogy.hornfels_relief_vertical": "Hornfels Alivio vertical", - "block.mineralogy.quartzite_relief_axe": "Cuarcita Alivio del hacha", - "block.mineralogy.quartzite_relief_blank": "Cuarcita Alivio en blanco", - "block.mineralogy.quartzite_relief_cross": "Cuarcita Alivio cruzado", - "block.mineralogy.quartzite_relief_hammer": "Cuarcita Alivio del martillo", - "block.mineralogy.quartzite_relief_hoe": "Cuarcita Alivio de azada", - "block.mineralogy.quartzite_relief_horizontal": "Cuarcita Alivio horizontal", - "block.mineralogy.quartzite_relief_i": "Cuarcita I alivio", - "block.mineralogy.quartzite_relief_left": "Cuarcita Alivio izquierdo", - "block.mineralogy.quartzite_relief_pickaxe": "Cuarcita Alivio de pico", - "block.mineralogy.quartzite_relief_plus": "Cuarcita Más alivio", - "block.mineralogy.quartzite_relief_right": "Cuarcita Alivio correcto", - "block.mineralogy.quartzite_relief_sword": "Cuarcita Alivio de espada", - "block.mineralogy.quartzite_relief_vertical": "Cuarcita Alivio vertical", - "block.mineralogy.novaculite_relief_axe": "Novaculita Alivio del hacha", - "block.mineralogy.novaculite_relief_blank": "Novaculita Alivio en blanco", - "block.mineralogy.novaculite_relief_cross": "Novaculita Alivio cruzado", - "block.mineralogy.novaculite_relief_hammer": "Novaculita Alivio del martillo", - "block.mineralogy.novaculite_relief_hoe": "Novaculita Alivio de azada", - "block.mineralogy.novaculite_relief_horizontal": "Novaculita Alivio horizontal", - "block.mineralogy.novaculite_relief_i": "Novaculita I alivio", - "block.mineralogy.novaculite_relief_left": "Novaculita Alivio izquierdo", - "block.mineralogy.novaculite_relief_pickaxe": "Novaculita Alivio de pico", - "block.mineralogy.novaculite_relief_plus": "Novaculita Más alivio", - "block.mineralogy.novaculite_relief_right": "Novaculita Alivio correcto", - "block.mineralogy.novaculite_relief_sword": "Novaculita Alivio de espada", - "block.mineralogy.novaculite_relief_vertical": "Novaculita Alivio vertical", - "itemGroup.mineralogy.mineralogy": "Mineralogía" + "block.mineralogy.andesite_relief_axe": "Relieve de Andesita (hacha)", + "block.mineralogy.andesite_relief_blank": "Relieve de Andesita (sin motivo)", + "block.mineralogy.andesite_relief_cross": "Relieve de Andesita (cruz)", + "block.mineralogy.andesite_relief_hammer": "Relieve de Andesita (martillo)", + "block.mineralogy.andesite_relief_hoe": "Relieve de Andesita (azada)", + "block.mineralogy.andesite_relief_horizontal": "Relieve de Andesita (horizontal)", + "block.mineralogy.andesite_relief_i": "Relieve de Andesita (I)", + "block.mineralogy.andesite_relief_left": "Relieve de Andesita (izquierda)", + "block.mineralogy.andesite_relief_pickaxe": "Relieve de Andesita (pico)", + "block.mineralogy.andesite_relief_plus": "Relieve de Andesita (signo más)", + "block.mineralogy.andesite_relief_right": "Relieve de Andesita (derecha)", + "block.mineralogy.andesite_relief_sword": "Relieve de Andesita (espada)", + "block.mineralogy.andesite_relief_vertical": "Relieve de Andesita (vertical)", + "block.mineralogy.basalt_relief_axe": "Relieve de Basalto (hacha)", + "block.mineralogy.basalt_relief_blank": "Relieve de Basalto (sin motivo)", + "block.mineralogy.basalt_relief_cross": "Relieve de Basalto (cruz)", + "block.mineralogy.basalt_relief_hammer": "Relieve de Basalto (martillo)", + "block.mineralogy.basalt_relief_hoe": "Relieve de Basalto (azada)", + "block.mineralogy.basalt_relief_horizontal": "Relieve de Basalto (horizontal)", + "block.mineralogy.basalt_relief_i": "Relieve de Basalto (I)", + "block.mineralogy.basalt_relief_left": "Relieve de Basalto (izquierda)", + "block.mineralogy.basalt_relief_pickaxe": "Relieve de Basalto (pico)", + "block.mineralogy.basalt_relief_plus": "Relieve de Basalto (signo más)", + "block.mineralogy.basalt_relief_right": "Relieve de Basalto (derecha)", + "block.mineralogy.basalt_relief_sword": "Relieve de Basalto (espada)", + "block.mineralogy.basalt_relief_vertical": "Relieve de Basalto (vertical)", + "block.mineralogy.diorite_relief_axe": "Relieve de Diorita (hacha)", + "block.mineralogy.diorite_relief_blank": "Relieve de Diorita (sin motivo)", + "block.mineralogy.diorite_relief_cross": "Relieve de Diorita (cruz)", + "block.mineralogy.diorite_relief_hammer": "Relieve de Diorita (martillo)", + "block.mineralogy.diorite_relief_hoe": "Relieve de Diorita (azada)", + "block.mineralogy.diorite_relief_horizontal": "Relieve de Diorita (horizontal)", + "block.mineralogy.diorite_relief_i": "Relieve de Diorita (I)", + "block.mineralogy.diorite_relief_left": "Relieve de Diorita (izquierda)", + "block.mineralogy.diorite_relief_pickaxe": "Relieve de Diorita (pico)", + "block.mineralogy.diorite_relief_plus": "Relieve de Diorita (signo más)", + "block.mineralogy.diorite_relief_right": "Relieve de Diorita (derecha)", + "block.mineralogy.diorite_relief_sword": "Relieve de Diorita (espada)", + "block.mineralogy.diorite_relief_vertical": "Relieve de Diorita (vertical)", + "block.mineralogy.granite_relief_axe": "Relieve de Granito (hacha)", + "block.mineralogy.granite_relief_blank": "Relieve de Granito (sin motivo)", + "block.mineralogy.granite_relief_cross": "Relieve de Granito (cruz)", + "block.mineralogy.granite_relief_hammer": "Relieve de Granito (martillo)", + "block.mineralogy.granite_relief_hoe": "Relieve de Granito (azada)", + "block.mineralogy.granite_relief_horizontal": "Relieve de Granito (horizontal)", + "block.mineralogy.granite_relief_i": "Relieve de Granito (I)", + "block.mineralogy.granite_relief_left": "Relieve de Granito (izquierda)", + "block.mineralogy.granite_relief_pickaxe": "Relieve de Granito (pico)", + "block.mineralogy.granite_relief_plus": "Relieve de Granito (signo más)", + "block.mineralogy.granite_relief_right": "Relieve de Granito (derecha)", + "block.mineralogy.granite_relief_sword": "Relieve de Granito (espada)", + "block.mineralogy.granite_relief_vertical": "Relieve de Granito (vertical)", + "block.mineralogy.rhyolite_relief_axe": "Relieve de Riolita (hacha)", + "block.mineralogy.rhyolite_relief_blank": "Relieve de Riolita (sin motivo)", + "block.mineralogy.rhyolite_relief_cross": "Relieve de Riolita (cruz)", + "block.mineralogy.rhyolite_relief_hammer": "Relieve de Riolita (martillo)", + "block.mineralogy.rhyolite_relief_hoe": "Relieve de Riolita (azada)", + "block.mineralogy.rhyolite_relief_horizontal": "Relieve de Riolita (horizontal)", + "block.mineralogy.rhyolite_relief_i": "Relieve de Riolita (I)", + "block.mineralogy.rhyolite_relief_left": "Relieve de Riolita (izquierda)", + "block.mineralogy.rhyolite_relief_pickaxe": "Relieve de Riolita (pico)", + "block.mineralogy.rhyolite_relief_plus": "Relieve de Riolita (signo más)", + "block.mineralogy.rhyolite_relief_right": "Relieve de Riolita (derecha)", + "block.mineralogy.rhyolite_relief_sword": "Relieve de Riolita (espada)", + "block.mineralogy.rhyolite_relief_vertical": "Relieve de Riolita (vertical)", + "block.mineralogy.pegmatite_relief_axe": "Relieve de Pegmatita (hacha)", + "block.mineralogy.pegmatite_relief_blank": "Relieve de Pegmatita (sin motivo)", + "block.mineralogy.pegmatite_relief_cross": "Relieve de Pegmatita (cruz)", + "block.mineralogy.pegmatite_relief_hammer": "Relieve de Pegmatita (martillo)", + "block.mineralogy.pegmatite_relief_hoe": "Relieve de Pegmatita (azada)", + "block.mineralogy.pegmatite_relief_horizontal": "Relieve de Pegmatita (horizontal)", + "block.mineralogy.pegmatite_relief_i": "Relieve de Pegmatita (I)", + "block.mineralogy.pegmatite_relief_left": "Relieve de Pegmatita (izquierda)", + "block.mineralogy.pegmatite_relief_pickaxe": "Relieve de Pegmatita (pico)", + "block.mineralogy.pegmatite_relief_plus": "Relieve de Pegmatita (signo más)", + "block.mineralogy.pegmatite_relief_right": "Relieve de Pegmatita (derecha)", + "block.mineralogy.pegmatite_relief_sword": "Relieve de Pegmatita (espada)", + "block.mineralogy.pegmatite_relief_vertical": "Relieve de Pegmatita (vertical)", + "block.mineralogy.shale_relief_axe": "Relieve de Lutita (hacha)", + "block.mineralogy.shale_relief_blank": "Relieve de Lutita (sin motivo)", + "block.mineralogy.shale_relief_cross": "Relieve de Lutita (cruz)", + "block.mineralogy.shale_relief_hammer": "Relieve de Lutita (martillo)", + "block.mineralogy.shale_relief_hoe": "Relieve de Lutita (azada)", + "block.mineralogy.shale_relief_horizontal": "Relieve de Lutita (horizontal)", + "block.mineralogy.shale_relief_i": "Relieve de Lutita (I)", + "block.mineralogy.shale_relief_left": "Relieve de Lutita (izquierda)", + "block.mineralogy.shale_relief_pickaxe": "Relieve de Lutita (pico)", + "block.mineralogy.shale_relief_plus": "Relieve de Lutita (signo más)", + "block.mineralogy.shale_relief_right": "Relieve de Lutita (derecha)", + "block.mineralogy.shale_relief_sword": "Relieve de Lutita (espada)", + "block.mineralogy.shale_relief_vertical": "Relieve de Lutita (vertical)", + "block.mineralogy.conglomerate_relief_axe": "Relieve de Conglomerado (hacha)", + "block.mineralogy.conglomerate_relief_blank": "Relieve de Conglomerado (sin motivo)", + "block.mineralogy.conglomerate_relief_cross": "Relieve de Conglomerado (cruz)", + "block.mineralogy.conglomerate_relief_hammer": "Relieve de Conglomerado (martillo)", + "block.mineralogy.conglomerate_relief_hoe": "Relieve de Conglomerado (azada)", + "block.mineralogy.conglomerate_relief_horizontal": "Relieve de Conglomerado (horizontal)", + "block.mineralogy.conglomerate_relief_i": "Relieve de Conglomerado (I)", + "block.mineralogy.conglomerate_relief_left": "Relieve de Conglomerado (izquierda)", + "block.mineralogy.conglomerate_relief_pickaxe": "Relieve de Conglomerado (pico)", + "block.mineralogy.conglomerate_relief_plus": "Relieve de Conglomerado (signo más)", + "block.mineralogy.conglomerate_relief_right": "Relieve de Conglomerado (derecha)", + "block.mineralogy.conglomerate_relief_sword": "Relieve de Conglomerado (espada)", + "block.mineralogy.conglomerate_relief_vertical": "Relieve de Conglomerado (vertical)", + "block.mineralogy.dolomite_relief_axe": "Relieve de Dolomita (hacha)", + "block.mineralogy.dolomite_relief_blank": "Relieve de Dolomita (sin motivo)", + "block.mineralogy.dolomite_relief_cross": "Relieve de Dolomita (cruz)", + "block.mineralogy.dolomite_relief_hammer": "Relieve de Dolomita (martillo)", + "block.mineralogy.dolomite_relief_hoe": "Relieve de Dolomita (azada)", + "block.mineralogy.dolomite_relief_horizontal": "Relieve de Dolomita (horizontal)", + "block.mineralogy.dolomite_relief_i": "Relieve de Dolomita (I)", + "block.mineralogy.dolomite_relief_left": "Relieve de Dolomita (izquierda)", + "block.mineralogy.dolomite_relief_pickaxe": "Relieve de Dolomita (pico)", + "block.mineralogy.dolomite_relief_plus": "Relieve de Dolomita (signo más)", + "block.mineralogy.dolomite_relief_right": "Relieve de Dolomita (derecha)", + "block.mineralogy.dolomite_relief_sword": "Relieve de Dolomita (espada)", + "block.mineralogy.dolomite_relief_vertical": "Relieve de Dolomita (vertical)", + "block.mineralogy.limestone_relief_axe": "Relieve de Caliza (hacha)", + "block.mineralogy.limestone_relief_blank": "Relieve de Caliza (sin motivo)", + "block.mineralogy.limestone_relief_cross": "Relieve de Caliza (cruz)", + "block.mineralogy.limestone_relief_hammer": "Relieve de Caliza (martillo)", + "block.mineralogy.limestone_relief_hoe": "Relieve de Caliza (azada)", + "block.mineralogy.limestone_relief_horizontal": "Relieve de Caliza (horizontal)", + "block.mineralogy.limestone_relief_i": "Relieve de Caliza (I)", + "block.mineralogy.limestone_relief_left": "Relieve de Caliza (izquierda)", + "block.mineralogy.limestone_relief_pickaxe": "Relieve de Caliza (pico)", + "block.mineralogy.limestone_relief_plus": "Relieve de Caliza (signo más)", + "block.mineralogy.limestone_relief_right": "Relieve de Caliza (derecha)", + "block.mineralogy.limestone_relief_sword": "Relieve de Caliza (espada)", + "block.mineralogy.limestone_relief_vertical": "Relieve de Caliza (vertical)", + "block.mineralogy.marble_relief_axe": "Relieve de Mármol (hacha)", + "block.mineralogy.marble_relief_blank": "Relieve de Mármol (sin motivo)", + "block.mineralogy.marble_relief_cross": "Relieve de Mármol (cruz)", + "block.mineralogy.marble_relief_hammer": "Relieve de Mármol (martillo)", + "block.mineralogy.marble_relief_hoe": "Relieve de Mármol (azada)", + "block.mineralogy.marble_relief_horizontal": "Relieve de Mármol (horizontal)", + "block.mineralogy.marble_relief_i": "Relieve de Mármol (I)", + "block.mineralogy.marble_relief_left": "Relieve de Mármol (izquierda)", + "block.mineralogy.marble_relief_pickaxe": "Relieve de Mármol (pico)", + "block.mineralogy.marble_relief_plus": "Relieve de Mármol (signo más)", + "block.mineralogy.marble_relief_right": "Relieve de Mármol (derecha)", + "block.mineralogy.marble_relief_sword": "Relieve de Mármol (espada)", + "block.mineralogy.marble_relief_vertical": "Relieve de Mármol (vertical)", + "block.mineralogy.slate_relief_axe": "Relieve de Pizarra (hacha)", + "block.mineralogy.slate_relief_blank": "Relieve de Pizarra (sin motivo)", + "block.mineralogy.slate_relief_cross": "Relieve de Pizarra (cruz)", + "block.mineralogy.slate_relief_hammer": "Relieve de Pizarra (martillo)", + "block.mineralogy.slate_relief_hoe": "Relieve de Pizarra (azada)", + "block.mineralogy.slate_relief_horizontal": "Relieve de Pizarra (horizontal)", + "block.mineralogy.slate_relief_i": "Relieve de Pizarra (I)", + "block.mineralogy.slate_relief_left": "Relieve de Pizarra (izquierda)", + "block.mineralogy.slate_relief_pickaxe": "Relieve de Pizarra (pico)", + "block.mineralogy.slate_relief_plus": "Relieve de Pizarra (signo más)", + "block.mineralogy.slate_relief_right": "Relieve de Pizarra (derecha)", + "block.mineralogy.slate_relief_sword": "Relieve de Pizarra (espada)", + "block.mineralogy.slate_relief_vertical": "Relieve de Pizarra (vertical)", + "block.mineralogy.schist_relief_axe": "Relieve de Esquisto (hacha)", + "block.mineralogy.schist_relief_blank": "Relieve de Esquisto (sin motivo)", + "block.mineralogy.schist_relief_cross": "Relieve de Esquisto (cruz)", + "block.mineralogy.schist_relief_hammer": "Relieve de Esquisto (martillo)", + "block.mineralogy.schist_relief_hoe": "Relieve de Esquisto (azada)", + "block.mineralogy.schist_relief_horizontal": "Relieve de Esquisto (horizontal)", + "block.mineralogy.schist_relief_i": "Relieve de Esquisto (I)", + "block.mineralogy.schist_relief_left": "Relieve de Esquisto (izquierda)", + "block.mineralogy.schist_relief_pickaxe": "Relieve de Esquisto (pico)", + "block.mineralogy.schist_relief_plus": "Relieve de Esquisto (signo más)", + "block.mineralogy.schist_relief_right": "Relieve de Esquisto (derecha)", + "block.mineralogy.schist_relief_sword": "Relieve de Esquisto (espada)", + "block.mineralogy.schist_relief_vertical": "Relieve de Esquisto (vertical)", + "block.mineralogy.gneiss_relief_axe": "Relieve de Gneis (hacha)", + "block.mineralogy.gneiss_relief_blank": "Relieve de Gneis (sin motivo)", + "block.mineralogy.gneiss_relief_cross": "Relieve de Gneis (cruz)", + "block.mineralogy.gneiss_relief_hammer": "Relieve de Gneis (martillo)", + "block.mineralogy.gneiss_relief_hoe": "Relieve de Gneis (azada)", + "block.mineralogy.gneiss_relief_horizontal": "Relieve de Gneis (horizontal)", + "block.mineralogy.gneiss_relief_i": "Relieve de Gneis (I)", + "block.mineralogy.gneiss_relief_left": "Relieve de Gneis (izquierda)", + "block.mineralogy.gneiss_relief_pickaxe": "Relieve de Gneis (pico)", + "block.mineralogy.gneiss_relief_plus": "Relieve de Gneis (signo más)", + "block.mineralogy.gneiss_relief_right": "Relieve de Gneis (derecha)", + "block.mineralogy.gneiss_relief_sword": "Relieve de Gneis (espada)", + "block.mineralogy.gneiss_relief_vertical": "Relieve de Gneis (vertical)", + "block.mineralogy.phyllite_relief_axe": "Relieve de Filita (hacha)", + "block.mineralogy.phyllite_relief_blank": "Relieve de Filita (sin motivo)", + "block.mineralogy.phyllite_relief_cross": "Relieve de Filita (cruz)", + "block.mineralogy.phyllite_relief_hammer": "Relieve de Filita (martillo)", + "block.mineralogy.phyllite_relief_hoe": "Relieve de Filita (azada)", + "block.mineralogy.phyllite_relief_horizontal": "Relieve de Filita (horizontal)", + "block.mineralogy.phyllite_relief_i": "Relieve de Filita (I)", + "block.mineralogy.phyllite_relief_left": "Relieve de Filita (izquierda)", + "block.mineralogy.phyllite_relief_pickaxe": "Relieve de Filita (pico)", + "block.mineralogy.phyllite_relief_plus": "Relieve de Filita (signo más)", + "block.mineralogy.phyllite_relief_right": "Relieve de Filita (derecha)", + "block.mineralogy.phyllite_relief_sword": "Relieve de Filita (espada)", + "block.mineralogy.phyllite_relief_vertical": "Relieve de Filita (vertical)", + "block.mineralogy.amphibolite_relief_axe": "Relieve de Anfibolita (hacha)", + "block.mineralogy.amphibolite_relief_blank": "Relieve de Anfibolita (sin motivo)", + "block.mineralogy.amphibolite_relief_cross": "Relieve de Anfibolita (cruz)", + "block.mineralogy.amphibolite_relief_hammer": "Relieve de Anfibolita (martillo)", + "block.mineralogy.amphibolite_relief_hoe": "Relieve de Anfibolita (azada)", + "block.mineralogy.amphibolite_relief_horizontal": "Relieve de Anfibolita (horizontal)", + "block.mineralogy.amphibolite_relief_i": "Relieve de Anfibolita (I)", + "block.mineralogy.amphibolite_relief_left": "Relieve de Anfibolita (izquierda)", + "block.mineralogy.amphibolite_relief_pickaxe": "Relieve de Anfibolita (pico)", + "block.mineralogy.amphibolite_relief_plus": "Relieve de Anfibolita (signo más)", + "block.mineralogy.amphibolite_relief_right": "Relieve de Anfibolita (derecha)", + "block.mineralogy.amphibolite_relief_sword": "Relieve de Anfibolita (espada)", + "block.mineralogy.amphibolite_relief_vertical": "Relieve de Anfibolita (vertical)", + "block.mineralogy.diabase_relief_axe": "Relieve de Diabasa (hacha)", + "block.mineralogy.diabase_relief_blank": "Relieve de Diabasa (sin motivo)", + "block.mineralogy.diabase_relief_cross": "Relieve de Diabasa (cruz)", + "block.mineralogy.diabase_relief_hammer": "Relieve de Diabasa (martillo)", + "block.mineralogy.diabase_relief_hoe": "Relieve de Diabasa (azada)", + "block.mineralogy.diabase_relief_horizontal": "Relieve de Diabasa (horizontal)", + "block.mineralogy.diabase_relief_i": "Relieve de Diabasa (I)", + "block.mineralogy.diabase_relief_left": "Relieve de Diabasa (izquierda)", + "block.mineralogy.diabase_relief_pickaxe": "Relieve de Diabasa (pico)", + "block.mineralogy.diabase_relief_plus": "Relieve de Diabasa (signo más)", + "block.mineralogy.diabase_relief_right": "Relieve de Diabasa (derecha)", + "block.mineralogy.diabase_relief_sword": "Relieve de Diabasa (espada)", + "block.mineralogy.diabase_relief_vertical": "Relieve de Diabasa (vertical)", + "block.mineralogy.gabbro_relief_axe": "Relieve de Gabro (hacha)", + "block.mineralogy.gabbro_relief_blank": "Relieve de Gabro (sin motivo)", + "block.mineralogy.gabbro_relief_cross": "Relieve de Gabro (cruz)", + "block.mineralogy.gabbro_relief_hammer": "Relieve de Gabro (martillo)", + "block.mineralogy.gabbro_relief_hoe": "Relieve de Gabro (azada)", + "block.mineralogy.gabbro_relief_horizontal": "Relieve de Gabro (horizontal)", + "block.mineralogy.gabbro_relief_i": "Relieve de Gabro (I)", + "block.mineralogy.gabbro_relief_left": "Relieve de Gabro (izquierda)", + "block.mineralogy.gabbro_relief_pickaxe": "Relieve de Gabro (pico)", + "block.mineralogy.gabbro_relief_plus": "Relieve de Gabro (signo más)", + "block.mineralogy.gabbro_relief_right": "Relieve de Gabro (derecha)", + "block.mineralogy.gabbro_relief_sword": "Relieve de Gabro (espada)", + "block.mineralogy.gabbro_relief_vertical": "Relieve de Gabro (vertical)", + "block.mineralogy.peridotite_relief_axe": "Relieve de Peridotita (hacha)", + "block.mineralogy.peridotite_relief_blank": "Relieve de Peridotita (sin motivo)", + "block.mineralogy.peridotite_relief_cross": "Relieve de Peridotita (cruz)", + "block.mineralogy.peridotite_relief_hammer": "Relieve de Peridotita (martillo)", + "block.mineralogy.peridotite_relief_hoe": "Relieve de Peridotita (azada)", + "block.mineralogy.peridotite_relief_horizontal": "Relieve de Peridotita (horizontal)", + "block.mineralogy.peridotite_relief_i": "Relieve de Peridotita (I)", + "block.mineralogy.peridotite_relief_left": "Relieve de Peridotita (izquierda)", + "block.mineralogy.peridotite_relief_pickaxe": "Relieve de Peridotita (pico)", + "block.mineralogy.peridotite_relief_plus": "Relieve de Peridotita (signo más)", + "block.mineralogy.peridotite_relief_right": "Relieve de Peridotita (derecha)", + "block.mineralogy.peridotite_relief_sword": "Relieve de Peridotita (espada)", + "block.mineralogy.peridotite_relief_vertical": "Relieve de Peridotita (vertical)", + "block.mineralogy.basaltic_glass_relief_axe": "Relieve de Vidrio basáltico (hacha)", + "block.mineralogy.basaltic_glass_relief_blank": "Relieve de Vidrio basáltico (sin motivo)", + "block.mineralogy.basaltic_glass_relief_cross": "Relieve de Vidrio basáltico (cruz)", + "block.mineralogy.basaltic_glass_relief_hammer": "Relieve de Vidrio basáltico (martillo)", + "block.mineralogy.basaltic_glass_relief_hoe": "Relieve de Vidrio basáltico (azada)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Relieve de Vidrio basáltico (horizontal)", + "block.mineralogy.basaltic_glass_relief_i": "Relieve de Vidrio basáltico (I)", + "block.mineralogy.basaltic_glass_relief_left": "Relieve de Vidrio basáltico (izquierda)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Relieve de Vidrio basáltico (pico)", + "block.mineralogy.basaltic_glass_relief_plus": "Relieve de Vidrio basáltico (signo más)", + "block.mineralogy.basaltic_glass_relief_right": "Relieve de Vidrio basáltico (derecha)", + "block.mineralogy.basaltic_glass_relief_sword": "Relieve de Vidrio basáltico (espada)", + "block.mineralogy.basaltic_glass_relief_vertical": "Relieve de Vidrio basáltico (vertical)", + "block.mineralogy.scoria_relief_axe": "Relieve de Escoria (hacha)", + "block.mineralogy.scoria_relief_blank": "Relieve de Escoria (sin motivo)", + "block.mineralogy.scoria_relief_cross": "Relieve de Escoria (cruz)", + "block.mineralogy.scoria_relief_hammer": "Relieve de Escoria (martillo)", + "block.mineralogy.scoria_relief_hoe": "Relieve de Escoria (azada)", + "block.mineralogy.scoria_relief_horizontal": "Relieve de Escoria (horizontal)", + "block.mineralogy.scoria_relief_i": "Relieve de Escoria (I)", + "block.mineralogy.scoria_relief_left": "Relieve de Escoria (izquierda)", + "block.mineralogy.scoria_relief_pickaxe": "Relieve de Escoria (pico)", + "block.mineralogy.scoria_relief_plus": "Relieve de Escoria (signo más)", + "block.mineralogy.scoria_relief_right": "Relieve de Escoria (derecha)", + "block.mineralogy.scoria_relief_sword": "Relieve de Escoria (espada)", + "block.mineralogy.scoria_relief_vertical": "Relieve de Escoria (vertical)", + "block.mineralogy.tuff_relief_axe": "Relieve de Toba (hacha)", + "block.mineralogy.tuff_relief_blank": "Relieve de Toba (sin motivo)", + "block.mineralogy.tuff_relief_cross": "Relieve de Toba (cruz)", + "block.mineralogy.tuff_relief_hammer": "Relieve de Toba (martillo)", + "block.mineralogy.tuff_relief_hoe": "Relieve de Toba (azada)", + "block.mineralogy.tuff_relief_horizontal": "Relieve de Toba (horizontal)", + "block.mineralogy.tuff_relief_i": "Relieve de Toba (I)", + "block.mineralogy.tuff_relief_left": "Relieve de Toba (izquierda)", + "block.mineralogy.tuff_relief_pickaxe": "Relieve de Toba (pico)", + "block.mineralogy.tuff_relief_plus": "Relieve de Toba (signo más)", + "block.mineralogy.tuff_relief_right": "Relieve de Toba (derecha)", + "block.mineralogy.tuff_relief_sword": "Relieve de Toba (espada)", + "block.mineralogy.tuff_relief_vertical": "Relieve de Toba (vertical)", + "block.mineralogy.siltstone_relief_axe": "Relieve de Limolita (hacha)", + "block.mineralogy.siltstone_relief_blank": "Relieve de Limolita (sin motivo)", + "block.mineralogy.siltstone_relief_cross": "Relieve de Limolita (cruz)", + "block.mineralogy.siltstone_relief_hammer": "Relieve de Limolita (martillo)", + "block.mineralogy.siltstone_relief_hoe": "Relieve de Limolita (azada)", + "block.mineralogy.siltstone_relief_horizontal": "Relieve de Limolita (horizontal)", + "block.mineralogy.siltstone_relief_i": "Relieve de Limolita (I)", + "block.mineralogy.siltstone_relief_left": "Relieve de Limolita (izquierda)", + "block.mineralogy.siltstone_relief_pickaxe": "Relieve de Limolita (pico)", + "block.mineralogy.siltstone_relief_plus": "Relieve de Limolita (signo más)", + "block.mineralogy.siltstone_relief_right": "Relieve de Limolita (derecha)", + "block.mineralogy.siltstone_relief_sword": "Relieve de Limolita (espada)", + "block.mineralogy.siltstone_relief_vertical": "Relieve de Limolita (vertical)", + "block.mineralogy.rock_salt_relief_axe": "Relieve de Sal de roca (hacha)", + "block.mineralogy.rock_salt_relief_blank": "Relieve de Sal de roca (sin motivo)", + "block.mineralogy.rock_salt_relief_cross": "Relieve de Sal de roca (cruz)", + "block.mineralogy.rock_salt_relief_hammer": "Relieve de Sal de roca (martillo)", + "block.mineralogy.rock_salt_relief_hoe": "Relieve de Sal de roca (azada)", + "block.mineralogy.rock_salt_relief_horizontal": "Relieve de Sal de roca (horizontal)", + "block.mineralogy.rock_salt_relief_i": "Relieve de Sal de roca (I)", + "block.mineralogy.rock_salt_relief_left": "Relieve de Sal de roca (izquierda)", + "block.mineralogy.rock_salt_relief_pickaxe": "Relieve de Sal de roca (pico)", + "block.mineralogy.rock_salt_relief_plus": "Relieve de Sal de roca (signo más)", + "block.mineralogy.rock_salt_relief_right": "Relieve de Sal de roca (derecha)", + "block.mineralogy.rock_salt_relief_sword": "Relieve de Sal de roca (espada)", + "block.mineralogy.rock_salt_relief_vertical": "Relieve de Sal de roca (vertical)", + "block.mineralogy.hornfels_relief_axe": "Relieve de Corneana (hacha)", + "block.mineralogy.hornfels_relief_blank": "Relieve de Corneana (sin motivo)", + "block.mineralogy.hornfels_relief_cross": "Relieve de Corneana (cruz)", + "block.mineralogy.hornfels_relief_hammer": "Relieve de Corneana (martillo)", + "block.mineralogy.hornfels_relief_hoe": "Relieve de Corneana (azada)", + "block.mineralogy.hornfels_relief_horizontal": "Relieve de Corneana (horizontal)", + "block.mineralogy.hornfels_relief_i": "Relieve de Corneana (I)", + "block.mineralogy.hornfels_relief_left": "Relieve de Corneana (izquierda)", + "block.mineralogy.hornfels_relief_pickaxe": "Relieve de Corneana (pico)", + "block.mineralogy.hornfels_relief_plus": "Relieve de Corneana (signo más)", + "block.mineralogy.hornfels_relief_right": "Relieve de Corneana (derecha)", + "block.mineralogy.hornfels_relief_sword": "Relieve de Corneana (espada)", + "block.mineralogy.hornfels_relief_vertical": "Relieve de Corneana (vertical)", + "block.mineralogy.quartzite_relief_axe": "Relieve de Cuarcita (hacha)", + "block.mineralogy.quartzite_relief_blank": "Relieve de Cuarcita (sin motivo)", + "block.mineralogy.quartzite_relief_cross": "Relieve de Cuarcita (cruz)", + "block.mineralogy.quartzite_relief_hammer": "Relieve de Cuarcita (martillo)", + "block.mineralogy.quartzite_relief_hoe": "Relieve de Cuarcita (azada)", + "block.mineralogy.quartzite_relief_horizontal": "Relieve de Cuarcita (horizontal)", + "block.mineralogy.quartzite_relief_i": "Relieve de Cuarcita (I)", + "block.mineralogy.quartzite_relief_left": "Relieve de Cuarcita (izquierda)", + "block.mineralogy.quartzite_relief_pickaxe": "Relieve de Cuarcita (pico)", + "block.mineralogy.quartzite_relief_plus": "Relieve de Cuarcita (signo más)", + "block.mineralogy.quartzite_relief_right": "Relieve de Cuarcita (derecha)", + "block.mineralogy.quartzite_relief_sword": "Relieve de Cuarcita (espada)", + "block.mineralogy.quartzite_relief_vertical": "Relieve de Cuarcita (vertical)", + "block.mineralogy.novaculite_relief_axe": "Relieve de Novaculita (hacha)", + "block.mineralogy.novaculite_relief_blank": "Relieve de Novaculita (sin motivo)", + "block.mineralogy.novaculite_relief_cross": "Relieve de Novaculita (cruz)", + "block.mineralogy.novaculite_relief_hammer": "Relieve de Novaculita (martillo)", + "block.mineralogy.novaculite_relief_hoe": "Relieve de Novaculita (azada)", + "block.mineralogy.novaculite_relief_horizontal": "Relieve de Novaculita (horizontal)", + "block.mineralogy.novaculite_relief_i": "Relieve de Novaculita (I)", + "block.mineralogy.novaculite_relief_left": "Relieve de Novaculita (izquierda)", + "block.mineralogy.novaculite_relief_pickaxe": "Relieve de Novaculita (pico)", + "block.mineralogy.novaculite_relief_plus": "Relieve de Novaculita (signo más)", + "block.mineralogy.novaculite_relief_right": "Relieve de Novaculita (derecha)", + "block.mineralogy.novaculite_relief_sword": "Relieve de Novaculita (espada)", + "block.mineralogy.novaculite_relief_vertical": "Relieve de Novaculita (vertical)", + "itemGroup.mineralogy.mineralogy": "Mineralogía", + "itemGroup.mineralogy.rock": "Rocas de Mineralogía", + "itemGroup.mineralogy.stair": "Escaleras de Mineralogía", + "itemGroup.mineralogy.slab": "Losas de Mineralogía", + "itemGroup.mineralogy.wall": "Muros de Mineralogía", + "itemGroup.mineralogy.item": "Objetos de Mineralogía", + "block.mineralogy.crude_oil": "Petróleo crudo", + "item.mineralogy.crude_oil_bucket": "Cubo de petróleo crudo", + "fluid.mineralogy.crude_oil": "Petróleo crudo", + "advancements.mineralogy.all_the_rocks.title": "Todas las rocas", + "advancements.mineralogy.all_the_rocks.description": "¡Has encontrado todos los tipos de roca estándar de Mineralogy!" } diff --git a/src/main/resources/assets/mineralogy/lang/fr_ca.json b/src/main/resources/assets/mineralogy/lang/fr_ca.json index db22a2f75..adfa816a0 100644 --- a/src/main/resources/assets/mineralogy/lang/fr_ca.json +++ b/src/main/resources/assets/mineralogy/lang/fr_ca.json @@ -1,196 +1,196 @@ { "block.mineralogy.andesite": "Andésite", - "block.mineralogy.andesite_stairs": "Escaliers Andésites", - "block.mineralogy.andesite_slab": "Dalle d'Andésite", - "block.mineralogy.andesite_brick": "Brique d'Andésite", - "block.mineralogy.andesite_brick_stairs": "Escaliers en brique d'Andesite", - "block.mineralogy.andesite_brick_slab": "Dalle de brique d'Andesite", - "block.mineralogy.andesite_smooth": "Andésite polie", - "block.mineralogy.andesite_smooth_stairs": "Escaliers polis d'Andésite", - "block.mineralogy.andesite_smooth_slab": "Dalle polie d'Andésite", - "block.mineralogy.andesite_smooth_brick": "Brique polie d'Andésite", - "block.mineralogy.andesite_smooth_brick_stairs": "Escaliers en brique polis par Andesite", - "block.mineralogy.andesite_smooth_brick_slab": "Dalle de brique polie d'Andésite", + "block.mineralogy.andesite_stairs": "Escalier en Andésite", + "block.mineralogy.andesite_slab": "Dalle en Andésite", + "block.mineralogy.andesite_brick": "Briques en Andésite", + "block.mineralogy.andesite_brick_stairs": "Escalier en briques de Andésite", + "block.mineralogy.andesite_brick_slab": "Dalle en briques de Andésite", + "block.mineralogy.andesite_smooth": "Bloc poli en Andésite", + "block.mineralogy.andesite_smooth_stairs": "Escalier poli en Andésite", + "block.mineralogy.andesite_smooth_slab": "Dalle polie en Andésite", + "block.mineralogy.andesite_smooth_brick": "Briques polies en Andésite", + "block.mineralogy.andesite_smooth_brick_stairs": "Escalier en briques polies de Andésite", + "block.mineralogy.andesite_smooth_brick_slab": "Dalle en briques polies de Andésite", "block.mineralogy.basalt": "Basalte", - "block.mineralogy.basalt_stairs": "Escaliers basaltiques", - "block.mineralogy.basalt_slab": "Dalle de basalte", - "block.mineralogy.basalt_brick": "Brique de basalte", - "block.mineralogy.basalt_brick_stairs": "Escaliers de brique de basalte", - "block.mineralogy.basalt_brick_slab": "Dalle de brique de basalte", - "block.mineralogy.basalt_smooth": "Basalte poli", - "block.mineralogy.basalt_smooth_stairs": "Escaliers polis au basalte", - "block.mineralogy.basalt_smooth_slab": "Dalle polie au basalte", - "block.mineralogy.basalt_smooth_brick": "Brique polie au basalte", - "block.mineralogy.basalt_smooth_brick_stairs": "Escaliers en brique polis au basalte", - "block.mineralogy.basalt_smooth_brick_slab": "Dalle de brique polie au basalte", + "block.mineralogy.basalt_stairs": "Escalier en Basalte", + "block.mineralogy.basalt_slab": "Dalle en Basalte", + "block.mineralogy.basalt_brick": "Briques en Basalte", + "block.mineralogy.basalt_brick_stairs": "Escalier en briques de Basalte", + "block.mineralogy.basalt_brick_slab": "Dalle en briques de Basalte", + "block.mineralogy.basalt_smooth": "Bloc poli en Basalte", + "block.mineralogy.basalt_smooth_stairs": "Escalier poli en Basalte", + "block.mineralogy.basalt_smooth_slab": "Dalle polie en Basalte", + "block.mineralogy.basalt_smooth_brick": "Briques polies en Basalte", + "block.mineralogy.basalt_smooth_brick_stairs": "Escalier en briques polies de Basalte", + "block.mineralogy.basalt_smooth_brick_slab": "Dalle en briques polies de Basalte", "block.mineralogy.diorite": "Diorite", - "block.mineralogy.diorite_stairs": "Escaliers Diorite", - "block.mineralogy.diorite_slab": "Dalle de Diorite", - "block.mineralogy.diorite_brick": "Brique Diorite", - "block.mineralogy.diorite_brick_stairs": "Escaliers en brique Diorite", - "block.mineralogy.diorite_brick_slab": "Dalle de brique Diorite", - "block.mineralogy.diorite_smooth": "Diorite polie", - "block.mineralogy.diorite_smooth_stairs": "Escaliers polis au Diorite", - "block.mineralogy.diorite_smooth_slab": "Dalle polie Diorite", - "block.mineralogy.diorite_smooth_brick": "Brique polie Diorite", - "block.mineralogy.diorite_smooth_brick_stairs": "Escaliers en briques polies Diorite", - "block.mineralogy.diorite_smooth_brick_slab": "Dalle de brique polie Diorite", - "block.mineralogy.granite": "Granit", - "block.mineralogy.granite_stairs": "Escaliers en granit", - "block.mineralogy.granite_slab": "Dalle de granit", - "block.mineralogy.granite_brick": "Brique de granit", - "block.mineralogy.granite_brick_stairs": "Escaliers en brique de granit", - "block.mineralogy.granite_brick_slab": "Dalle de brique de granit", - "block.mineralogy.granite_smooth": "Granit poli", - "block.mineralogy.granite_smooth_stairs": "Escaliers polis de granit", - "block.mineralogy.granite_smooth_slab": "Dalle polie de granit", - "block.mineralogy.granite_smooth_brick": "Brique polie de granit", - "block.mineralogy.granite_smooth_brick_stairs": "Escaliers en brique polis de granit", - "block.mineralogy.granite_smooth_brick_slab": "Dalle de brique polie de granit", + "block.mineralogy.diorite_stairs": "Escalier en Diorite", + "block.mineralogy.diorite_slab": "Dalle en Diorite", + "block.mineralogy.diorite_brick": "Briques en Diorite", + "block.mineralogy.diorite_brick_stairs": "Escalier en briques de Diorite", + "block.mineralogy.diorite_brick_slab": "Dalle en briques de Diorite", + "block.mineralogy.diorite_smooth": "Bloc poli en Diorite", + "block.mineralogy.diorite_smooth_stairs": "Escalier poli en Diorite", + "block.mineralogy.diorite_smooth_slab": "Dalle polie en Diorite", + "block.mineralogy.diorite_smooth_brick": "Briques polies en Diorite", + "block.mineralogy.diorite_smooth_brick_stairs": "Escalier en briques polies de Diorite", + "block.mineralogy.diorite_smooth_brick_slab": "Dalle en briques polies de Diorite", + "block.mineralogy.granite": "Granite", + "block.mineralogy.granite_stairs": "Escalier en Granite", + "block.mineralogy.granite_slab": "Dalle en Granite", + "block.mineralogy.granite_brick": "Briques en Granite", + "block.mineralogy.granite_brick_stairs": "Escalier en briques de Granite", + "block.mineralogy.granite_brick_slab": "Dalle en briques de Granite", + "block.mineralogy.granite_smooth": "Bloc poli en Granite", + "block.mineralogy.granite_smooth_stairs": "Escalier poli en Granite", + "block.mineralogy.granite_smooth_slab": "Dalle polie en Granite", + "block.mineralogy.granite_smooth_brick": "Briques polies en Granite", + "block.mineralogy.granite_smooth_brick_stairs": "Escalier en briques polies de Granite", + "block.mineralogy.granite_smooth_brick_slab": "Dalle en briques polies de Granite", "block.mineralogy.rhyolite": "Rhyolite", - "block.mineralogy.rhyolite_stairs": "Escaliers en rhyolite", - "block.mineralogy.rhyolite_slab": "Dalle de rhyolite", - "block.mineralogy.rhyolite_brick": "Brique de rhyolite", - "block.mineralogy.rhyolite_brick_stairs": "Escaliers en brique de rhyolite", - "block.mineralogy.rhyolite_brick_slab": "Dalle de brique de rhyolite", - "block.mineralogy.rhyolite_smooth": "Rhyolite polie", - "block.mineralogy.rhyolite_smooth_stairs": "Escaliers polis à la rhyolite", - "block.mineralogy.rhyolite_smooth_slab": "Dalle polie à la rhyolite", - "block.mineralogy.rhyolite_smooth_brick": "Brique polie de rhyolite", - "block.mineralogy.rhyolite_smooth_brick_stairs": "Escaliers en briques polies à la rhyolite", - "block.mineralogy.rhyolite_smooth_brick_slab": "Dalle de brique polie rhyolite", + "block.mineralogy.rhyolite_stairs": "Escalier en Rhyolite", + "block.mineralogy.rhyolite_slab": "Dalle en Rhyolite", + "block.mineralogy.rhyolite_brick": "Briques en Rhyolite", + "block.mineralogy.rhyolite_brick_stairs": "Escalier en briques de Rhyolite", + "block.mineralogy.rhyolite_brick_slab": "Dalle en briques de Rhyolite", + "block.mineralogy.rhyolite_smooth": "Bloc poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_stairs": "Escalier poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_slab": "Dalle polie en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick": "Briques polies en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Escalier en briques polies de Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_slab": "Dalle en briques polies de Rhyolite", "block.mineralogy.pegmatite": "Pegmatite", - "block.mineralogy.pegmatite_stairs": "Escaliers en Pegmatite", - "block.mineralogy.pegmatite_slab": "Dalle de Pegmatite", - "block.mineralogy.pegmatite_brick": "Brique de Pegmatite", - "block.mineralogy.pegmatite_brick_stairs": "Escaliers en brique de Pegmatite", - "block.mineralogy.pegmatite_brick_slab": "Dalle de brique de Pegmatite", - "block.mineralogy.pegmatite_smooth": "Pegmatite polie", - "block.mineralogy.pegmatite_smooth_stairs": "Escaliers polis à la Pegmatite", - "block.mineralogy.pegmatite_smooth_slab": "Dalle polie de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick": "Brique polie de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_stairs": "Escaliers en briques polies à la Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_slab": "Dalle de brique polie par Pegmatite", + "block.mineralogy.pegmatite_stairs": "Escalier en Pegmatite", + "block.mineralogy.pegmatite_slab": "Dalle en Pegmatite", + "block.mineralogy.pegmatite_brick": "Briques en Pegmatite", + "block.mineralogy.pegmatite_brick_stairs": "Escalier en briques de Pegmatite", + "block.mineralogy.pegmatite_brick_slab": "Dalle en briques de Pegmatite", + "block.mineralogy.pegmatite_smooth": "Bloc poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_stairs": "Escalier poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_slab": "Dalle polie en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick": "Briques polies en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Escalier en briques polies de Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_slab": "Dalle en briques polies de Pegmatite", "block.mineralogy.shale": "Schiste argileux", - "block.mineralogy.shale_stairs": "Escaliers de schiste", - "block.mineralogy.shale_slab": "Dalle de schiste", - "block.mineralogy.shale_brick": "Brique de schiste", - "block.mineralogy.shale_brick_stairs": "Escaliers de briques de schiste", - "block.mineralogy.shale_brick_slab": "Dalle de brique de schiste", - "block.mineralogy.shale_smooth": "Schiste poli", - "block.mineralogy.shale_smooth_stairs": "Escaliers polis au schiste", - "block.mineralogy.shale_smooth_slab": "Dalle polie au schiste", - "block.mineralogy.shale_smooth_brick": "Brique polie schiste", - "block.mineralogy.shale_smooth_brick_stairs": "Escaliers de brique polis au schiste", - "block.mineralogy.shale_smooth_brick_slab": "Dalle de brique polie au schiste", + "block.mineralogy.shale_stairs": "Escalier en Schiste argileux", + "block.mineralogy.shale_slab": "Dalle en Schiste argileux", + "block.mineralogy.shale_brick": "Briques en Schiste argileux", + "block.mineralogy.shale_brick_stairs": "Escalier en briques de Schiste argileux", + "block.mineralogy.shale_brick_slab": "Dalle en briques de Schiste argileux", + "block.mineralogy.shale_smooth": "Bloc poli en Schiste argileux", + "block.mineralogy.shale_smooth_stairs": "Escalier poli en Schiste argileux", + "block.mineralogy.shale_smooth_slab": "Dalle polie en Schiste argileux", + "block.mineralogy.shale_smooth_brick": "Briques polies en Schiste argileux", + "block.mineralogy.shale_smooth_brick_stairs": "Escalier en briques polies de Schiste argileux", + "block.mineralogy.shale_smooth_brick_slab": "Dalle en briques polies de Schiste argileux", "block.mineralogy.conglomerate": "Conglomérat", - "block.mineralogy.conglomerate_stairs": "Escaliers du Conglomérat", - "block.mineralogy.conglomerate_slab": "Dalle de conglomérat", - "block.mineralogy.conglomerate_brick": "Brique Conglomérat", - "block.mineralogy.conglomerate_brick_stairs": "Escaliers en brique de Conglomérat", - "block.mineralogy.conglomerate_brick_slab": "Dalle de brique de conglomérat", - "block.mineralogy.conglomerate_smooth": "Conglomérat poli", - "block.mineralogy.conglomerate_smooth_stairs": "Escaliers polis au conglomérat", - "block.mineralogy.conglomerate_smooth_slab": "Conglomerate dalle polie", - "block.mineralogy.conglomerate_smooth_brick": "Conglomerate brique polie", - "block.mineralogy.conglomerate_smooth_brick_stairs": "Conglomerate poli escalier en brique", - "block.mineralogy.conglomerate_smooth_brick_slab": "Plaque de brique polie Conglomerate", + "block.mineralogy.conglomerate_stairs": "Escalier en Conglomérat", + "block.mineralogy.conglomerate_slab": "Dalle en Conglomérat", + "block.mineralogy.conglomerate_brick": "Briques en Conglomérat", + "block.mineralogy.conglomerate_brick_stairs": "Escalier en briques de Conglomérat", + "block.mineralogy.conglomerate_brick_slab": "Dalle en briques de Conglomérat", + "block.mineralogy.conglomerate_smooth": "Bloc poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_stairs": "Escalier poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_slab": "Dalle polie en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick": "Briques polies en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Escalier en briques polies de Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_slab": "Dalle en briques polies de Conglomérat", "block.mineralogy.dolomite": "Dolomie", - "block.mineralogy.dolomite_stairs": "Escaliers en dolomite", - "block.mineralogy.dolomite_slab": "Dalle de dolomite", - "block.mineralogy.dolomite_brick": "Brique de dolomite", - "block.mineralogy.dolomite_brick_stairs": "Escaliers de brique en dolomite", - "block.mineralogy.dolomite_brick_slab": "Dalle de brique en dolomite", - "block.mineralogy.dolomite_smooth": "Dolomite polie", - "block.mineralogy.dolomite_smooth_stairs": "Escaliers polis en dolomite", - "block.mineralogy.dolomite_smooth_slab": "Dalle polie en dolomite", - "block.mineralogy.dolomite_smooth_brick": "Brique polie de Dolomite", - "block.mineralogy.dolomite_smooth_brick_stairs": "Escaliers en briques polies dolomitiques", - "block.mineralogy.dolomite_smooth_brick_slab": "Dalle de brique polie en dolomite", + "block.mineralogy.dolomite_stairs": "Escalier en Dolomie", + "block.mineralogy.dolomite_slab": "Dalle en Dolomie", + "block.mineralogy.dolomite_brick": "Briques en Dolomie", + "block.mineralogy.dolomite_brick_stairs": "Escalier en briques de Dolomie", + "block.mineralogy.dolomite_brick_slab": "Dalle en briques de Dolomie", + "block.mineralogy.dolomite_smooth": "Bloc poli en Dolomie", + "block.mineralogy.dolomite_smooth_stairs": "Escalier poli en Dolomie", + "block.mineralogy.dolomite_smooth_slab": "Dalle polie en Dolomie", + "block.mineralogy.dolomite_smooth_brick": "Briques polies en Dolomie", + "block.mineralogy.dolomite_smooth_brick_stairs": "Escalier en briques polies de Dolomie", + "block.mineralogy.dolomite_smooth_brick_slab": "Dalle en briques polies de Dolomie", "block.mineralogy.limestone": "Calcaire", - "block.mineralogy.limestone_stairs": "Escaliers en calcaire", - "block.mineralogy.limestone_slab": "Dalle de calcaire", - "block.mineralogy.limestone_brick": "Brique de calcaire", - "block.mineralogy.limestone_brick_stairs": "Escaliers en brique calcaire", - "block.mineralogy.limestone_brick_slab": "Dalle de brique en calcaire", - "block.mineralogy.limestone_smooth": "Calcaire poli", - "block.mineralogy.limestone_smooth_stairs": "Escaliers polis au calcaire", - "block.mineralogy.limestone_smooth_slab": "Dalle polie en calcaire", - "block.mineralogy.limestone_smooth_brick": "Brique polie au calcaire", - "block.mineralogy.limestone_smooth_brick_stairs": "Escaliers en briques polis à la chaux", - "block.mineralogy.limestone_smooth_brick_slab": "Dalle de brique polie au calcaire", + "block.mineralogy.limestone_stairs": "Escalier en Calcaire", + "block.mineralogy.limestone_slab": "Dalle en Calcaire", + "block.mineralogy.limestone_brick": "Briques en Calcaire", + "block.mineralogy.limestone_brick_stairs": "Escalier en briques de Calcaire", + "block.mineralogy.limestone_brick_slab": "Dalle en briques de Calcaire", + "block.mineralogy.limestone_smooth": "Bloc poli en Calcaire", + "block.mineralogy.limestone_smooth_stairs": "Escalier poli en Calcaire", + "block.mineralogy.limestone_smooth_slab": "Dalle polie en Calcaire", + "block.mineralogy.limestone_smooth_brick": "Briques polies en Calcaire", + "block.mineralogy.limestone_smooth_brick_stairs": "Escalier en briques polies de Calcaire", + "block.mineralogy.limestone_smooth_brick_slab": "Dalle en briques polies de Calcaire", "block.mineralogy.slate": "Ardoise", - "block.mineralogy.slate_stairs": "Escaliers en ardoise", - "block.mineralogy.slate_slab": "Dalle d'ardoise", - "block.mineralogy.slate_brick": "Brique d'ardoise", - "block.mineralogy.slate_brick_stairs": "Escaliers en briques d'ardoise", - "block.mineralogy.slate_brick_slab": "Dalle de briques d'ardoise", - "block.mineralogy.slate_smooth": "Ardoise polie", - "block.mineralogy.slate_smooth_stairs": "Escaliers polis en ardoise", - "block.mineralogy.slate_smooth_slab": "Dalle polie en ardoise", - "block.mineralogy.slate_smooth_brick": "Brique polie d'ardoise", - "block.mineralogy.slate_smooth_brick_stairs": "Escaliers en brique polie en ardoise", - "block.mineralogy.slate_smooth_brick_slab": "Dalle de brique polie ardoise", - "block.mineralogy.schist": "Schiste", - "block.mineralogy.schist_stairs": "Escaliers de schiste", - "block.mineralogy.schist_slab": "Dalle de schiste", - "block.mineralogy.schist_brick": "Brique de schiste", - "block.mineralogy.schist_brick_stairs": "Escaliers en brique de schiste", - "block.mineralogy.schist_brick_slab": "Dalle de brique de schiste", - "block.mineralogy.schist_smooth": "Schiste poli", - "block.mineralogy.schist_smooth_stairs": "Escaliers polis Schiste", - "block.mineralogy.schist_smooth_slab": "Dalle polie par schiste", - "block.mineralogy.schist_smooth_brick": "Brique polie par schiste", - "block.mineralogy.schist_smooth_brick_stairs": "Escaliers de brique polis par schiste", - "block.mineralogy.schist_smooth_brick_slab": "Dalle de brique polie par schiste", + "block.mineralogy.slate_stairs": "Escalier en Ardoise", + "block.mineralogy.slate_slab": "Dalle en Ardoise", + "block.mineralogy.slate_brick": "Briques en Ardoise", + "block.mineralogy.slate_brick_stairs": "Escalier en briques de Ardoise", + "block.mineralogy.slate_brick_slab": "Dalle en briques de Ardoise", + "block.mineralogy.slate_smooth": "Bloc poli en Ardoise", + "block.mineralogy.slate_smooth_stairs": "Escalier poli en Ardoise", + "block.mineralogy.slate_smooth_slab": "Dalle polie en Ardoise", + "block.mineralogy.slate_smooth_brick": "Briques polies en Ardoise", + "block.mineralogy.slate_smooth_brick_stairs": "Escalier en briques polies de Ardoise", + "block.mineralogy.slate_smooth_brick_slab": "Dalle en briques polies de Ardoise", + "block.mineralogy.schist": "Micaschiste", + "block.mineralogy.schist_stairs": "Escalier en Micaschiste", + "block.mineralogy.schist_slab": "Dalle en Micaschiste", + "block.mineralogy.schist_brick": "Briques en Micaschiste", + "block.mineralogy.schist_brick_stairs": "Escalier en briques de Micaschiste", + "block.mineralogy.schist_brick_slab": "Dalle en briques de Micaschiste", + "block.mineralogy.schist_smooth": "Bloc poli en Micaschiste", + "block.mineralogy.schist_smooth_stairs": "Escalier poli en Micaschiste", + "block.mineralogy.schist_smooth_slab": "Dalle polie en Micaschiste", + "block.mineralogy.schist_smooth_brick": "Briques polies en Micaschiste", + "block.mineralogy.schist_smooth_brick_stairs": "Escalier en briques polies de Micaschiste", + "block.mineralogy.schist_smooth_brick_slab": "Dalle en briques polies de Micaschiste", "block.mineralogy.gneiss": "Gneiss", - "block.mineralogy.gneiss_stairs": "Escaliers de gneiss", - "block.mineralogy.gneiss_slab": "Dalle de gneiss", - "block.mineralogy.gneiss_brick": "Brique de gneiss", - "block.mineralogy.gneiss_brick_stairs": "Escaliers en brique de gneiss", - "block.mineralogy.gneiss_brick_slab": "Dalle de brique de gneiss", - "block.mineralogy.gneiss_smooth": "Gneiss poli", - "block.mineralogy.gneiss_smooth_stairs": "Escaliers polis Gneiss", - "block.mineralogy.gneiss_smooth_slab": "Dalle polie au gneiss", - "block.mineralogy.gneiss_smooth_brick": "Brique polie gneiss", - "block.mineralogy.gneiss_smooth_brick_stairs": "Escaliers en brique polis gneiss", - "block.mineralogy.gneiss_smooth_brick_slab": "Dalle de brique polie par gneiss", + "block.mineralogy.gneiss_stairs": "Escalier en Gneiss", + "block.mineralogy.gneiss_slab": "Dalle en Gneiss", + "block.mineralogy.gneiss_brick": "Briques en Gneiss", + "block.mineralogy.gneiss_brick_stairs": "Escalier en briques de Gneiss", + "block.mineralogy.gneiss_brick_slab": "Dalle en briques de Gneiss", + "block.mineralogy.gneiss_smooth": "Bloc poli en Gneiss", + "block.mineralogy.gneiss_smooth_stairs": "Escalier poli en Gneiss", + "block.mineralogy.gneiss_smooth_slab": "Dalle polie en Gneiss", + "block.mineralogy.gneiss_smooth_brick": "Briques polies en Gneiss", + "block.mineralogy.gneiss_smooth_brick_stairs": "Escalier en briques polies de Gneiss", + "block.mineralogy.gneiss_smooth_brick_slab": "Dalle en briques polies de Gneiss", "block.mineralogy.marble": "Marbre", - "block.mineralogy.marble_stairs": "Escaliers en marbre", - "block.mineralogy.marble_slab": "Dalle de marbre", - "block.mineralogy.marble_brick": "Brique de marbre", - "block.mineralogy.marble_brick_stairs": "Escaliers en brique de marbre", - "block.mineralogy.marble_brick_slab": "Dalle de brique en marbre", - "block.mineralogy.marble_smooth": "Marbre poli", - "block.mineralogy.marble_smooth_stairs": "Escaliers polis en marbre", - "block.mineralogy.marble_smooth_slab": "Dalle polie en marbre", - "block.mineralogy.marble_smooth_brick": "Brique polie en marbre", - "block.mineralogy.marble_smooth_brick_stairs": "Escaliers en brique polis en marbre", - "block.mineralogy.marble_smooth_brick_slab": "Dalle de brique polie en marbre", - "block.mineralogy.phyllite": "Phyllite", - "block.mineralogy.phyllite_stairs": "Escaliers en phyllite", - "block.mineralogy.phyllite_slab": "Dalle de Phyllite", - "block.mineralogy.phyllite_brick": "Brique de phyllite", - "block.mineralogy.phyllite_brick_stairs": "Escaliers en brique de phyllite", - "block.mineralogy.phyllite_brick_slab": "Dalle de brique de phyllite", - "block.mineralogy.phyllite_smooth": "Phyllite polie", - "block.mineralogy.phyllite_smooth_stairs": "Escaliers polis en phyllite", - "block.mineralogy.phyllite_smooth_slab": "Dalle polie en phyllite", - "block.mineralogy.phyllite_smooth_brick": "Brique polie de phyllite", - "block.mineralogy.phyllite_smooth_brick_stairs": "Escaliers en briques polies en phyllite", - "block.mineralogy.phyllite_smooth_brick_slab": "Dalle de brique poli en phyllite", + "block.mineralogy.marble_stairs": "Escalier en Marbre", + "block.mineralogy.marble_slab": "Dalle en Marbre", + "block.mineralogy.marble_brick": "Briques en Marbre", + "block.mineralogy.marble_brick_stairs": "Escalier en briques de Marbre", + "block.mineralogy.marble_brick_slab": "Dalle en briques de Marbre", + "block.mineralogy.marble_smooth": "Bloc poli en Marbre", + "block.mineralogy.marble_smooth_stairs": "Escalier poli en Marbre", + "block.mineralogy.marble_smooth_slab": "Dalle polie en Marbre", + "block.mineralogy.marble_smooth_brick": "Briques polies en Marbre", + "block.mineralogy.marble_smooth_brick_stairs": "Escalier en briques polies de Marbre", + "block.mineralogy.marble_smooth_brick_slab": "Dalle en briques polies de Marbre", + "block.mineralogy.phyllite": "Phyllade", + "block.mineralogy.phyllite_stairs": "Escalier en Phyllade", + "block.mineralogy.phyllite_slab": "Dalle en Phyllade", + "block.mineralogy.phyllite_brick": "Briques en Phyllade", + "block.mineralogy.phyllite_brick_stairs": "Escalier en briques de Phyllade", + "block.mineralogy.phyllite_brick_slab": "Dalle en briques de Phyllade", + "block.mineralogy.phyllite_smooth": "Bloc poli en Phyllade", + "block.mineralogy.phyllite_smooth_stairs": "Escalier poli en Phyllade", + "block.mineralogy.phyllite_smooth_slab": "Dalle polie en Phyllade", + "block.mineralogy.phyllite_smooth_brick": "Briques polies en Phyllade", + "block.mineralogy.phyllite_smooth_brick_stairs": "Escalier en briques polies de Phyllade", + "block.mineralogy.phyllite_smooth_brick_slab": "Dalle en briques polies de Phyllade", "block.mineralogy.amphibolite": "Amphibolite", - "block.mineralogy.amphibolite_stairs": "Escaliers amphibolites", - "block.mineralogy.amphibolite_slab": "Plaque d'amphibolite", - "block.mineralogy.amphibolite_brick": "Brique d'amphibolite", - "block.mineralogy.amphibolite_brick_stairs": "Escaliers en brique amphibolite", - "block.mineralogy.amphibolite_brick_slab": "Plaque de brique d'amphibolite", - "block.mineralogy.amphibolite_smooth": "Amphibolite polie", - "block.mineralogy.amphibolite_smooth_stairs": "Escaliers polis à l'amphibolite", - "block.mineralogy.amphibolite_smooth_slab": "Dalle polie d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick": "Brique polie d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_stairs": "Escaliers en brique polis à l'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_slab": "Plaque de brique polie à l'amphibolite", + "block.mineralogy.amphibolite_stairs": "Escalier en Amphibolite", + "block.mineralogy.amphibolite_slab": "Dalle en Amphibolite", + "block.mineralogy.amphibolite_brick": "Briques en Amphibolite", + "block.mineralogy.amphibolite_brick_stairs": "Escalier en briques de Amphibolite", + "block.mineralogy.amphibolite_brick_slab": "Dalle en briques de Amphibolite", + "block.mineralogy.amphibolite_smooth": "Bloc poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_stairs": "Escalier poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_slab": "Dalle polie en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick": "Briques polies en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Escalier en briques polies de Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_slab": "Dalle en briques polies de Amphibolite", "item.mineralogy.gypsum_dust": "Poudre de gypse", "item.mineralogy.sulfur_dust": "Poudre de soufre", "item.mineralogy.phosphorous_dust": "Poudre de phosphore", @@ -201,722 +201,740 @@ "block.mineralogy.pumice": "Pierre ponce", "block.mineralogy.sulfur_block": "Soufre", "block.mineralogy.sulfur_ore": "Minerai de soufre", - "block.mineralogy.phosphorous_block": "Phosphoreux", + "block.mineralogy.phosphorous_block": "Phosphore", "block.mineralogy.phosphorous_ore": "Minerai de phosphore", "block.mineralogy.nitrate_block": "Nitrate", "block.mineralogy.nitrate_ore": "Minerai de nitrate", - "block.mineralogy.drywall_black": "Cloison sèche noire", - "block.mineralogy.drywall_red": "Cloison sèche rouge", - "block.mineralogy.drywall_green": "Cloison sèche verte", - "block.mineralogy.drywall_brown": "Cloison sèche brune", - "block.mineralogy.drywall_blue": "Cloison sèche bleue", - "block.mineralogy.drywall_purple": "Cloison sèche pourpre", - "block.mineralogy.drywall_cyan": "Cloison sèche cyan", - "block.mineralogy.drywall_silver": "Cloison sèche plafond gris", - "block.mineralogy.drywall_gray": "Cloison sèche grise", - "block.mineralogy.drywall_pink": "Cloison sèche rose", - "block.mineralogy.drywall_lime": "Cloison sèche vert-lime", - "block.mineralogy.drywall_yellow": "Cloison sèche jaune", - "block.mineralogy.drywall_light_blue": "Cloison sèche bleu clair", - "block.mineralogy.drywall_magenta": "Cloison sèche magenta", - "block.mineralogy.drywall_orange": "Cloison sèche orange", - "block.mineralogy.drywall_white": "Cloison sèche blanche", - "block.mineralogy.andesite_wall": "Mur d'Andésite", - "block.mineralogy.andesite_brick_wall": "Mur de briques d'Andésite", - "block.mineralogy.andesite_smooth_wall": "Mur poli d'Andésite", - "block.mineralogy.andesite_smooth_brick_wall": "Mur de briques polies par Andesite", - "block.mineralogy.basalt_wall": "Mur de basalte", - "block.mineralogy.basalt_brick_wall": "Mur de brique de basalte", - "block.mineralogy.basalt_smooth_wall": "Mur poli au basalte", - "block.mineralogy.basalt_smooth_brick_wall": "Mur de briques polies au basalte", - "block.mineralogy.diorite_wall": "Mur de Diorite", - "block.mineralogy.diorite_brick_wall": "Mur de briques Diorite", - "block.mineralogy.diorite_smooth_wall": "Mur Poli Diorite", - "block.mineralogy.diorite_smooth_brick_wall": "Mur de briques poli Diorite", - "block.mineralogy.granite_wall": "Mur de granit", - "block.mineralogy.granite_brick_wall": "Mur de briques de granit", - "block.mineralogy.granite_smooth_wall": "Mur poli de granit", - "block.mineralogy.granite_smooth_brick_wall": "Mur de briques poli de granit", - "block.mineralogy.rhyolite_wall": "Mur de rhyolite", - "block.mineralogy.rhyolite_brick_wall": "Mur de brique de rhyolite", - "block.mineralogy.rhyolite_smooth_wall": "Mur poli de rhyolite", - "block.mineralogy.rhyolite_smooth_brick_wall": "Mur de briques polies à la rhyolite", - "block.mineralogy.pegmatite_wall": "Mur de Pegmatite", - "block.mineralogy.pegmatite_brick_wall": "Mur de briques de Pegmatite", - "block.mineralogy.pegmatite_smooth_wall": "Mur poli de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_wall": "Mur de briques poli à la Pegmatite", - "block.mineralogy.shale_wall": "Mur de schiste", - "block.mineralogy.shale_brick_wall": "Mur de briques de schiste", - "block.mineralogy.shale_smooth_wall": "Mur poli de schiste", - "block.mineralogy.shale_smooth_brick_wall": "Mur de briques polies au schiste", - "block.mineralogy.conglomerate_wall": "Conglomérat mur", - "block.mineralogy.conglomerate_brick_wall": "Mur de briques Conglomérat", - "block.mineralogy.conglomerate_smooth_wall": "Conglomerate mur poli", - "block.mineralogy.conglomerate_smooth_brick_wall": "Conglomerate mur de briques polies", - "block.mineralogy.dolomite_wall": "Mur de dolomite", - "block.mineralogy.dolomite_brick_wall": "Mur de briques de dolomite", - "block.mineralogy.dolomite_smooth_wall": "Mur poli de Dolomite", - "block.mineralogy.dolomite_smooth_brick_wall": "Mur de briques poli à la dolomite", - "block.mineralogy.limestone_wall": "Mur de calcaire", - "block.mineralogy.limestone_brick_wall": "Mur de briques en calcaire", - "block.mineralogy.limestone_smooth_wall": "Mur poli au calcaire", - "block.mineralogy.limestone_smooth_brick_wall": "Mur de briques poli au calcaire", - "block.mineralogy.marble_wall": "Mur de marbre", - "block.mineralogy.marble_brick_wall": "Mur de briques en marbre", - "block.mineralogy.marble_smooth_wall": "Mur poli en marbre", - "block.mineralogy.marble_smooth_brick_wall": "Mur de briques polies en marbre", - "block.mineralogy.slate_wall": "Mur d'ardoise", - "block.mineralogy.slate_brick_wall": "Mur de briques d'ardoise", - "block.mineralogy.slate_smooth_wall": "Mur d'ardoise poli", - "block.mineralogy.slate_smooth_brick_wall": "Ardoise polie mur de briques", - "block.mineralogy.schist_wall": "Mur de schiste", - "block.mineralogy.schist_brick_wall": "Mur de briques de schiste", - "block.mineralogy.schist_smooth_wall": "Schiste poli mur", - "block.mineralogy.schist_smooth_brick_wall": "Mur de briques schist poli", - "block.mineralogy.gneiss_wall": "Mur de gneiss", - "block.mineralogy.gneiss_brick_wall": "Mur de briques en gneiss", - "block.mineralogy.gneiss_smooth_wall": "Gneiss poli mur", - "block.mineralogy.gneiss_smooth_brick_wall": "Gneiss poli mur de briques", - "block.mineralogy.phyllite_wall": "Mur de phyllite", - "block.mineralogy.phyllite_brick_wall": "Mur de briques de phyllite", - "block.mineralogy.phyllite_smooth_wall": "Mur poli de phyllite", - "block.mineralogy.phyllite_smooth_brick_wall": "Mur de briques poli en phyllite", - "block.mineralogy.amphibolite_wall": "Mur d'amphibolite", - "block.mineralogy.amphibolite_brick_wall": "Mur de briques d'amphibolite", - "block.mineralogy.amphibolite_smooth_wall": "Mur poli d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_wall": "Mur de briques poli à l'amphibolite", - "block.mineralogy.diorite_furnace": "Fourneau de Diorite", - "block.mineralogy.diorite_brick_furnace": "Fourneau de briques Diorite", - "block.mineralogy.diorite_smooth_furnace": "Fourneau Poli Diorite", - "block.mineralogy.diorite_smooth_brick_furnace": "Fourneau de briques poli Diorite", - "block.mineralogy.granite_furnace": "Fourneau de granit", - "block.mineralogy.granite_brick_furnace": "Fourneau de briques de granit", - "block.mineralogy.granite_smooth_furnace": "Fourneau poli de granit", - "block.mineralogy.granite_smooth_brick_furnace": "Fourneau de briques poli de granit", - "block.mineralogy.rhyolite_furnace": "Fourneau de rhyolite", - "block.mineralogy.rhyolite_brick_furnace": "Fourneau de brique de rhyolite", - "block.mineralogy.rhyolite_smooth_furnace": "Fourneau poli de rhyolite", - "block.mineralogy.rhyolite_smooth_brick_furnace": "Fourneau de briques polies à la rhyolite", - "block.mineralogy.pegmatite_furnace": "Fourneau de Pegmatite", - "block.mineralogy.pegmatite_brick_furnace": "Fourneau de briques de Pegmatite", - "block.mineralogy.pegmatite_smooth_furnace": "Fourneau poli de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_furnace": "Fourneau de briques poli à la Pegmatite", - "block.mineralogy.shale_furnace": "Fourneau de schiste", - "block.mineralogy.shale_brick_furnace": "Fourneau de briques de schiste", - "block.mineralogy.shale_smooth_furnace": "Fourneau poli de schiste", - "block.mineralogy.shale_smooth_brick_furnace": "Fourneau de briques polies au schiste", - "block.mineralogy.conglomerate_furnace": "Conglomérat mur", - "block.mineralogy.conglomerate_brick_furnace": "Fourneau de briques Conglomérat", - "block.mineralogy.conglomerate_smooth_furnace": "Conglomerate mur poli", - "block.mineralogy.conglomerate_smooth_brick_furnace": "Conglomerate mur de briques polies", - "block.mineralogy.dolomite_furnace": "Fourneau de dolomite", - "block.mineralogy.dolomite_brick_furnace": "Fourneau de briques de dolomite", - "block.mineralogy.dolomite_smooth_furnace": "Fourneau poli de Dolomite", - "block.mineralogy.dolomite_smooth_brick_furnace": "Fourneau de briques poli à la dolomite", - "block.mineralogy.limestone_furnace": "Fourneau de calcaire", - "block.mineralogy.limestone_brick_furnace": "Fourneau de briques en calcaire", - "block.mineralogy.limestone_smooth_furnace": "Fourneau poli au calcaire", - "block.mineralogy.limestone_smooth_brick_furnace": "Fourneau de briques poli au calcaire", - "block.mineralogy.marble_furnace": "Fourneau de marbre", - "block.mineralogy.marble_brick_furnace": "Fourneau de briques en marbre", - "block.mineralogy.marble_smooth_furnace": "Fourneau poli en marbre", - "block.mineralogy.marble_smooth_brick_furnace": "Fourneau de briques polies en marbre", - "block.mineralogy.slate_furnace": "Fourneau d'ardoise", - "block.mineralogy.slate_brick_furnace": "Fourneau de briques d'ardoise", - "block.mineralogy.slate_smooth_furnace": "Fourneau d'ardoise poli", - "block.mineralogy.slate_smooth_brick_furnace": "Ardoise polie mur de briques", - "block.mineralogy.schist_furnace": "Fourneau de schiste", - "block.mineralogy.schist_brick_furnace": "Fourneau de briques de schiste", - "block.mineralogy.schist_smooth_furnace": "Schiste poli mur", - "block.mineralogy.schist_smooth_brick_furnace": "Fourneau de briques schist poli", - "block.mineralogy.gneiss_furnace": "Fourneau de gneiss", - "block.mineralogy.gneiss_brick_furnace": "Fourneau de briques en gneiss", - "block.mineralogy.gneiss_smooth_furnace": "Gneiss poli mur", - "block.mineralogy.gneiss_smooth_brick_furnace": "Gneiss poli mur de briques", - "block.mineralogy.phyllite_furnace": "Fourneau de phyllite", - "block.mineralogy.phyllite_brick_furnace": "Fourneau de briques de phyllite", - "block.mineralogy.phyllite_smooth_furnace": "Fourneau poli de phyllite", - "block.mineralogy.phyllite_smooth_brick_furnace": "Fourneau de briques poli en phyllite", - "block.mineralogy.amphibolite_furnace": "Fourneau d'amphibolite", - "block.mineralogy.amphibolite_brick_furnace": "Fourneau de briques d'amphibolite", - "block.mineralogy.amphibolite_smooth_furnace": "Fourneau poli d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_furnace": "Fourneau de briques poli à l'amphibolite", + "block.mineralogy.drywall_black": "Plaque de plâtre noire", + "block.mineralogy.drywall_red": "Plaque de plâtre rouge", + "block.mineralogy.drywall_green": "Plaque de plâtre verte", + "block.mineralogy.drywall_brown": "Plaque de plâtre marron", + "block.mineralogy.drywall_blue": "Plaque de plâtre bleue", + "block.mineralogy.drywall_purple": "Plaque de plâtre violette", + "block.mineralogy.drywall_cyan": "Plaque de plâtre cyan", + "block.mineralogy.drywall_silver": "Plaque de plâtre gris clair", + "block.mineralogy.drywall_gray": "Plaque de plâtre grise", + "block.mineralogy.drywall_pink": "Plaque de plâtre rose", + "block.mineralogy.drywall_lime": "Plaque de plâtre vert citron", + "block.mineralogy.drywall_yellow": "Plaque de plâtre jaune", + "block.mineralogy.drywall_light_blue": "Plaque de plâtre bleu clair", + "block.mineralogy.drywall_magenta": "Plaque de plâtre magenta", + "block.mineralogy.drywall_orange": "Plaque de plâtre orange", + "block.mineralogy.drywall_white": "Plaque de plâtre blanche", + "block.mineralogy.andesite_wall": "Muret en Andésite", + "block.mineralogy.andesite_brick_wall": "Muret en briques de Andésite", + "block.mineralogy.andesite_smooth_wall": "Muret poli en Andésite", + "block.mineralogy.andesite_smooth_brick_wall": "Muret en briques polies de Andésite", + "block.mineralogy.basalt_wall": "Muret en Basalte", + "block.mineralogy.basalt_brick_wall": "Muret en briques de Basalte", + "block.mineralogy.basalt_smooth_wall": "Muret poli en Basalte", + "block.mineralogy.basalt_smooth_brick_wall": "Muret en briques polies de Basalte", + "block.mineralogy.diorite_wall": "Muret en Diorite", + "block.mineralogy.diorite_brick_wall": "Muret en briques de Diorite", + "block.mineralogy.diorite_smooth_wall": "Muret poli en Diorite", + "block.mineralogy.diorite_smooth_brick_wall": "Muret en briques polies de Diorite", + "block.mineralogy.granite_wall": "Muret en Granite", + "block.mineralogy.granite_brick_wall": "Muret en briques de Granite", + "block.mineralogy.granite_smooth_wall": "Muret poli en Granite", + "block.mineralogy.granite_smooth_brick_wall": "Muret en briques polies de Granite", + "block.mineralogy.rhyolite_wall": "Muret en Rhyolite", + "block.mineralogy.rhyolite_brick_wall": "Muret en briques de Rhyolite", + "block.mineralogy.rhyolite_smooth_wall": "Muret poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_wall": "Muret en briques polies de Rhyolite", + "block.mineralogy.pegmatite_wall": "Muret en Pegmatite", + "block.mineralogy.pegmatite_brick_wall": "Muret en briques de Pegmatite", + "block.mineralogy.pegmatite_smooth_wall": "Muret poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_wall": "Muret en briques polies de Pegmatite", + "block.mineralogy.shale_wall": "Muret en Schiste argileux", + "block.mineralogy.shale_brick_wall": "Muret en briques de Schiste argileux", + "block.mineralogy.shale_smooth_wall": "Muret poli en Schiste argileux", + "block.mineralogy.shale_smooth_brick_wall": "Muret en briques polies de Schiste argileux", + "block.mineralogy.conglomerate_wall": "Muret en Conglomérat", + "block.mineralogy.conglomerate_brick_wall": "Muret en briques de Conglomérat", + "block.mineralogy.conglomerate_smooth_wall": "Muret poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_wall": "Muret en briques polies de Conglomérat", + "block.mineralogy.dolomite_wall": "Muret en Dolomie", + "block.mineralogy.dolomite_brick_wall": "Muret en briques de Dolomie", + "block.mineralogy.dolomite_smooth_wall": "Muret poli en Dolomie", + "block.mineralogy.dolomite_smooth_brick_wall": "Muret en briques polies de Dolomie", + "block.mineralogy.limestone_wall": "Muret en Calcaire", + "block.mineralogy.limestone_brick_wall": "Muret en briques de Calcaire", + "block.mineralogy.limestone_smooth_wall": "Muret poli en Calcaire", + "block.mineralogy.limestone_smooth_brick_wall": "Muret en briques polies de Calcaire", + "block.mineralogy.marble_wall": "Muret en Marbre", + "block.mineralogy.marble_brick_wall": "Muret en briques de Marbre", + "block.mineralogy.marble_smooth_wall": "Muret poli en Marbre", + "block.mineralogy.marble_smooth_brick_wall": "Muret en briques polies de Marbre", + "block.mineralogy.slate_wall": "Muret en Ardoise", + "block.mineralogy.slate_brick_wall": "Muret en briques de Ardoise", + "block.mineralogy.slate_smooth_wall": "Muret poli en Ardoise", + "block.mineralogy.slate_smooth_brick_wall": "Muret en briques polies de Ardoise", + "block.mineralogy.schist_wall": "Muret en Micaschiste", + "block.mineralogy.schist_brick_wall": "Muret en briques de Micaschiste", + "block.mineralogy.schist_smooth_wall": "Muret poli en Micaschiste", + "block.mineralogy.schist_smooth_brick_wall": "Muret en briques polies de Micaschiste", + "block.mineralogy.gneiss_wall": "Muret en Gneiss", + "block.mineralogy.gneiss_brick_wall": "Muret en briques de Gneiss", + "block.mineralogy.gneiss_smooth_wall": "Muret poli en Gneiss", + "block.mineralogy.gneiss_smooth_brick_wall": "Muret en briques polies de Gneiss", + "block.mineralogy.phyllite_wall": "Muret en Phyllade", + "block.mineralogy.phyllite_brick_wall": "Muret en briques de Phyllade", + "block.mineralogy.phyllite_smooth_wall": "Muret poli en Phyllade", + "block.mineralogy.phyllite_smooth_brick_wall": "Muret en briques polies de Phyllade", + "block.mineralogy.amphibolite_wall": "Muret en Amphibolite", + "block.mineralogy.amphibolite_brick_wall": "Muret en briques de Amphibolite", + "block.mineralogy.amphibolite_smooth_wall": "Muret poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_wall": "Muret en briques polies de Amphibolite", + "block.mineralogy.andesite_furnace": "Fourneau en Andésite", + "block.mineralogy.andesite_brick_furnace": "Fourneau en briques de Andésite", + "block.mineralogy.andesite_smooth_furnace": "Fourneau poli en Andésite", + "block.mineralogy.andesite_smooth_brick_furnace": "Fourneau en briques polies de Andésite", + "block.mineralogy.basalt_furnace": "Fourneau en Basalte", + "block.mineralogy.basalt_brick_furnace": "Fourneau en briques de Basalte", + "block.mineralogy.basalt_smooth_furnace": "Fourneau poli en Basalte", + "block.mineralogy.basalt_smooth_brick_furnace": "Fourneau en briques polies de Basalte", + "block.mineralogy.diorite_furnace": "Fourneau en Diorite", + "block.mineralogy.diorite_brick_furnace": "Fourneau en briques de Diorite", + "block.mineralogy.diorite_smooth_furnace": "Fourneau poli en Diorite", + "block.mineralogy.diorite_smooth_brick_furnace": "Fourneau en briques polies de Diorite", + "block.mineralogy.granite_furnace": "Fourneau en Granite", + "block.mineralogy.granite_brick_furnace": "Fourneau en briques de Granite", + "block.mineralogy.granite_smooth_furnace": "Fourneau poli en Granite", + "block.mineralogy.granite_smooth_brick_furnace": "Fourneau en briques polies de Granite", + "block.mineralogy.rhyolite_furnace": "Fourneau en Rhyolite", + "block.mineralogy.rhyolite_brick_furnace": "Fourneau en briques de Rhyolite", + "block.mineralogy.rhyolite_smooth_furnace": "Fourneau poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Fourneau en briques polies de Rhyolite", + "block.mineralogy.pegmatite_furnace": "Fourneau en Pegmatite", + "block.mineralogy.pegmatite_brick_furnace": "Fourneau en briques de Pegmatite", + "block.mineralogy.pegmatite_smooth_furnace": "Fourneau poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Fourneau en briques polies de Pegmatite", + "block.mineralogy.shale_furnace": "Fourneau en Schiste argileux", + "block.mineralogy.shale_brick_furnace": "Fourneau en briques de Schiste argileux", + "block.mineralogy.shale_smooth_furnace": "Fourneau poli en Schiste argileux", + "block.mineralogy.shale_smooth_brick_furnace": "Fourneau en briques polies de Schiste argileux", + "block.mineralogy.conglomerate_furnace": "Fourneau en Conglomérat", + "block.mineralogy.conglomerate_brick_furnace": "Fourneau en briques de Conglomérat", + "block.mineralogy.conglomerate_smooth_furnace": "Fourneau poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Fourneau en briques polies de Conglomérat", + "block.mineralogy.dolomite_furnace": "Fourneau en Dolomie", + "block.mineralogy.dolomite_brick_furnace": "Fourneau en briques de Dolomie", + "block.mineralogy.dolomite_smooth_furnace": "Fourneau poli en Dolomie", + "block.mineralogy.dolomite_smooth_brick_furnace": "Fourneau en briques polies de Dolomie", + "block.mineralogy.limestone_furnace": "Fourneau en Calcaire", + "block.mineralogy.limestone_brick_furnace": "Fourneau en briques de Calcaire", + "block.mineralogy.limestone_smooth_furnace": "Fourneau poli en Calcaire", + "block.mineralogy.limestone_smooth_brick_furnace": "Fourneau en briques polies de Calcaire", + "block.mineralogy.marble_furnace": "Fourneau en Marbre", + "block.mineralogy.marble_brick_furnace": "Fourneau en briques de Marbre", + "block.mineralogy.marble_smooth_furnace": "Fourneau poli en Marbre", + "block.mineralogy.marble_smooth_brick_furnace": "Fourneau en briques polies de Marbre", + "block.mineralogy.slate_furnace": "Fourneau en Ardoise", + "block.mineralogy.slate_brick_furnace": "Fourneau en briques de Ardoise", + "block.mineralogy.slate_smooth_furnace": "Fourneau poli en Ardoise", + "block.mineralogy.slate_smooth_brick_furnace": "Fourneau en briques polies de Ardoise", + "block.mineralogy.schist_furnace": "Fourneau en Micaschiste", + "block.mineralogy.schist_brick_furnace": "Fourneau en briques de Micaschiste", + "block.mineralogy.schist_smooth_furnace": "Fourneau poli en Micaschiste", + "block.mineralogy.schist_smooth_brick_furnace": "Fourneau en briques polies de Micaschiste", + "block.mineralogy.gneiss_furnace": "Fourneau en Gneiss", + "block.mineralogy.gneiss_brick_furnace": "Fourneau en briques de Gneiss", + "block.mineralogy.gneiss_smooth_furnace": "Fourneau poli en Gneiss", + "block.mineralogy.gneiss_smooth_brick_furnace": "Fourneau en briques polies de Gneiss", + "block.mineralogy.phyllite_furnace": "Fourneau en Phyllade", + "block.mineralogy.phyllite_brick_furnace": "Fourneau en briques de Phyllade", + "block.mineralogy.phyllite_smooth_furnace": "Fourneau poli en Phyllade", + "block.mineralogy.phyllite_smooth_brick_furnace": "Fourneau en briques polies de Phyllade", + "block.mineralogy.amphibolite_furnace": "Fourneau en Amphibolite", + "block.mineralogy.amphibolite_brick_furnace": "Fourneau en briques de Amphibolite", + "block.mineralogy.amphibolite_smooth_furnace": "Fourneau poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Fourneau en briques polies de Amphibolite", "block.mineralogy.diabase": "Diabase", - "block.mineralogy.diabase_stairs": "Diabase Escaliers", - "block.mineralogy.diabase_slab": "Diabase Dalle", - "block.mineralogy.diabase_brick": "Diabase Brique", - "block.mineralogy.diabase_brick_stairs": "Diabase Escalier De Brique", - "block.mineralogy.diabase_brick_slab": "Diabase Dalle de brique", - "block.mineralogy.diabase_smooth": "Polished Diabase", - "block.mineralogy.diabase_smooth_stairs": "Diabase Escalier Poli", - "block.mineralogy.diabase_smooth_slab": "Diabase Dalle polie", - "block.mineralogy.diabase_smooth_brick": "Diabase Brique polie", - "block.mineralogy.diabase_smooth_brick_stairs": "Diabase Escalier en brique polie", - "block.mineralogy.diabase_smooth_brick_slab": "Diabase Dalle de brique polie", - "block.mineralogy.diabase_wall": "Diabase Wall", - "block.mineralogy.diabase_brick_wall": "Diabase Mur de briques", - "block.mineralogy.diabase_smooth_wall": "Diabase Mur poli", - "block.mineralogy.diabase_smooth_brick_wall": "Diabase Mur de brique poli", - "block.mineralogy.diabase_furnace": "Diabase Furnace", - "block.mineralogy.diabase_brick_furnace": "Diabase Four à briques", - "block.mineralogy.diabase_smooth_furnace": "Diabase Four poli", - "block.mineralogy.diabase_smooth_brick_furnace": "Diabase Four à brique polie", + "block.mineralogy.diabase_stairs": "Escalier en Diabase", + "block.mineralogy.diabase_slab": "Dalle en Diabase", + "block.mineralogy.diabase_brick": "Briques en Diabase", + "block.mineralogy.diabase_brick_stairs": "Escalier en briques de Diabase", + "block.mineralogy.diabase_brick_slab": "Dalle en briques de Diabase", + "block.mineralogy.diabase_smooth": "Bloc poli en Diabase", + "block.mineralogy.diabase_smooth_stairs": "Escalier poli en Diabase", + "block.mineralogy.diabase_smooth_slab": "Dalle polie en Diabase", + "block.mineralogy.diabase_smooth_brick": "Briques polies en Diabase", + "block.mineralogy.diabase_smooth_brick_stairs": "Escalier en briques polies de Diabase", + "block.mineralogy.diabase_smooth_brick_slab": "Dalle en briques polies de Diabase", + "block.mineralogy.diabase_wall": "Muret en Diabase", + "block.mineralogy.diabase_brick_wall": "Muret en briques de Diabase", + "block.mineralogy.diabase_smooth_wall": "Muret poli en Diabase", + "block.mineralogy.diabase_smooth_brick_wall": "Muret en briques polies de Diabase", + "block.mineralogy.diabase_furnace": "Fourneau en Diabase", + "block.mineralogy.diabase_brick_furnace": "Fourneau en briques de Diabase", + "block.mineralogy.diabase_smooth_furnace": "Fourneau poli en Diabase", + "block.mineralogy.diabase_smooth_brick_furnace": "Fourneau en briques polies de Diabase", "block.mineralogy.gabbro": "Gabbro", - "block.mineralogy.gabbro_stairs": "Gabbro Escaliers", - "block.mineralogy.gabbro_slab": "Gabbro Dalle", - "block.mineralogy.gabbro_brick": "Gabbro Brique", - "block.mineralogy.gabbro_brick_stairs": "Gabbro Escalier De Brique", - "block.mineralogy.gabbro_brick_slab": "Gabbro Dalle de brique", - "block.mineralogy.gabbro_smooth": "Polished Gabbro", - "block.mineralogy.gabbro_smooth_stairs": "Gabbro Escalier Poli", - "block.mineralogy.gabbro_smooth_slab": "Gabbro Dalle polie", - "block.mineralogy.gabbro_smooth_brick": "Gabbro Brique polie", - "block.mineralogy.gabbro_smooth_brick_stairs": "Gabbro Escalier en brique polie", - "block.mineralogy.gabbro_smooth_brick_slab": "Gabbro Dalle de brique polie", - "block.mineralogy.gabbro_wall": "Gabbro Wall", - "block.mineralogy.gabbro_brick_wall": "Gabbro Mur de briques", - "block.mineralogy.gabbro_smooth_wall": "Gabbro Mur poli", - "block.mineralogy.gabbro_smooth_brick_wall": "Gabbro Mur de brique poli", - "block.mineralogy.gabbro_furnace": "Gabbro Furnace", - "block.mineralogy.gabbro_brick_furnace": "Gabbro Four à briques", - "block.mineralogy.gabbro_smooth_furnace": "Gabbro Four poli", - "block.mineralogy.gabbro_smooth_brick_furnace": "Gabbro Four à brique polie", + "block.mineralogy.gabbro_stairs": "Escalier en Gabbro", + "block.mineralogy.gabbro_slab": "Dalle en Gabbro", + "block.mineralogy.gabbro_brick": "Briques en Gabbro", + "block.mineralogy.gabbro_brick_stairs": "Escalier en briques de Gabbro", + "block.mineralogy.gabbro_brick_slab": "Dalle en briques de Gabbro", + "block.mineralogy.gabbro_smooth": "Bloc poli en Gabbro", + "block.mineralogy.gabbro_smooth_stairs": "Escalier poli en Gabbro", + "block.mineralogy.gabbro_smooth_slab": "Dalle polie en Gabbro", + "block.mineralogy.gabbro_smooth_brick": "Briques polies en Gabbro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Escalier en briques polies de Gabbro", + "block.mineralogy.gabbro_smooth_brick_slab": "Dalle en briques polies de Gabbro", + "block.mineralogy.gabbro_wall": "Muret en Gabbro", + "block.mineralogy.gabbro_brick_wall": "Muret en briques de Gabbro", + "block.mineralogy.gabbro_smooth_wall": "Muret poli en Gabbro", + "block.mineralogy.gabbro_smooth_brick_wall": "Muret en briques polies de Gabbro", + "block.mineralogy.gabbro_furnace": "Fourneau en Gabbro", + "block.mineralogy.gabbro_brick_furnace": "Fourneau en briques de Gabbro", + "block.mineralogy.gabbro_smooth_furnace": "Fourneau poli en Gabbro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Fourneau en briques polies de Gabbro", "block.mineralogy.peridotite": "Péridotite", - "block.mineralogy.peridotite_stairs": "Péridotite Escaliers", - "block.mineralogy.peridotite_slab": "Péridotite Dalle", - "block.mineralogy.peridotite_brick": "Péridotite Brique", - "block.mineralogy.peridotite_brick_stairs": "Péridotite Escalier De Brique", - "block.mineralogy.peridotite_brick_slab": "Péridotite Dalle de brique", - "block.mineralogy.peridotite_smooth": "Polished Péridotite", - "block.mineralogy.peridotite_smooth_stairs": "Péridotite Escalier Poli", - "block.mineralogy.peridotite_smooth_slab": "Péridotite Dalle polie", - "block.mineralogy.peridotite_smooth_brick": "Péridotite Brique polie", - "block.mineralogy.peridotite_smooth_brick_stairs": "Péridotite Escalier en brique polie", - "block.mineralogy.peridotite_smooth_brick_slab": "Péridotite Dalle de brique polie", - "block.mineralogy.peridotite_wall": "Péridotite Wall", - "block.mineralogy.peridotite_brick_wall": "Péridotite Mur de briques", - "block.mineralogy.peridotite_smooth_wall": "Péridotite Mur poli", - "block.mineralogy.peridotite_smooth_brick_wall": "Péridotite Mur de brique poli", - "block.mineralogy.peridotite_furnace": "Péridotite Furnace", - "block.mineralogy.peridotite_brick_furnace": "Péridotite Four à briques", - "block.mineralogy.peridotite_smooth_furnace": "Péridotite Four poli", - "block.mineralogy.peridotite_smooth_brick_furnace": "Péridotite Four à brique polie", + "block.mineralogy.peridotite_stairs": "Escalier en Péridotite", + "block.mineralogy.peridotite_slab": "Dalle en Péridotite", + "block.mineralogy.peridotite_brick": "Briques en Péridotite", + "block.mineralogy.peridotite_brick_stairs": "Escalier en briques de Péridotite", + "block.mineralogy.peridotite_brick_slab": "Dalle en briques de Péridotite", + "block.mineralogy.peridotite_smooth": "Bloc poli en Péridotite", + "block.mineralogy.peridotite_smooth_stairs": "Escalier poli en Péridotite", + "block.mineralogy.peridotite_smooth_slab": "Dalle polie en Péridotite", + "block.mineralogy.peridotite_smooth_brick": "Briques polies en Péridotite", + "block.mineralogy.peridotite_smooth_brick_stairs": "Escalier en briques polies de Péridotite", + "block.mineralogy.peridotite_smooth_brick_slab": "Dalle en briques polies de Péridotite", + "block.mineralogy.peridotite_wall": "Muret en Péridotite", + "block.mineralogy.peridotite_brick_wall": "Muret en briques de Péridotite", + "block.mineralogy.peridotite_smooth_wall": "Muret poli en Péridotite", + "block.mineralogy.peridotite_smooth_brick_wall": "Muret en briques polies de Péridotite", + "block.mineralogy.peridotite_furnace": "Fourneau en Péridotite", + "block.mineralogy.peridotite_brick_furnace": "Fourneau en briques de Péridotite", + "block.mineralogy.peridotite_smooth_furnace": "Fourneau poli en Péridotite", + "block.mineralogy.peridotite_smooth_brick_furnace": "Fourneau en briques polies de Péridotite", "block.mineralogy.basaltic_glass": "Verre basaltique", - "block.mineralogy.basaltic_glass_stairs": "Verre basaltique Escaliers", - "block.mineralogy.basaltic_glass_slab": "Verre basaltique Dalle", - "block.mineralogy.basaltic_glass_brick": "Verre basaltique Brique", - "block.mineralogy.basaltic_glass_brick_stairs": "Verre basaltique Escalier De Brique", - "block.mineralogy.basaltic_glass_brick_slab": "Verre basaltique Dalle de brique", - "block.mineralogy.basaltic_glass_smooth": "Polished Verre basaltique", - "block.mineralogy.basaltic_glass_smooth_stairs": "Verre basaltique Escalier Poli", - "block.mineralogy.basaltic_glass_smooth_slab": "Verre basaltique Dalle polie", - "block.mineralogy.basaltic_glass_smooth_brick": "Verre basaltique Brique polie", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Verre basaltique Escalier en brique polie", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "Verre basaltique Dalle de brique polie", - "block.mineralogy.basaltic_glass_wall": "Verre basaltique Wall", - "block.mineralogy.basaltic_glass_brick_wall": "Verre basaltique Mur de briques", - "block.mineralogy.basaltic_glass_smooth_wall": "Verre basaltique Mur poli", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "Verre basaltique Mur de brique poli", - "block.mineralogy.basaltic_glass_furnace": "Verre basaltique Furnace", - "block.mineralogy.basaltic_glass_brick_furnace": "Verre basaltique Four à briques", - "block.mineralogy.basaltic_glass_smooth_furnace": "Verre basaltique Four poli", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Verre basaltique Four à brique polie", - "block.mineralogy.scoria": "Scories", - "block.mineralogy.scoria_stairs": "Scories Escaliers", - "block.mineralogy.scoria_slab": "Scories Dalle", - "block.mineralogy.scoria_brick": "Scories Brique", - "block.mineralogy.scoria_brick_stairs": "Scories Escalier De Brique", - "block.mineralogy.scoria_brick_slab": "Scories Dalle de brique", - "block.mineralogy.scoria_smooth": "Polished Scories", - "block.mineralogy.scoria_smooth_stairs": "Scories Escalier Poli", - "block.mineralogy.scoria_smooth_slab": "Scories Dalle polie", - "block.mineralogy.scoria_smooth_brick": "Scories Brique polie", - "block.mineralogy.scoria_smooth_brick_stairs": "Scories Escalier en brique polie", - "block.mineralogy.scoria_smooth_brick_slab": "Scories Dalle de brique polie", - "block.mineralogy.scoria_wall": "Scories Wall", - "block.mineralogy.scoria_brick_wall": "Scories Mur de briques", - "block.mineralogy.scoria_smooth_wall": "Scories Mur poli", - "block.mineralogy.scoria_smooth_brick_wall": "Scories Mur de brique poli", - "block.mineralogy.scoria_furnace": "Scories Furnace", - "block.mineralogy.scoria_brick_furnace": "Scories Four à briques", - "block.mineralogy.scoria_smooth_furnace": "Scories Four poli", - "block.mineralogy.scoria_smooth_brick_furnace": "Scories Four à brique polie", + "block.mineralogy.basaltic_glass_stairs": "Escalier en Verre basaltique", + "block.mineralogy.basaltic_glass_slab": "Dalle en Verre basaltique", + "block.mineralogy.basaltic_glass_brick": "Briques en Verre basaltique", + "block.mineralogy.basaltic_glass_brick_stairs": "Escalier en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_brick_slab": "Dalle en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth": "Bloc poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_stairs": "Escalier poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_slab": "Dalle polie en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick": "Briques polies en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Escalier en briques polies de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Dalle en briques polies de Verre basaltique", + "block.mineralogy.basaltic_glass_wall": "Muret en Verre basaltique", + "block.mineralogy.basaltic_glass_brick_wall": "Muret en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_wall": "Muret poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Muret en briques polies de Verre basaltique", + "block.mineralogy.basaltic_glass_furnace": "Fourneau en Verre basaltique", + "block.mineralogy.basaltic_glass_brick_furnace": "Fourneau en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_furnace": "Fourneau poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Fourneau en briques polies de Verre basaltique", + "block.mineralogy.scoria": "Scorie", + "block.mineralogy.scoria_stairs": "Escalier en Scorie", + "block.mineralogy.scoria_slab": "Dalle en Scorie", + "block.mineralogy.scoria_brick": "Briques en Scorie", + "block.mineralogy.scoria_brick_stairs": "Escalier en briques de Scorie", + "block.mineralogy.scoria_brick_slab": "Dalle en briques de Scorie", + "block.mineralogy.scoria_smooth": "Bloc poli en Scorie", + "block.mineralogy.scoria_smooth_stairs": "Escalier poli en Scorie", + "block.mineralogy.scoria_smooth_slab": "Dalle polie en Scorie", + "block.mineralogy.scoria_smooth_brick": "Briques polies en Scorie", + "block.mineralogy.scoria_smooth_brick_stairs": "Escalier en briques polies de Scorie", + "block.mineralogy.scoria_smooth_brick_slab": "Dalle en briques polies de Scorie", + "block.mineralogy.scoria_wall": "Muret en Scorie", + "block.mineralogy.scoria_brick_wall": "Muret en briques de Scorie", + "block.mineralogy.scoria_smooth_wall": "Muret poli en Scorie", + "block.mineralogy.scoria_smooth_brick_wall": "Muret en briques polies de Scorie", + "block.mineralogy.scoria_furnace": "Fourneau en Scorie", + "block.mineralogy.scoria_brick_furnace": "Fourneau en briques de Scorie", + "block.mineralogy.scoria_smooth_furnace": "Fourneau poli en Scorie", + "block.mineralogy.scoria_smooth_brick_furnace": "Fourneau en briques polies de Scorie", "block.mineralogy.tuff": "Tuf", - "block.mineralogy.tuff_stairs": "Tuf Escaliers", - "block.mineralogy.tuff_slab": "Tuf Dalle", - "block.mineralogy.tuff_brick": "Tuf Brique", - "block.mineralogy.tuff_brick_stairs": "Tuf Escalier De Brique", - "block.mineralogy.tuff_brick_slab": "Tuf Dalle de brique", - "block.mineralogy.tuff_smooth": "Polished Tuf", - "block.mineralogy.tuff_smooth_stairs": "Tuf Escalier Poli", - "block.mineralogy.tuff_smooth_slab": "Tuf Dalle polie", - "block.mineralogy.tuff_smooth_brick": "Tuf Brique polie", - "block.mineralogy.tuff_smooth_brick_stairs": "Tuf Escalier en brique polie", - "block.mineralogy.tuff_smooth_brick_slab": "Tuf Dalle de brique polie", - "block.mineralogy.tuff_wall": "Tuf Wall", - "block.mineralogy.tuff_brick_wall": "Tuf Mur de briques", - "block.mineralogy.tuff_smooth_wall": "Tuf Mur poli", - "block.mineralogy.tuff_smooth_brick_wall": "Tuf Mur de brique poli", - "block.mineralogy.tuff_furnace": "Tuf Furnace", - "block.mineralogy.tuff_brick_furnace": "Tuf Four à briques", - "block.mineralogy.tuff_smooth_furnace": "Tuf Four poli", - "block.mineralogy.tuff_smooth_brick_furnace": "Tuf Four à brique polie", - "block.mineralogy.siltstone": "Pierre de terre", - "block.mineralogy.siltstone_stairs": "Pierre de terre Escaliers", - "block.mineralogy.siltstone_slab": "Pierre de terre Dalle", - "block.mineralogy.siltstone_brick": "Pierre de terre Brique", - "block.mineralogy.siltstone_brick_stairs": "Pierre de terre Escalier De Brique", - "block.mineralogy.siltstone_brick_slab": "Pierre de terre Dalle de brique", - "block.mineralogy.siltstone_smooth": "Polished Pierre de terre", - "block.mineralogy.siltstone_smooth_stairs": "Pierre de terre Escalier Poli", - "block.mineralogy.siltstone_smooth_slab": "Pierre de terre Dalle polie", - "block.mineralogy.siltstone_smooth_brick": "Pierre de terre Brique polie", - "block.mineralogy.siltstone_smooth_brick_stairs": "Pierre de terre Escalier en brique polie", - "block.mineralogy.siltstone_smooth_brick_slab": "Pierre de terre Dalle de brique polie", - "block.mineralogy.siltstone_wall": "Pierre de terre Wall", - "block.mineralogy.siltstone_brick_wall": "Pierre de terre Mur de briques", - "block.mineralogy.siltstone_smooth_wall": "Pierre de terre Mur poli", - "block.mineralogy.siltstone_smooth_brick_wall": "Pierre de terre Mur de brique poli", - "block.mineralogy.siltstone_furnace": "Pierre de terre Furnace", - "block.mineralogy.siltstone_brick_furnace": "Pierre de terre Four à briques", - "block.mineralogy.siltstone_smooth_furnace": "Pierre de terre Four poli", - "block.mineralogy.siltstone_smooth_brick_furnace": "Pierre de terre Four à brique polie", + "block.mineralogy.tuff_stairs": "Escalier en Tuf", + "block.mineralogy.tuff_slab": "Dalle en Tuf", + "block.mineralogy.tuff_brick": "Briques en Tuf", + "block.mineralogy.tuff_brick_stairs": "Escalier en briques de Tuf", + "block.mineralogy.tuff_brick_slab": "Dalle en briques de Tuf", + "block.mineralogy.tuff_smooth": "Bloc poli en Tuf", + "block.mineralogy.tuff_smooth_stairs": "Escalier poli en Tuf", + "block.mineralogy.tuff_smooth_slab": "Dalle polie en Tuf", + "block.mineralogy.tuff_smooth_brick": "Briques polies en Tuf", + "block.mineralogy.tuff_smooth_brick_stairs": "Escalier en briques polies de Tuf", + "block.mineralogy.tuff_smooth_brick_slab": "Dalle en briques polies de Tuf", + "block.mineralogy.tuff_wall": "Muret en Tuf", + "block.mineralogy.tuff_brick_wall": "Muret en briques de Tuf", + "block.mineralogy.tuff_smooth_wall": "Muret poli en Tuf", + "block.mineralogy.tuff_smooth_brick_wall": "Muret en briques polies de Tuf", + "block.mineralogy.tuff_furnace": "Fourneau en Tuf", + "block.mineralogy.tuff_brick_furnace": "Fourneau en briques de Tuf", + "block.mineralogy.tuff_smooth_furnace": "Fourneau poli en Tuf", + "block.mineralogy.tuff_smooth_brick_furnace": "Fourneau en briques polies de Tuf", + "block.mineralogy.siltstone": "Siltite", + "block.mineralogy.siltstone_stairs": "Escalier en Siltite", + "block.mineralogy.siltstone_slab": "Dalle en Siltite", + "block.mineralogy.siltstone_brick": "Briques en Siltite", + "block.mineralogy.siltstone_brick_stairs": "Escalier en briques de Siltite", + "block.mineralogy.siltstone_brick_slab": "Dalle en briques de Siltite", + "block.mineralogy.siltstone_smooth": "Bloc poli en Siltite", + "block.mineralogy.siltstone_smooth_stairs": "Escalier poli en Siltite", + "block.mineralogy.siltstone_smooth_slab": "Dalle polie en Siltite", + "block.mineralogy.siltstone_smooth_brick": "Briques polies en Siltite", + "block.mineralogy.siltstone_smooth_brick_stairs": "Escalier en briques polies de Siltite", + "block.mineralogy.siltstone_smooth_brick_slab": "Dalle en briques polies de Siltite", + "block.mineralogy.siltstone_wall": "Muret en Siltite", + "block.mineralogy.siltstone_brick_wall": "Muret en briques de Siltite", + "block.mineralogy.siltstone_smooth_wall": "Muret poli en Siltite", + "block.mineralogy.siltstone_smooth_brick_wall": "Muret en briques polies de Siltite", + "block.mineralogy.siltstone_furnace": "Fourneau en Siltite", + "block.mineralogy.siltstone_brick_furnace": "Fourneau en briques de Siltite", + "block.mineralogy.siltstone_smooth_furnace": "Fourneau poli en Siltite", + "block.mineralogy.siltstone_smooth_brick_furnace": "Fourneau en briques polies de Siltite", "block.mineralogy.rock_salt": "Sel gemme", - "block.mineralogy.rock_salt_stairs": "Sel gemme Escaliers", - "block.mineralogy.rock_salt_slab": "Sel gemme Dalle", - "block.mineralogy.rock_salt_brick": "Sel gemme Brique", - "block.mineralogy.rock_salt_brick_stairs": "Sel gemme Escalier De Brique", - "block.mineralogy.rock_salt_brick_slab": "Sel gemme Dalle de brique", - "block.mineralogy.rock_salt_smooth": "Polished Sel gemme", - "block.mineralogy.rock_salt_smooth_stairs": "Sel gemme Escalier Poli", - "block.mineralogy.rock_salt_smooth_slab": "Sel gemme Dalle polie", - "block.mineralogy.rock_salt_smooth_brick": "Sel gemme Brique polie", - "block.mineralogy.rock_salt_smooth_brick_stairs": "Sel gemme Escalier en brique polie", - "block.mineralogy.rock_salt_smooth_brick_slab": "Sel gemme Dalle de brique polie", - "block.mineralogy.rock_salt_wall": "Sel gemme Wall", - "block.mineralogy.rock_salt_brick_wall": "Sel gemme Mur de briques", - "block.mineralogy.rock_salt_smooth_wall": "Sel gemme Mur poli", - "block.mineralogy.rock_salt_smooth_brick_wall": "Sel gemme Mur de brique poli", - "block.mineralogy.rock_salt_furnace": "Sel gemme Furnace", - "block.mineralogy.rock_salt_brick_furnace": "Sel gemme Four à briques", - "block.mineralogy.rock_salt_smooth_furnace": "Sel gemme Four poli", - "block.mineralogy.rock_salt_smooth_brick_furnace": "Sel gemme Four à brique polie", - "block.mineralogy.hornfels": "Hornfels", - "block.mineralogy.hornfels_stairs": "Hornfels Escaliers", - "block.mineralogy.hornfels_slab": "Hornfels Dalle", - "block.mineralogy.hornfels_brick": "Hornfels Brique", - "block.mineralogy.hornfels_brick_stairs": "Hornfels Escalier De Brique", - "block.mineralogy.hornfels_brick_slab": "Hornfels Dalle de brique", - "block.mineralogy.hornfels_smooth": "Polished Hornfels", - "block.mineralogy.hornfels_smooth_stairs": "Hornfels Escalier Poli", - "block.mineralogy.hornfels_smooth_slab": "Hornfels Dalle polie", - "block.mineralogy.hornfels_smooth_brick": "Hornfels Brique polie", - "block.mineralogy.hornfels_smooth_brick_stairs": "Hornfels Escalier en brique polie", - "block.mineralogy.hornfels_smooth_brick_slab": "Hornfels Dalle de brique polie", - "block.mineralogy.hornfels_wall": "Hornfels Wall", - "block.mineralogy.hornfels_brick_wall": "Hornfels Mur de briques", - "block.mineralogy.hornfels_smooth_wall": "Hornfels Mur poli", - "block.mineralogy.hornfels_smooth_brick_wall": "Hornfels Mur de brique poli", - "block.mineralogy.hornfels_furnace": "Hornfels Furnace", - "block.mineralogy.hornfels_brick_furnace": "Hornfels Four à briques", - "block.mineralogy.hornfels_smooth_furnace": "Hornfels Four poli", - "block.mineralogy.hornfels_smooth_brick_furnace": "Hornfels Four à brique polie", + "block.mineralogy.rock_salt_stairs": "Escalier en Sel gemme", + "block.mineralogy.rock_salt_slab": "Dalle en Sel gemme", + "block.mineralogy.rock_salt_brick": "Briques en Sel gemme", + "block.mineralogy.rock_salt_brick_stairs": "Escalier en briques de Sel gemme", + "block.mineralogy.rock_salt_brick_slab": "Dalle en briques de Sel gemme", + "block.mineralogy.rock_salt_smooth": "Bloc poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_stairs": "Escalier poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_slab": "Dalle polie en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick": "Briques polies en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Escalier en briques polies de Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_slab": "Dalle en briques polies de Sel gemme", + "block.mineralogy.rock_salt_wall": "Muret en Sel gemme", + "block.mineralogy.rock_salt_brick_wall": "Muret en briques de Sel gemme", + "block.mineralogy.rock_salt_smooth_wall": "Muret poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_wall": "Muret en briques polies de Sel gemme", + "block.mineralogy.rock_salt_furnace": "Fourneau en Sel gemme", + "block.mineralogy.rock_salt_brick_furnace": "Fourneau en briques de Sel gemme", + "block.mineralogy.rock_salt_smooth_furnace": "Fourneau poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Fourneau en briques polies de Sel gemme", + "block.mineralogy.hornfels": "Cornéenne", + "block.mineralogy.hornfels_stairs": "Escalier en Cornéenne", + "block.mineralogy.hornfels_slab": "Dalle en Cornéenne", + "block.mineralogy.hornfels_brick": "Briques en Cornéenne", + "block.mineralogy.hornfels_brick_stairs": "Escalier en briques de Cornéenne", + "block.mineralogy.hornfels_brick_slab": "Dalle en briques de Cornéenne", + "block.mineralogy.hornfels_smooth": "Bloc poli en Cornéenne", + "block.mineralogy.hornfels_smooth_stairs": "Escalier poli en Cornéenne", + "block.mineralogy.hornfels_smooth_slab": "Dalle polie en Cornéenne", + "block.mineralogy.hornfels_smooth_brick": "Briques polies en Cornéenne", + "block.mineralogy.hornfels_smooth_brick_stairs": "Escalier en briques polies de Cornéenne", + "block.mineralogy.hornfels_smooth_brick_slab": "Dalle en briques polies de Cornéenne", + "block.mineralogy.hornfels_wall": "Muret en Cornéenne", + "block.mineralogy.hornfels_brick_wall": "Muret en briques de Cornéenne", + "block.mineralogy.hornfels_smooth_wall": "Muret poli en Cornéenne", + "block.mineralogy.hornfels_smooth_brick_wall": "Muret en briques polies de Cornéenne", + "block.mineralogy.hornfels_furnace": "Fourneau en Cornéenne", + "block.mineralogy.hornfels_brick_furnace": "Fourneau en briques de Cornéenne", + "block.mineralogy.hornfels_smooth_furnace": "Fourneau poli en Cornéenne", + "block.mineralogy.hornfels_smooth_brick_furnace": "Fourneau en briques polies de Cornéenne", "block.mineralogy.quartzite": "Quartzite", - "block.mineralogy.quartzite_stairs": "Quartzite Escaliers", - "block.mineralogy.quartzite_slab": "Quartzite Dalle", - "block.mineralogy.quartzite_brick": "Quartzite Brique", - "block.mineralogy.quartzite_brick_stairs": "Quartzite Escalier De Brique", - "block.mineralogy.quartzite_brick_slab": "Quartzite Dalle de brique", - "block.mineralogy.quartzite_smooth": "Polished Quartzite", - "block.mineralogy.quartzite_smooth_stairs": "Quartzite Escalier Poli", - "block.mineralogy.quartzite_smooth_slab": "Quartzite Dalle polie", - "block.mineralogy.quartzite_smooth_brick": "Quartzite Brique polie", - "block.mineralogy.quartzite_smooth_brick_stairs": "Quartzite Escalier en brique polie", - "block.mineralogy.quartzite_smooth_brick_slab": "Quartzite Dalle de brique polie", - "block.mineralogy.quartzite_wall": "Quartzite Wall", - "block.mineralogy.quartzite_brick_wall": "Quartzite Mur de briques", - "block.mineralogy.quartzite_smooth_wall": "Quartzite Mur poli", - "block.mineralogy.quartzite_smooth_brick_wall": "Quartzite Mur de brique poli", - "block.mineralogy.quartzite_furnace": "Quartzite Furnace", - "block.mineralogy.quartzite_brick_furnace": "Quartzite Four à briques", - "block.mineralogy.quartzite_smooth_furnace": "Quartzite Four poli", - "block.mineralogy.quartzite_smooth_brick_furnace": "Quartzite Four à brique polie", + "block.mineralogy.quartzite_stairs": "Escalier en Quartzite", + "block.mineralogy.quartzite_slab": "Dalle en Quartzite", + "block.mineralogy.quartzite_brick": "Briques en Quartzite", + "block.mineralogy.quartzite_brick_stairs": "Escalier en briques de Quartzite", + "block.mineralogy.quartzite_brick_slab": "Dalle en briques de Quartzite", + "block.mineralogy.quartzite_smooth": "Bloc poli en Quartzite", + "block.mineralogy.quartzite_smooth_stairs": "Escalier poli en Quartzite", + "block.mineralogy.quartzite_smooth_slab": "Dalle polie en Quartzite", + "block.mineralogy.quartzite_smooth_brick": "Briques polies en Quartzite", + "block.mineralogy.quartzite_smooth_brick_stairs": "Escalier en briques polies de Quartzite", + "block.mineralogy.quartzite_smooth_brick_slab": "Dalle en briques polies de Quartzite", + "block.mineralogy.quartzite_wall": "Muret en Quartzite", + "block.mineralogy.quartzite_brick_wall": "Muret en briques de Quartzite", + "block.mineralogy.quartzite_smooth_wall": "Muret poli en Quartzite", + "block.mineralogy.quartzite_smooth_brick_wall": "Muret en briques polies de Quartzite", + "block.mineralogy.quartzite_furnace": "Fourneau en Quartzite", + "block.mineralogy.quartzite_brick_furnace": "Fourneau en briques de Quartzite", + "block.mineralogy.quartzite_smooth_furnace": "Fourneau poli en Quartzite", + "block.mineralogy.quartzite_smooth_brick_furnace": "Fourneau en briques polies de Quartzite", "block.mineralogy.novaculite": "Novaculite", - "block.mineralogy.novaculite_stairs": "Novaculite Escaliers", - "block.mineralogy.novaculite_slab": "Novaculite Dalle", - "block.mineralogy.novaculite_brick": "Novaculite Brique", - "block.mineralogy.novaculite_brick_stairs": "Novaculite Escalier De Brique", - "block.mineralogy.novaculite_brick_slab": "Novaculite Dalle de brique", - "block.mineralogy.novaculite_smooth": "Polished Novaculite", - "block.mineralogy.novaculite_smooth_stairs": "Novaculite Escalier Poli", - "block.mineralogy.novaculite_smooth_slab": "Novaculite Dalle polie", - "block.mineralogy.novaculite_smooth_brick": "Novaculite Brique polie", - "block.mineralogy.novaculite_smooth_brick_stairs": "Novaculite Escalier en brique polie", - "block.mineralogy.novaculite_smooth_brick_slab": "Novaculite Dalle de brique polie", - "block.mineralogy.novaculite_wall": "Novaculite Wall", - "block.mineralogy.novaculite_brick_wall": "Novaculite Mur de briques", - "block.mineralogy.novaculite_smooth_wall": "Novaculite Mur poli", - "block.mineralogy.novaculite_smooth_brick_wall": "Novaculite Mur de brique poli", - "block.mineralogy.novaculite_furnace": "Novaculite Furnace", - "block.mineralogy.novaculite_brick_furnace": "Novaculite Four à briques", - "block.mineralogy.novaculite_smooth_furnace": "Novaculite Four poli", - "block.mineralogy.novaculite_smooth_brick_furnace": "Novaculite Four à brique polie", + "block.mineralogy.novaculite_stairs": "Escalier en Novaculite", + "block.mineralogy.novaculite_slab": "Dalle en Novaculite", + "block.mineralogy.novaculite_brick": "Briques en Novaculite", + "block.mineralogy.novaculite_brick_stairs": "Escalier en briques de Novaculite", + "block.mineralogy.novaculite_brick_slab": "Dalle en briques de Novaculite", + "block.mineralogy.novaculite_smooth": "Bloc poli en Novaculite", + "block.mineralogy.novaculite_smooth_stairs": "Escalier poli en Novaculite", + "block.mineralogy.novaculite_smooth_slab": "Dalle polie en Novaculite", + "block.mineralogy.novaculite_smooth_brick": "Briques polies en Novaculite", + "block.mineralogy.novaculite_smooth_brick_stairs": "Escalier en briques polies de Novaculite", + "block.mineralogy.novaculite_smooth_brick_slab": "Dalle en briques polies de Novaculite", + "block.mineralogy.novaculite_wall": "Muret en Novaculite", + "block.mineralogy.novaculite_brick_wall": "Muret en briques de Novaculite", + "block.mineralogy.novaculite_smooth_wall": "Muret poli en Novaculite", + "block.mineralogy.novaculite_smooth_brick_wall": "Muret en briques polies de Novaculite", + "block.mineralogy.novaculite_furnace": "Fourneau en Novaculite", + "block.mineralogy.novaculite_brick_furnace": "Fourneau en briques de Novaculite", + "block.mineralogy.novaculite_smooth_furnace": "Fourneau poli en Novaculite", + "block.mineralogy.novaculite_smooth_brick_furnace": "Fourneau en briques polies de Novaculite", "block.mineralogy.chalk": "Craie", "item.mineralogy.chalk_dust": "Poudre de craie", "item.mineralogy.salt_dust": "Sel", "item.mineralogy.rock_salt_dust": "Cristaux de sel gemme", - "block.mineralogy.rocksaltlamp": "Lampe à sel", - "block.mineralogy.rocksaltstreetlamp": "Lampadaire à sel", - "block.mineralogy.andesite_relief_axe": "Andésite Soulagement de la hache", - "block.mineralogy.andesite_relief_blank": "Andésite Relief vide", - "block.mineralogy.andesite_relief_cross": "Andésite Relief croisé", - "block.mineralogy.andesite_relief_hammer": "Andésite Soulagement marteau", - "block.mineralogy.andesite_relief_hoe": "Andésite Hoe Relief", - "block.mineralogy.andesite_relief_horizontal": "Andésite Relief horizontal", - "block.mineralogy.andesite_relief_i": "Andésite I Relief", - "block.mineralogy.andesite_relief_left": "Andésite Relief gauche", - "block.mineralogy.andesite_relief_pickaxe": "Andésite Relief de pioche", - "block.mineralogy.andesite_relief_plus": "Andésite Plus de soulagement", - "block.mineralogy.andesite_relief_right": "Andésite Bon soulagement", - "block.mineralogy.andesite_relief_sword": "Andésite Soulagement de l'épée", - "block.mineralogy.andesite_relief_vertical": "Andésite Relief vertical", - "block.mineralogy.basalt_relief_axe": "Basalte Soulagement de la hache", - "block.mineralogy.basalt_relief_blank": "Basalte Relief vide", - "block.mineralogy.basalt_relief_cross": "Basalte Relief croisé", - "block.mineralogy.basalt_relief_hammer": "Basalte Soulagement marteau", - "block.mineralogy.basalt_relief_hoe": "Basalte Hoe Relief", - "block.mineralogy.basalt_relief_horizontal": "Basalte Relief horizontal", - "block.mineralogy.basalt_relief_i": "Basalte I Relief", - "block.mineralogy.basalt_relief_left": "Basalte Relief gauche", - "block.mineralogy.basalt_relief_pickaxe": "Basalte Relief de pioche", - "block.mineralogy.basalt_relief_plus": "Basalte Plus de soulagement", - "block.mineralogy.basalt_relief_right": "Basalte Bon soulagement", - "block.mineralogy.basalt_relief_sword": "Basalte Soulagement de l'épée", - "block.mineralogy.basalt_relief_vertical": "Basalte Relief vertical", - "block.mineralogy.diorite_relief_axe": "Diorite Soulagement de la hache", - "block.mineralogy.diorite_relief_blank": "Diorite Relief vide", - "block.mineralogy.diorite_relief_cross": "Diorite Relief croisé", - "block.mineralogy.diorite_relief_hammer": "Diorite Soulagement marteau", - "block.mineralogy.diorite_relief_hoe": "Diorite Hoe Relief", - "block.mineralogy.diorite_relief_horizontal": "Diorite Relief horizontal", - "block.mineralogy.diorite_relief_i": "Diorite I Relief", - "block.mineralogy.diorite_relief_left": "Diorite Relief gauche", - "block.mineralogy.diorite_relief_pickaxe": "Diorite Relief de pioche", - "block.mineralogy.diorite_relief_plus": "Diorite Plus de soulagement", - "block.mineralogy.diorite_relief_right": "Diorite Bon soulagement", - "block.mineralogy.diorite_relief_sword": "Diorite Soulagement de l'épée", - "block.mineralogy.diorite_relief_vertical": "Diorite Relief vertical", - "block.mineralogy.granite_relief_axe": "Granit Soulagement de la hache", - "block.mineralogy.granite_relief_blank": "Granit Relief vide", - "block.mineralogy.granite_relief_cross": "Granit Relief croisé", - "block.mineralogy.granite_relief_hammer": "Granit Soulagement marteau", - "block.mineralogy.granite_relief_hoe": "Granit Hoe Relief", - "block.mineralogy.granite_relief_horizontal": "Granit Relief horizontal", - "block.mineralogy.granite_relief_i": "Granit I Relief", - "block.mineralogy.granite_relief_left": "Granit Relief gauche", - "block.mineralogy.granite_relief_pickaxe": "Granit Relief de pioche", - "block.mineralogy.granite_relief_plus": "Granit Plus de soulagement", - "block.mineralogy.granite_relief_right": "Granit Bon soulagement", - "block.mineralogy.granite_relief_sword": "Granit Soulagement de l'épée", - "block.mineralogy.granite_relief_vertical": "Granit Relief vertical", - "block.mineralogy.rhyolite_relief_axe": "Rhyolite Soulagement de la hache", - "block.mineralogy.rhyolite_relief_blank": "Rhyolite Relief vide", - "block.mineralogy.rhyolite_relief_cross": "Rhyolite Relief croisé", - "block.mineralogy.rhyolite_relief_hammer": "Rhyolite Soulagement marteau", - "block.mineralogy.rhyolite_relief_hoe": "Rhyolite Hoe Relief", - "block.mineralogy.rhyolite_relief_horizontal": "Rhyolite Relief horizontal", - "block.mineralogy.rhyolite_relief_i": "Rhyolite I Relief", - "block.mineralogy.rhyolite_relief_left": "Rhyolite Relief gauche", - "block.mineralogy.rhyolite_relief_pickaxe": "Rhyolite Relief de pioche", - "block.mineralogy.rhyolite_relief_plus": "Rhyolite Plus de soulagement", - "block.mineralogy.rhyolite_relief_right": "Rhyolite Bon soulagement", - "block.mineralogy.rhyolite_relief_sword": "Rhyolite Soulagement de l'épée", - "block.mineralogy.rhyolite_relief_vertical": "Rhyolite Relief vertical", - "block.mineralogy.pegmatite_relief_axe": "Pegmatite Soulagement de la hache", - "block.mineralogy.pegmatite_relief_blank": "Pegmatite Relief vide", - "block.mineralogy.pegmatite_relief_cross": "Pegmatite Relief croisé", - "block.mineralogy.pegmatite_relief_hammer": "Pegmatite Soulagement marteau", - "block.mineralogy.pegmatite_relief_hoe": "Pegmatite Hoe Relief", - "block.mineralogy.pegmatite_relief_horizontal": "Pegmatite Relief horizontal", - "block.mineralogy.pegmatite_relief_i": "Pegmatite I Relief", - "block.mineralogy.pegmatite_relief_left": "Pegmatite Relief gauche", - "block.mineralogy.pegmatite_relief_pickaxe": "Pegmatite Relief de pioche", - "block.mineralogy.pegmatite_relief_plus": "Pegmatite Plus de soulagement", - "block.mineralogy.pegmatite_relief_right": "Pegmatite Bon soulagement", - "block.mineralogy.pegmatite_relief_sword": "Pegmatite Soulagement de l'épée", - "block.mineralogy.pegmatite_relief_vertical": "Pegmatite Relief vertical", - "block.mineralogy.shale_relief_axe": "Schistee argileux Soulagement de la hache", - "block.mineralogy.shale_relief_blank": "Schistee argileux Relief vide", - "block.mineralogy.shale_relief_cross": "Schistee argileux Relief croisé", - "block.mineralogy.shale_relief_hammer": "Schistee argileux Soulagement marteau", - "block.mineralogy.shale_relief_hoe": "Schistee argileux Hoe Relief", - "block.mineralogy.shale_relief_horizontal": "Schistee argileux Relief horizontal", - "block.mineralogy.shale_relief_i": "Schistee argileux I Relief", - "block.mineralogy.shale_relief_left": "Schistee argileux Relief gauche", - "block.mineralogy.shale_relief_pickaxe": "Schistee argileux Relief de pioche", - "block.mineralogy.shale_relief_plus": "Schistee argileux Plus de soulagement", - "block.mineralogy.shale_relief_right": "Schistee argileux Bon soulagement", - "block.mineralogy.shale_relief_sword": "Schistee argileux Soulagement de l'épée", - "block.mineralogy.shale_relief_vertical": "Schistee argileux Relief vertical", - "block.mineralogy.conglomerate_relief_axe": "Conglomérat Soulagement de la hache", - "block.mineralogy.conglomerate_relief_blank": "Conglomérat Relief vide", - "block.mineralogy.conglomerate_relief_cross": "Conglomérat Relief croisé", - "block.mineralogy.conglomerate_relief_hammer": "Conglomérat Soulagement marteau", - "block.mineralogy.conglomerate_relief_hoe": "Conglomérat Hoe Relief", - "block.mineralogy.conglomerate_relief_horizontal": "Conglomérat Relief horizontal", - "block.mineralogy.conglomerate_relief_i": "Conglomérat I Relief", - "block.mineralogy.conglomerate_relief_left": "Conglomérat Relief gauche", - "block.mineralogy.conglomerate_relief_pickaxe": "Conglomérat Relief de pioche", - "block.mineralogy.conglomerate_relief_plus": "Conglomérat Plus de soulagement", - "block.mineralogy.conglomerate_relief_right": "Conglomérat Bon soulagement", - "block.mineralogy.conglomerate_relief_sword": "Conglomérat Soulagement de l'épée", - "block.mineralogy.conglomerate_relief_vertical": "Conglomérat Relief vertical", - "block.mineralogy.dolomite_relief_axe": "Dolomie Soulagement de la hache", - "block.mineralogy.dolomite_relief_blank": "Dolomie Relief vide", - "block.mineralogy.dolomite_relief_cross": "Dolomie Relief croisé", - "block.mineralogy.dolomite_relief_hammer": "Dolomie Soulagement marteau", - "block.mineralogy.dolomite_relief_hoe": "Dolomie Hoe Relief", - "block.mineralogy.dolomite_relief_horizontal": "Dolomie Relief horizontal", - "block.mineralogy.dolomite_relief_i": "Dolomie I Relief", - "block.mineralogy.dolomite_relief_left": "Dolomie Relief gauche", - "block.mineralogy.dolomite_relief_pickaxe": "Dolomie Relief de pioche", - "block.mineralogy.dolomite_relief_plus": "Dolomie Plus de soulagement", - "block.mineralogy.dolomite_relief_right": "Dolomie Bon soulagement", - "block.mineralogy.dolomite_relief_sword": "Dolomie Soulagement de l'épée", - "block.mineralogy.dolomite_relief_vertical": "Dolomie Relief vertical", - "block.mineralogy.limestone_relief_axe": "Calcaire Soulagement de la hache", - "block.mineralogy.limestone_relief_blank": "Calcaire Relief vide", - "block.mineralogy.limestone_relief_cross": "Calcaire Relief croisé", - "block.mineralogy.limestone_relief_hammer": "Calcaire Soulagement marteau", - "block.mineralogy.limestone_relief_hoe": "Calcaire Hoe Relief", - "block.mineralogy.limestone_relief_horizontal": "Calcaire Relief horizontal", - "block.mineralogy.limestone_relief_i": "Calcaire I Relief", - "block.mineralogy.limestone_relief_left": "Calcaire Relief gauche", - "block.mineralogy.limestone_relief_pickaxe": "Calcaire Relief de pioche", - "block.mineralogy.limestone_relief_plus": "Calcaire Plus de soulagement", - "block.mineralogy.limestone_relief_right": "Calcaire Bon soulagement", - "block.mineralogy.limestone_relief_sword": "Calcaire Soulagement de l'épée", - "block.mineralogy.limestone_relief_vertical": "Calcaire Relief vertical", - "block.mineralogy.marble_relief_axe": "Marbre Soulagement de la hache", - "block.mineralogy.marble_relief_blank": "Marbre Relief vide", - "block.mineralogy.marble_relief_cross": "Marbre Relief croisé", - "block.mineralogy.marble_relief_hammer": "Marbre Soulagement marteau", - "block.mineralogy.marble_relief_hoe": "Marbre Hoe Relief", - "block.mineralogy.marble_relief_horizontal": "Marbre Relief horizontal", - "block.mineralogy.marble_relief_i": "Marbre I Relief", - "block.mineralogy.marble_relief_left": "Marbre Relief gauche", - "block.mineralogy.marble_relief_pickaxe": "Marbre Relief de pioche", - "block.mineralogy.marble_relief_plus": "Marbre Plus de soulagement", - "block.mineralogy.marble_relief_right": "Marbre Bon soulagement", - "block.mineralogy.marble_relief_sword": "Marbre Soulagement de l'épée", - "block.mineralogy.marble_relief_vertical": "Marbre Relief vertical", - "block.mineralogy.slate_relief_axe": "Ardoise Soulagement de la hache", - "block.mineralogy.slate_relief_blank": "Ardoise Relief vide", - "block.mineralogy.slate_relief_cross": "Ardoise Relief croisé", - "block.mineralogy.slate_relief_hammer": "Ardoise Soulagement marteau", - "block.mineralogy.slate_relief_hoe": "Ardoise Hoe Relief", - "block.mineralogy.slate_relief_horizontal": "Ardoise Relief horizontal", - "block.mineralogy.slate_relief_i": "Ardoise I Relief", - "block.mineralogy.slate_relief_left": "Ardoise Relief gauche", - "block.mineralogy.slate_relief_pickaxe": "Ardoise Relief de pioche", - "block.mineralogy.slate_relief_plus": "Ardoise Plus de soulagement", - "block.mineralogy.slate_relief_right": "Ardoise Bon soulagement", - "block.mineralogy.slate_relief_sword": "Ardoise Soulagement de l'épée", - "block.mineralogy.slate_relief_vertical": "Ardoise Relief vertical", - "block.mineralogy.schist_relief_axe": "Schiste Soulagement de la hache", - "block.mineralogy.schist_relief_blank": "Schiste Relief vide", - "block.mineralogy.schist_relief_cross": "Schiste Relief croisé", - "block.mineralogy.schist_relief_hammer": "Schiste Soulagement marteau", - "block.mineralogy.schist_relief_hoe": "Schiste Hoe Relief", - "block.mineralogy.schist_relief_horizontal": "Schiste Relief horizontal", - "block.mineralogy.schist_relief_i": "Schiste I Relief", - "block.mineralogy.schist_relief_left": "Schiste Relief gauche", - "block.mineralogy.schist_relief_pickaxe": "Schiste Relief de pioche", - "block.mineralogy.schist_relief_plus": "Schiste Plus de soulagement", - "block.mineralogy.schist_relief_right": "Schiste Bon soulagement", - "block.mineralogy.schist_relief_sword": "Schiste Soulagement de l'épée", - "block.mineralogy.schist_relief_vertical": "Schiste Relief vertical", - "block.mineralogy.gneiss_relief_axe": "Gneiss Soulagement de la hache", - "block.mineralogy.gneiss_relief_blank": "Gneiss Relief vide", - "block.mineralogy.gneiss_relief_cross": "Gneiss Relief croisé", - "block.mineralogy.gneiss_relief_hammer": "Gneiss Soulagement marteau", - "block.mineralogy.gneiss_relief_hoe": "Gneiss Hoe Relief", - "block.mineralogy.gneiss_relief_horizontal": "Gneiss Relief horizontal", - "block.mineralogy.gneiss_relief_i": "Gneiss I Relief", - "block.mineralogy.gneiss_relief_left": "Gneiss Relief gauche", - "block.mineralogy.gneiss_relief_pickaxe": "Gneiss Relief de pioche", - "block.mineralogy.gneiss_relief_plus": "Gneiss Plus de soulagement", - "block.mineralogy.gneiss_relief_right": "Gneiss Bon soulagement", - "block.mineralogy.gneiss_relief_sword": "Gneiss Soulagement de l'épée", - "block.mineralogy.gneiss_relief_vertical": "Gneiss Relief vertical", - "block.mineralogy.phyllite_relief_axe": "Phyllite Soulagement de la hache", - "block.mineralogy.phyllite_relief_blank": "Phyllite Relief vide", - "block.mineralogy.phyllite_relief_cross": "Phyllite Relief croisé", - "block.mineralogy.phyllite_relief_hammer": "Phyllite Soulagement marteau", - "block.mineralogy.phyllite_relief_hoe": "Phyllite Hoe Relief", - "block.mineralogy.phyllite_relief_horizontal": "Phyllite Relief horizontal", - "block.mineralogy.phyllite_relief_i": "Phyllite I Relief", - "block.mineralogy.phyllite_relief_left": "Phyllite Relief gauche", - "block.mineralogy.phyllite_relief_pickaxe": "Phyllite Relief de pioche", - "block.mineralogy.phyllite_relief_plus": "Phyllite Plus de soulagement", - "block.mineralogy.phyllite_relief_right": "Phyllite Bon soulagement", - "block.mineralogy.phyllite_relief_sword": "Phyllite Soulagement de l'épée", - "block.mineralogy.phyllite_relief_vertical": "Phyllite Relief vertical", - "block.mineralogy.amphibolite_relief_axe": "Amphibolite Soulagement de la hache", - "block.mineralogy.amphibolite_relief_blank": "Amphibolite Relief vide", - "block.mineralogy.amphibolite_relief_cross": "Amphibolite Relief croisé", - "block.mineralogy.amphibolite_relief_hammer": "Amphibolite Soulagement marteau", - "block.mineralogy.amphibolite_relief_hoe": "Amphibolite Hoe Relief", - "block.mineralogy.amphibolite_relief_horizontal": "Amphibolite Relief horizontal", - "block.mineralogy.amphibolite_relief_i": "Amphibolite I Relief", - "block.mineralogy.amphibolite_relief_left": "Amphibolite Relief gauche", - "block.mineralogy.amphibolite_relief_pickaxe": "Amphibolite Relief de pioche", - "block.mineralogy.amphibolite_relief_plus": "Amphibolite Plus de soulagement", - "block.mineralogy.amphibolite_relief_right": "Amphibolite Bon soulagement", - "block.mineralogy.amphibolite_relief_sword": "Amphibolite Soulagement de l'épée", - "block.mineralogy.amphibolite_relief_vertical": "Amphibolite Relief vertical", - "block.mineralogy.diabase_relief_axe": "Diabase Soulagement de la hache", - "block.mineralogy.diabase_relief_blank": "Diabase Relief vide", - "block.mineralogy.diabase_relief_cross": "Diabase Relief croisé", - "block.mineralogy.diabase_relief_hammer": "Diabase Soulagement marteau", - "block.mineralogy.diabase_relief_hoe": "Diabase Hoe Relief", - "block.mineralogy.diabase_relief_horizontal": "Diabase Relief horizontal", - "block.mineralogy.diabase_relief_i": "Diabase I Relief", - "block.mineralogy.diabase_relief_left": "Diabase Relief gauche", - "block.mineralogy.diabase_relief_pickaxe": "Diabase Relief de pioche", - "block.mineralogy.diabase_relief_plus": "Diabase Plus de soulagement", - "block.mineralogy.diabase_relief_right": "Diabase Bon soulagement", - "block.mineralogy.diabase_relief_sword": "Diabase Soulagement de l'épée", - "block.mineralogy.diabase_relief_vertical": "Diabase Relief vertical", - "block.mineralogy.gabbro_relief_axe": "Gabbro Soulagement de la hache", - "block.mineralogy.gabbro_relief_blank": "Gabbro Relief vide", - "block.mineralogy.gabbro_relief_cross": "Gabbro Relief croisé", - "block.mineralogy.gabbro_relief_hammer": "Gabbro Soulagement marteau", - "block.mineralogy.gabbro_relief_hoe": "Gabbro Hoe Relief", - "block.mineralogy.gabbro_relief_horizontal": "Gabbro Relief horizontal", - "block.mineralogy.gabbro_relief_i": "Gabbro I Relief", - "block.mineralogy.gabbro_relief_left": "Gabbro Relief gauche", - "block.mineralogy.gabbro_relief_pickaxe": "Gabbro Relief de pioche", - "block.mineralogy.gabbro_relief_plus": "Gabbro Plus de soulagement", - "block.mineralogy.gabbro_relief_right": "Gabbro Bon soulagement", - "block.mineralogy.gabbro_relief_sword": "Gabbro Soulagement de l'épée", - "block.mineralogy.gabbro_relief_vertical": "Gabbro Relief vertical", - "block.mineralogy.peridotite_relief_axe": "Péridotite Soulagement de la hache", - "block.mineralogy.peridotite_relief_blank": "Péridotite Relief vide", - "block.mineralogy.peridotite_relief_cross": "Péridotite Relief croisé", - "block.mineralogy.peridotite_relief_hammer": "Péridotite Soulagement marteau", - "block.mineralogy.peridotite_relief_hoe": "Péridotite Hoe Relief", - "block.mineralogy.peridotite_relief_horizontal": "Péridotite Relief horizontal", - "block.mineralogy.peridotite_relief_i": "Péridotite I Relief", - "block.mineralogy.peridotite_relief_left": "Péridotite Relief gauche", - "block.mineralogy.peridotite_relief_pickaxe": "Péridotite Relief de pioche", - "block.mineralogy.peridotite_relief_plus": "Péridotite Plus de soulagement", - "block.mineralogy.peridotite_relief_right": "Péridotite Bon soulagement", - "block.mineralogy.peridotite_relief_sword": "Péridotite Soulagement de l'épée", - "block.mineralogy.peridotite_relief_vertical": "Péridotite Relief vertical", - "block.mineralogy.basaltic_glass_relief_axe": "Verre basaltique Soulagement de la hache", - "block.mineralogy.basaltic_glass_relief_blank": "Verre basaltique Relief vide", - "block.mineralogy.basaltic_glass_relief_cross": "Verre basaltique Relief croisé", - "block.mineralogy.basaltic_glass_relief_hammer": "Verre basaltique Soulagement marteau", - "block.mineralogy.basaltic_glass_relief_hoe": "Verre basaltique Hoe Relief", - "block.mineralogy.basaltic_glass_relief_horizontal": "Verre basaltique Relief horizontal", - "block.mineralogy.basaltic_glass_relief_i": "Verre basaltique I Relief", - "block.mineralogy.basaltic_glass_relief_left": "Verre basaltique Relief gauche", - "block.mineralogy.basaltic_glass_relief_pickaxe": "Verre basaltique Relief de pioche", - "block.mineralogy.basaltic_glass_relief_plus": "Verre basaltique Plus de soulagement", - "block.mineralogy.basaltic_glass_relief_right": "Verre basaltique Bon soulagement", - "block.mineralogy.basaltic_glass_relief_sword": "Verre basaltique Soulagement de l'épée", - "block.mineralogy.basaltic_glass_relief_vertical": "Verre basaltique Relief vertical", - "block.mineralogy.scoria_relief_axe": "Scories Soulagement de la hache", - "block.mineralogy.scoria_relief_blank": "Scories Relief vide", - "block.mineralogy.scoria_relief_cross": "Scories Relief croisé", - "block.mineralogy.scoria_relief_hammer": "Scories Soulagement marteau", - "block.mineralogy.scoria_relief_hoe": "Scories Hoe Relief", - "block.mineralogy.scoria_relief_horizontal": "Scories Relief horizontal", - "block.mineralogy.scoria_relief_i": "Scories I Relief", - "block.mineralogy.scoria_relief_left": "Scories Relief gauche", - "block.mineralogy.scoria_relief_pickaxe": "Scories Relief de pioche", - "block.mineralogy.scoria_relief_plus": "Scories Plus de soulagement", - "block.mineralogy.scoria_relief_right": "Scories Bon soulagement", - "block.mineralogy.scoria_relief_sword": "Scories Soulagement de l'épée", - "block.mineralogy.scoria_relief_vertical": "Scories Relief vertical", - "block.mineralogy.tuff_relief_axe": "Tuf Soulagement de la hache", - "block.mineralogy.tuff_relief_blank": "Tuf Relief vide", - "block.mineralogy.tuff_relief_cross": "Tuf Relief croisé", - "block.mineralogy.tuff_relief_hammer": "Tuf Soulagement marteau", - "block.mineralogy.tuff_relief_hoe": "Tuf Hoe Relief", - "block.mineralogy.tuff_relief_horizontal": "Tuf Relief horizontal", - "block.mineralogy.tuff_relief_i": "Tuf I Relief", - "block.mineralogy.tuff_relief_left": "Tuf Relief gauche", - "block.mineralogy.tuff_relief_pickaxe": "Tuf Relief de pioche", - "block.mineralogy.tuff_relief_plus": "Tuf Plus de soulagement", - "block.mineralogy.tuff_relief_right": "Tuf Bon soulagement", - "block.mineralogy.tuff_relief_sword": "Tuf Soulagement de l'épée", - "block.mineralogy.tuff_relief_vertical": "Tuf Relief vertical", - "block.mineralogy.siltstone_relief_axe": "Pierre de terre Soulagement de la hache", - "block.mineralogy.siltstone_relief_blank": "Pierre de terre Relief vide", - "block.mineralogy.siltstone_relief_cross": "Pierre de terre Relief croisé", - "block.mineralogy.siltstone_relief_hammer": "Pierre de terre Soulagement marteau", - "block.mineralogy.siltstone_relief_hoe": "Pierre de terre Hoe Relief", - "block.mineralogy.siltstone_relief_horizontal": "Pierre de terre Relief horizontal", - "block.mineralogy.siltstone_relief_i": "Pierre de terre I Relief", - "block.mineralogy.siltstone_relief_left": "Pierre de terre Relief gauche", - "block.mineralogy.siltstone_relief_pickaxe": "Pierre de terre Relief de pioche", - "block.mineralogy.siltstone_relief_plus": "Pierre de terre Plus de soulagement", - "block.mineralogy.siltstone_relief_right": "Pierre de terre Bon soulagement", - "block.mineralogy.siltstone_relief_sword": "Pierre de terre Soulagement de l'épée", - "block.mineralogy.siltstone_relief_vertical": "Pierre de terre Relief vertical", - "block.mineralogy.rock_salt_relief_axe": "Sel gemme Soulagement de la hache", - "block.mineralogy.rock_salt_relief_blank": "Sel gemme Relief vide", - "block.mineralogy.rock_salt_relief_cross": "Sel gemme Relief croisé", - "block.mineralogy.rock_salt_relief_hammer": "Sel gemme Soulagement marteau", - "block.mineralogy.rock_salt_relief_hoe": "Sel gemme Hoe Relief", - "block.mineralogy.rock_salt_relief_horizontal": "Sel gemme Relief horizontal", - "block.mineralogy.rock_salt_relief_i": "Sel gemme I Relief", - "block.mineralogy.rock_salt_relief_left": "Sel gemme Relief gauche", - "block.mineralogy.rock_salt_relief_pickaxe": "Sel gemme Relief de pioche", - "block.mineralogy.rock_salt_relief_plus": "Sel gemme Plus de soulagement", - "block.mineralogy.rock_salt_relief_right": "Sel gemme Bon soulagement", - "block.mineralogy.rock_salt_relief_sword": "Sel gemme Soulagement de l'épée", - "block.mineralogy.rock_salt_relief_vertical": "Sel gemme Relief vertical", - "block.mineralogy.hornfels_relief_axe": "Hornfels Soulagement de la hache", - "block.mineralogy.hornfels_relief_blank": "Hornfels Relief vide", - "block.mineralogy.hornfels_relief_cross": "Hornfels Relief croisé", - "block.mineralogy.hornfels_relief_hammer": "Hornfels Soulagement marteau", - "block.mineralogy.hornfels_relief_hoe": "Hornfels Hoe Relief", - "block.mineralogy.hornfels_relief_horizontal": "Hornfels Relief horizontal", - "block.mineralogy.hornfels_relief_i": "Hornfels I Relief", - "block.mineralogy.hornfels_relief_left": "Hornfels Relief gauche", - "block.mineralogy.hornfels_relief_pickaxe": "Hornfels Relief de pioche", - "block.mineralogy.hornfels_relief_plus": "Hornfels Plus de soulagement", - "block.mineralogy.hornfels_relief_right": "Hornfels Bon soulagement", - "block.mineralogy.hornfels_relief_sword": "Hornfels Soulagement de l'épée", - "block.mineralogy.hornfels_relief_vertical": "Hornfels Relief vertical", - "block.mineralogy.quartzite_relief_axe": "Quartzite Soulagement de la hache", - "block.mineralogy.quartzite_relief_blank": "Quartzite Relief vide", - "block.mineralogy.quartzite_relief_cross": "Quartzite Relief croisé", - "block.mineralogy.quartzite_relief_hammer": "Quartzite Soulagement marteau", - "block.mineralogy.quartzite_relief_hoe": "Quartzite Hoe Relief", - "block.mineralogy.quartzite_relief_horizontal": "Quartzite Relief horizontal", - "block.mineralogy.quartzite_relief_i": "Quartzite I Relief", - "block.mineralogy.quartzite_relief_left": "Quartzite Relief gauche", - "block.mineralogy.quartzite_relief_pickaxe": "Quartzite Relief de pioche", - "block.mineralogy.quartzite_relief_plus": "Quartzite Plus de soulagement", - "block.mineralogy.quartzite_relief_right": "Quartzite Bon soulagement", - "block.mineralogy.quartzite_relief_sword": "Quartzite Soulagement de l'épée", - "block.mineralogy.quartzite_relief_vertical": "Quartzite Relief vertical", - "block.mineralogy.novaculite_relief_axe": "Novaculite Soulagement de la hache", - "block.mineralogy.novaculite_relief_blank": "Novaculite Relief vide", - "block.mineralogy.novaculite_relief_cross": "Novaculite Relief croisé", - "block.mineralogy.novaculite_relief_hammer": "Novaculite Soulagement marteau", - "block.mineralogy.novaculite_relief_hoe": "Novaculite Hoe Relief", - "block.mineralogy.novaculite_relief_horizontal": "Novaculite Relief horizontal", - "block.mineralogy.novaculite_relief_i": "Novaculite I Relief", - "block.mineralogy.novaculite_relief_left": "Novaculite Relief gauche", - "block.mineralogy.novaculite_relief_pickaxe": "Novaculite Relief de pioche", - "block.mineralogy.novaculite_relief_plus": "Novaculite Plus de soulagement", - "block.mineralogy.novaculite_relief_right": "Novaculite Bon soulagement", - "block.mineralogy.novaculite_relief_sword": "Novaculite Soulagement de l'épée", - "block.mineralogy.novaculite_relief_vertical": "Novaculite Relief vertical", - "itemGroup.mineralogy.mineralogy": "Minéralogie" + "block.mineralogy.rocksaltlamp": "Lampe en sel gemme", + "block.mineralogy.rocksaltstreetlamp": "Réverbère en sel gemme", + "block.mineralogy.andesite_relief_axe": "Bas-relief en Andésite (hache)", + "block.mineralogy.andesite_relief_blank": "Bas-relief en Andésite (sans motif)", + "block.mineralogy.andesite_relief_cross": "Bas-relief en Andésite (croix)", + "block.mineralogy.andesite_relief_hammer": "Bas-relief en Andésite (marteau)", + "block.mineralogy.andesite_relief_hoe": "Bas-relief en Andésite (houe)", + "block.mineralogy.andesite_relief_horizontal": "Bas-relief en Andésite (horizontal)", + "block.mineralogy.andesite_relief_i": "Bas-relief en Andésite (I)", + "block.mineralogy.andesite_relief_left": "Bas-relief en Andésite (gauche)", + "block.mineralogy.andesite_relief_pickaxe": "Bas-relief en Andésite (pioche)", + "block.mineralogy.andesite_relief_plus": "Bas-relief en Andésite (signe plus)", + "block.mineralogy.andesite_relief_right": "Bas-relief en Andésite (droite)", + "block.mineralogy.andesite_relief_sword": "Bas-relief en Andésite (épée)", + "block.mineralogy.andesite_relief_vertical": "Bas-relief en Andésite (vertical)", + "block.mineralogy.basalt_relief_axe": "Bas-relief en Basalte (hache)", + "block.mineralogy.basalt_relief_blank": "Bas-relief en Basalte (sans motif)", + "block.mineralogy.basalt_relief_cross": "Bas-relief en Basalte (croix)", + "block.mineralogy.basalt_relief_hammer": "Bas-relief en Basalte (marteau)", + "block.mineralogy.basalt_relief_hoe": "Bas-relief en Basalte (houe)", + "block.mineralogy.basalt_relief_horizontal": "Bas-relief en Basalte (horizontal)", + "block.mineralogy.basalt_relief_i": "Bas-relief en Basalte (I)", + "block.mineralogy.basalt_relief_left": "Bas-relief en Basalte (gauche)", + "block.mineralogy.basalt_relief_pickaxe": "Bas-relief en Basalte (pioche)", + "block.mineralogy.basalt_relief_plus": "Bas-relief en Basalte (signe plus)", + "block.mineralogy.basalt_relief_right": "Bas-relief en Basalte (droite)", + "block.mineralogy.basalt_relief_sword": "Bas-relief en Basalte (épée)", + "block.mineralogy.basalt_relief_vertical": "Bas-relief en Basalte (vertical)", + "block.mineralogy.diorite_relief_axe": "Bas-relief en Diorite (hache)", + "block.mineralogy.diorite_relief_blank": "Bas-relief en Diorite (sans motif)", + "block.mineralogy.diorite_relief_cross": "Bas-relief en Diorite (croix)", + "block.mineralogy.diorite_relief_hammer": "Bas-relief en Diorite (marteau)", + "block.mineralogy.diorite_relief_hoe": "Bas-relief en Diorite (houe)", + "block.mineralogy.diorite_relief_horizontal": "Bas-relief en Diorite (horizontal)", + "block.mineralogy.diorite_relief_i": "Bas-relief en Diorite (I)", + "block.mineralogy.diorite_relief_left": "Bas-relief en Diorite (gauche)", + "block.mineralogy.diorite_relief_pickaxe": "Bas-relief en Diorite (pioche)", + "block.mineralogy.diorite_relief_plus": "Bas-relief en Diorite (signe plus)", + "block.mineralogy.diorite_relief_right": "Bas-relief en Diorite (droite)", + "block.mineralogy.diorite_relief_sword": "Bas-relief en Diorite (épée)", + "block.mineralogy.diorite_relief_vertical": "Bas-relief en Diorite (vertical)", + "block.mineralogy.granite_relief_axe": "Bas-relief en Granite (hache)", + "block.mineralogy.granite_relief_blank": "Bas-relief en Granite (sans motif)", + "block.mineralogy.granite_relief_cross": "Bas-relief en Granite (croix)", + "block.mineralogy.granite_relief_hammer": "Bas-relief en Granite (marteau)", + "block.mineralogy.granite_relief_hoe": "Bas-relief en Granite (houe)", + "block.mineralogy.granite_relief_horizontal": "Bas-relief en Granite (horizontal)", + "block.mineralogy.granite_relief_i": "Bas-relief en Granite (I)", + "block.mineralogy.granite_relief_left": "Bas-relief en Granite (gauche)", + "block.mineralogy.granite_relief_pickaxe": "Bas-relief en Granite (pioche)", + "block.mineralogy.granite_relief_plus": "Bas-relief en Granite (signe plus)", + "block.mineralogy.granite_relief_right": "Bas-relief en Granite (droite)", + "block.mineralogy.granite_relief_sword": "Bas-relief en Granite (épée)", + "block.mineralogy.granite_relief_vertical": "Bas-relief en Granite (vertical)", + "block.mineralogy.rhyolite_relief_axe": "Bas-relief en Rhyolite (hache)", + "block.mineralogy.rhyolite_relief_blank": "Bas-relief en Rhyolite (sans motif)", + "block.mineralogy.rhyolite_relief_cross": "Bas-relief en Rhyolite (croix)", + "block.mineralogy.rhyolite_relief_hammer": "Bas-relief en Rhyolite (marteau)", + "block.mineralogy.rhyolite_relief_hoe": "Bas-relief en Rhyolite (houe)", + "block.mineralogy.rhyolite_relief_horizontal": "Bas-relief en Rhyolite (horizontal)", + "block.mineralogy.rhyolite_relief_i": "Bas-relief en Rhyolite (I)", + "block.mineralogy.rhyolite_relief_left": "Bas-relief en Rhyolite (gauche)", + "block.mineralogy.rhyolite_relief_pickaxe": "Bas-relief en Rhyolite (pioche)", + "block.mineralogy.rhyolite_relief_plus": "Bas-relief en Rhyolite (signe plus)", + "block.mineralogy.rhyolite_relief_right": "Bas-relief en Rhyolite (droite)", + "block.mineralogy.rhyolite_relief_sword": "Bas-relief en Rhyolite (épée)", + "block.mineralogy.rhyolite_relief_vertical": "Bas-relief en Rhyolite (vertical)", + "block.mineralogy.pegmatite_relief_axe": "Bas-relief en Pegmatite (hache)", + "block.mineralogy.pegmatite_relief_blank": "Bas-relief en Pegmatite (sans motif)", + "block.mineralogy.pegmatite_relief_cross": "Bas-relief en Pegmatite (croix)", + "block.mineralogy.pegmatite_relief_hammer": "Bas-relief en Pegmatite (marteau)", + "block.mineralogy.pegmatite_relief_hoe": "Bas-relief en Pegmatite (houe)", + "block.mineralogy.pegmatite_relief_horizontal": "Bas-relief en Pegmatite (horizontal)", + "block.mineralogy.pegmatite_relief_i": "Bas-relief en Pegmatite (I)", + "block.mineralogy.pegmatite_relief_left": "Bas-relief en Pegmatite (gauche)", + "block.mineralogy.pegmatite_relief_pickaxe": "Bas-relief en Pegmatite (pioche)", + "block.mineralogy.pegmatite_relief_plus": "Bas-relief en Pegmatite (signe plus)", + "block.mineralogy.pegmatite_relief_right": "Bas-relief en Pegmatite (droite)", + "block.mineralogy.pegmatite_relief_sword": "Bas-relief en Pegmatite (épée)", + "block.mineralogy.pegmatite_relief_vertical": "Bas-relief en Pegmatite (vertical)", + "block.mineralogy.shale_relief_axe": "Bas-relief en Schiste argileux (hache)", + "block.mineralogy.shale_relief_blank": "Bas-relief en Schiste argileux (sans motif)", + "block.mineralogy.shale_relief_cross": "Bas-relief en Schiste argileux (croix)", + "block.mineralogy.shale_relief_hammer": "Bas-relief en Schiste argileux (marteau)", + "block.mineralogy.shale_relief_hoe": "Bas-relief en Schiste argileux (houe)", + "block.mineralogy.shale_relief_horizontal": "Bas-relief en Schiste argileux (horizontal)", + "block.mineralogy.shale_relief_i": "Bas-relief en Schiste argileux (I)", + "block.mineralogy.shale_relief_left": "Bas-relief en Schiste argileux (gauche)", + "block.mineralogy.shale_relief_pickaxe": "Bas-relief en Schiste argileux (pioche)", + "block.mineralogy.shale_relief_plus": "Bas-relief en Schiste argileux (signe plus)", + "block.mineralogy.shale_relief_right": "Bas-relief en Schiste argileux (droite)", + "block.mineralogy.shale_relief_sword": "Bas-relief en Schiste argileux (épée)", + "block.mineralogy.shale_relief_vertical": "Bas-relief en Schiste argileux (vertical)", + "block.mineralogy.conglomerate_relief_axe": "Bas-relief en Conglomérat (hache)", + "block.mineralogy.conglomerate_relief_blank": "Bas-relief en Conglomérat (sans motif)", + "block.mineralogy.conglomerate_relief_cross": "Bas-relief en Conglomérat (croix)", + "block.mineralogy.conglomerate_relief_hammer": "Bas-relief en Conglomérat (marteau)", + "block.mineralogy.conglomerate_relief_hoe": "Bas-relief en Conglomérat (houe)", + "block.mineralogy.conglomerate_relief_horizontal": "Bas-relief en Conglomérat (horizontal)", + "block.mineralogy.conglomerate_relief_i": "Bas-relief en Conglomérat (I)", + "block.mineralogy.conglomerate_relief_left": "Bas-relief en Conglomérat (gauche)", + "block.mineralogy.conglomerate_relief_pickaxe": "Bas-relief en Conglomérat (pioche)", + "block.mineralogy.conglomerate_relief_plus": "Bas-relief en Conglomérat (signe plus)", + "block.mineralogy.conglomerate_relief_right": "Bas-relief en Conglomérat (droite)", + "block.mineralogy.conglomerate_relief_sword": "Bas-relief en Conglomérat (épée)", + "block.mineralogy.conglomerate_relief_vertical": "Bas-relief en Conglomérat (vertical)", + "block.mineralogy.dolomite_relief_axe": "Bas-relief en Dolomie (hache)", + "block.mineralogy.dolomite_relief_blank": "Bas-relief en Dolomie (sans motif)", + "block.mineralogy.dolomite_relief_cross": "Bas-relief en Dolomie (croix)", + "block.mineralogy.dolomite_relief_hammer": "Bas-relief en Dolomie (marteau)", + "block.mineralogy.dolomite_relief_hoe": "Bas-relief en Dolomie (houe)", + "block.mineralogy.dolomite_relief_horizontal": "Bas-relief en Dolomie (horizontal)", + "block.mineralogy.dolomite_relief_i": "Bas-relief en Dolomie (I)", + "block.mineralogy.dolomite_relief_left": "Bas-relief en Dolomie (gauche)", + "block.mineralogy.dolomite_relief_pickaxe": "Bas-relief en Dolomie (pioche)", + "block.mineralogy.dolomite_relief_plus": "Bas-relief en Dolomie (signe plus)", + "block.mineralogy.dolomite_relief_right": "Bas-relief en Dolomie (droite)", + "block.mineralogy.dolomite_relief_sword": "Bas-relief en Dolomie (épée)", + "block.mineralogy.dolomite_relief_vertical": "Bas-relief en Dolomie (vertical)", + "block.mineralogy.limestone_relief_axe": "Bas-relief en Calcaire (hache)", + "block.mineralogy.limestone_relief_blank": "Bas-relief en Calcaire (sans motif)", + "block.mineralogy.limestone_relief_cross": "Bas-relief en Calcaire (croix)", + "block.mineralogy.limestone_relief_hammer": "Bas-relief en Calcaire (marteau)", + "block.mineralogy.limestone_relief_hoe": "Bas-relief en Calcaire (houe)", + "block.mineralogy.limestone_relief_horizontal": "Bas-relief en Calcaire (horizontal)", + "block.mineralogy.limestone_relief_i": "Bas-relief en Calcaire (I)", + "block.mineralogy.limestone_relief_left": "Bas-relief en Calcaire (gauche)", + "block.mineralogy.limestone_relief_pickaxe": "Bas-relief en Calcaire (pioche)", + "block.mineralogy.limestone_relief_plus": "Bas-relief en Calcaire (signe plus)", + "block.mineralogy.limestone_relief_right": "Bas-relief en Calcaire (droite)", + "block.mineralogy.limestone_relief_sword": "Bas-relief en Calcaire (épée)", + "block.mineralogy.limestone_relief_vertical": "Bas-relief en Calcaire (vertical)", + "block.mineralogy.marble_relief_axe": "Bas-relief en Marbre (hache)", + "block.mineralogy.marble_relief_blank": "Bas-relief en Marbre (sans motif)", + "block.mineralogy.marble_relief_cross": "Bas-relief en Marbre (croix)", + "block.mineralogy.marble_relief_hammer": "Bas-relief en Marbre (marteau)", + "block.mineralogy.marble_relief_hoe": "Bas-relief en Marbre (houe)", + "block.mineralogy.marble_relief_horizontal": "Bas-relief en Marbre (horizontal)", + "block.mineralogy.marble_relief_i": "Bas-relief en Marbre (I)", + "block.mineralogy.marble_relief_left": "Bas-relief en Marbre (gauche)", + "block.mineralogy.marble_relief_pickaxe": "Bas-relief en Marbre (pioche)", + "block.mineralogy.marble_relief_plus": "Bas-relief en Marbre (signe plus)", + "block.mineralogy.marble_relief_right": "Bas-relief en Marbre (droite)", + "block.mineralogy.marble_relief_sword": "Bas-relief en Marbre (épée)", + "block.mineralogy.marble_relief_vertical": "Bas-relief en Marbre (vertical)", + "block.mineralogy.slate_relief_axe": "Bas-relief en Ardoise (hache)", + "block.mineralogy.slate_relief_blank": "Bas-relief en Ardoise (sans motif)", + "block.mineralogy.slate_relief_cross": "Bas-relief en Ardoise (croix)", + "block.mineralogy.slate_relief_hammer": "Bas-relief en Ardoise (marteau)", + "block.mineralogy.slate_relief_hoe": "Bas-relief en Ardoise (houe)", + "block.mineralogy.slate_relief_horizontal": "Bas-relief en Ardoise (horizontal)", + "block.mineralogy.slate_relief_i": "Bas-relief en Ardoise (I)", + "block.mineralogy.slate_relief_left": "Bas-relief en Ardoise (gauche)", + "block.mineralogy.slate_relief_pickaxe": "Bas-relief en Ardoise (pioche)", + "block.mineralogy.slate_relief_plus": "Bas-relief en Ardoise (signe plus)", + "block.mineralogy.slate_relief_right": "Bas-relief en Ardoise (droite)", + "block.mineralogy.slate_relief_sword": "Bas-relief en Ardoise (épée)", + "block.mineralogy.slate_relief_vertical": "Bas-relief en Ardoise (vertical)", + "block.mineralogy.schist_relief_axe": "Bas-relief en Micaschiste (hache)", + "block.mineralogy.schist_relief_blank": "Bas-relief en Micaschiste (sans motif)", + "block.mineralogy.schist_relief_cross": "Bas-relief en Micaschiste (croix)", + "block.mineralogy.schist_relief_hammer": "Bas-relief en Micaschiste (marteau)", + "block.mineralogy.schist_relief_hoe": "Bas-relief en Micaschiste (houe)", + "block.mineralogy.schist_relief_horizontal": "Bas-relief en Micaschiste (horizontal)", + "block.mineralogy.schist_relief_i": "Bas-relief en Micaschiste (I)", + "block.mineralogy.schist_relief_left": "Bas-relief en Micaschiste (gauche)", + "block.mineralogy.schist_relief_pickaxe": "Bas-relief en Micaschiste (pioche)", + "block.mineralogy.schist_relief_plus": "Bas-relief en Micaschiste (signe plus)", + "block.mineralogy.schist_relief_right": "Bas-relief en Micaschiste (droite)", + "block.mineralogy.schist_relief_sword": "Bas-relief en Micaschiste (épée)", + "block.mineralogy.schist_relief_vertical": "Bas-relief en Micaschiste (vertical)", + "block.mineralogy.gneiss_relief_axe": "Bas-relief en Gneiss (hache)", + "block.mineralogy.gneiss_relief_blank": "Bas-relief en Gneiss (sans motif)", + "block.mineralogy.gneiss_relief_cross": "Bas-relief en Gneiss (croix)", + "block.mineralogy.gneiss_relief_hammer": "Bas-relief en Gneiss (marteau)", + "block.mineralogy.gneiss_relief_hoe": "Bas-relief en Gneiss (houe)", + "block.mineralogy.gneiss_relief_horizontal": "Bas-relief en Gneiss (horizontal)", + "block.mineralogy.gneiss_relief_i": "Bas-relief en Gneiss (I)", + "block.mineralogy.gneiss_relief_left": "Bas-relief en Gneiss (gauche)", + "block.mineralogy.gneiss_relief_pickaxe": "Bas-relief en Gneiss (pioche)", + "block.mineralogy.gneiss_relief_plus": "Bas-relief en Gneiss (signe plus)", + "block.mineralogy.gneiss_relief_right": "Bas-relief en Gneiss (droite)", + "block.mineralogy.gneiss_relief_sword": "Bas-relief en Gneiss (épée)", + "block.mineralogy.gneiss_relief_vertical": "Bas-relief en Gneiss (vertical)", + "block.mineralogy.phyllite_relief_axe": "Bas-relief en Phyllade (hache)", + "block.mineralogy.phyllite_relief_blank": "Bas-relief en Phyllade (sans motif)", + "block.mineralogy.phyllite_relief_cross": "Bas-relief en Phyllade (croix)", + "block.mineralogy.phyllite_relief_hammer": "Bas-relief en Phyllade (marteau)", + "block.mineralogy.phyllite_relief_hoe": "Bas-relief en Phyllade (houe)", + "block.mineralogy.phyllite_relief_horizontal": "Bas-relief en Phyllade (horizontal)", + "block.mineralogy.phyllite_relief_i": "Bas-relief en Phyllade (I)", + "block.mineralogy.phyllite_relief_left": "Bas-relief en Phyllade (gauche)", + "block.mineralogy.phyllite_relief_pickaxe": "Bas-relief en Phyllade (pioche)", + "block.mineralogy.phyllite_relief_plus": "Bas-relief en Phyllade (signe plus)", + "block.mineralogy.phyllite_relief_right": "Bas-relief en Phyllade (droite)", + "block.mineralogy.phyllite_relief_sword": "Bas-relief en Phyllade (épée)", + "block.mineralogy.phyllite_relief_vertical": "Bas-relief en Phyllade (vertical)", + "block.mineralogy.amphibolite_relief_axe": "Bas-relief en Amphibolite (hache)", + "block.mineralogy.amphibolite_relief_blank": "Bas-relief en Amphibolite (sans motif)", + "block.mineralogy.amphibolite_relief_cross": "Bas-relief en Amphibolite (croix)", + "block.mineralogy.amphibolite_relief_hammer": "Bas-relief en Amphibolite (marteau)", + "block.mineralogy.amphibolite_relief_hoe": "Bas-relief en Amphibolite (houe)", + "block.mineralogy.amphibolite_relief_horizontal": "Bas-relief en Amphibolite (horizontal)", + "block.mineralogy.amphibolite_relief_i": "Bas-relief en Amphibolite (I)", + "block.mineralogy.amphibolite_relief_left": "Bas-relief en Amphibolite (gauche)", + "block.mineralogy.amphibolite_relief_pickaxe": "Bas-relief en Amphibolite (pioche)", + "block.mineralogy.amphibolite_relief_plus": "Bas-relief en Amphibolite (signe plus)", + "block.mineralogy.amphibolite_relief_right": "Bas-relief en Amphibolite (droite)", + "block.mineralogy.amphibolite_relief_sword": "Bas-relief en Amphibolite (épée)", + "block.mineralogy.amphibolite_relief_vertical": "Bas-relief en Amphibolite (vertical)", + "block.mineralogy.diabase_relief_axe": "Bas-relief en Diabase (hache)", + "block.mineralogy.diabase_relief_blank": "Bas-relief en Diabase (sans motif)", + "block.mineralogy.diabase_relief_cross": "Bas-relief en Diabase (croix)", + "block.mineralogy.diabase_relief_hammer": "Bas-relief en Diabase (marteau)", + "block.mineralogy.diabase_relief_hoe": "Bas-relief en Diabase (houe)", + "block.mineralogy.diabase_relief_horizontal": "Bas-relief en Diabase (horizontal)", + "block.mineralogy.diabase_relief_i": "Bas-relief en Diabase (I)", + "block.mineralogy.diabase_relief_left": "Bas-relief en Diabase (gauche)", + "block.mineralogy.diabase_relief_pickaxe": "Bas-relief en Diabase (pioche)", + "block.mineralogy.diabase_relief_plus": "Bas-relief en Diabase (signe plus)", + "block.mineralogy.diabase_relief_right": "Bas-relief en Diabase (droite)", + "block.mineralogy.diabase_relief_sword": "Bas-relief en Diabase (épée)", + "block.mineralogy.diabase_relief_vertical": "Bas-relief en Diabase (vertical)", + "block.mineralogy.gabbro_relief_axe": "Bas-relief en Gabbro (hache)", + "block.mineralogy.gabbro_relief_blank": "Bas-relief en Gabbro (sans motif)", + "block.mineralogy.gabbro_relief_cross": "Bas-relief en Gabbro (croix)", + "block.mineralogy.gabbro_relief_hammer": "Bas-relief en Gabbro (marteau)", + "block.mineralogy.gabbro_relief_hoe": "Bas-relief en Gabbro (houe)", + "block.mineralogy.gabbro_relief_horizontal": "Bas-relief en Gabbro (horizontal)", + "block.mineralogy.gabbro_relief_i": "Bas-relief en Gabbro (I)", + "block.mineralogy.gabbro_relief_left": "Bas-relief en Gabbro (gauche)", + "block.mineralogy.gabbro_relief_pickaxe": "Bas-relief en Gabbro (pioche)", + "block.mineralogy.gabbro_relief_plus": "Bas-relief en Gabbro (signe plus)", + "block.mineralogy.gabbro_relief_right": "Bas-relief en Gabbro (droite)", + "block.mineralogy.gabbro_relief_sword": "Bas-relief en Gabbro (épée)", + "block.mineralogy.gabbro_relief_vertical": "Bas-relief en Gabbro (vertical)", + "block.mineralogy.peridotite_relief_axe": "Bas-relief en Péridotite (hache)", + "block.mineralogy.peridotite_relief_blank": "Bas-relief en Péridotite (sans motif)", + "block.mineralogy.peridotite_relief_cross": "Bas-relief en Péridotite (croix)", + "block.mineralogy.peridotite_relief_hammer": "Bas-relief en Péridotite (marteau)", + "block.mineralogy.peridotite_relief_hoe": "Bas-relief en Péridotite (houe)", + "block.mineralogy.peridotite_relief_horizontal": "Bas-relief en Péridotite (horizontal)", + "block.mineralogy.peridotite_relief_i": "Bas-relief en Péridotite (I)", + "block.mineralogy.peridotite_relief_left": "Bas-relief en Péridotite (gauche)", + "block.mineralogy.peridotite_relief_pickaxe": "Bas-relief en Péridotite (pioche)", + "block.mineralogy.peridotite_relief_plus": "Bas-relief en Péridotite (signe plus)", + "block.mineralogy.peridotite_relief_right": "Bas-relief en Péridotite (droite)", + "block.mineralogy.peridotite_relief_sword": "Bas-relief en Péridotite (épée)", + "block.mineralogy.peridotite_relief_vertical": "Bas-relief en Péridotite (vertical)", + "block.mineralogy.basaltic_glass_relief_axe": "Bas-relief en Verre basaltique (hache)", + "block.mineralogy.basaltic_glass_relief_blank": "Bas-relief en Verre basaltique (sans motif)", + "block.mineralogy.basaltic_glass_relief_cross": "Bas-relief en Verre basaltique (croix)", + "block.mineralogy.basaltic_glass_relief_hammer": "Bas-relief en Verre basaltique (marteau)", + "block.mineralogy.basaltic_glass_relief_hoe": "Bas-relief en Verre basaltique (houe)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Bas-relief en Verre basaltique (horizontal)", + "block.mineralogy.basaltic_glass_relief_i": "Bas-relief en Verre basaltique (I)", + "block.mineralogy.basaltic_glass_relief_left": "Bas-relief en Verre basaltique (gauche)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Bas-relief en Verre basaltique (pioche)", + "block.mineralogy.basaltic_glass_relief_plus": "Bas-relief en Verre basaltique (signe plus)", + "block.mineralogy.basaltic_glass_relief_right": "Bas-relief en Verre basaltique (droite)", + "block.mineralogy.basaltic_glass_relief_sword": "Bas-relief en Verre basaltique (épée)", + "block.mineralogy.basaltic_glass_relief_vertical": "Bas-relief en Verre basaltique (vertical)", + "block.mineralogy.scoria_relief_axe": "Bas-relief en Scorie (hache)", + "block.mineralogy.scoria_relief_blank": "Bas-relief en Scorie (sans motif)", + "block.mineralogy.scoria_relief_cross": "Bas-relief en Scorie (croix)", + "block.mineralogy.scoria_relief_hammer": "Bas-relief en Scorie (marteau)", + "block.mineralogy.scoria_relief_hoe": "Bas-relief en Scorie (houe)", + "block.mineralogy.scoria_relief_horizontal": "Bas-relief en Scorie (horizontal)", + "block.mineralogy.scoria_relief_i": "Bas-relief en Scorie (I)", + "block.mineralogy.scoria_relief_left": "Bas-relief en Scorie (gauche)", + "block.mineralogy.scoria_relief_pickaxe": "Bas-relief en Scorie (pioche)", + "block.mineralogy.scoria_relief_plus": "Bas-relief en Scorie (signe plus)", + "block.mineralogy.scoria_relief_right": "Bas-relief en Scorie (droite)", + "block.mineralogy.scoria_relief_sword": "Bas-relief en Scorie (épée)", + "block.mineralogy.scoria_relief_vertical": "Bas-relief en Scorie (vertical)", + "block.mineralogy.tuff_relief_axe": "Bas-relief en Tuf (hache)", + "block.mineralogy.tuff_relief_blank": "Bas-relief en Tuf (sans motif)", + "block.mineralogy.tuff_relief_cross": "Bas-relief en Tuf (croix)", + "block.mineralogy.tuff_relief_hammer": "Bas-relief en Tuf (marteau)", + "block.mineralogy.tuff_relief_hoe": "Bas-relief en Tuf (houe)", + "block.mineralogy.tuff_relief_horizontal": "Bas-relief en Tuf (horizontal)", + "block.mineralogy.tuff_relief_i": "Bas-relief en Tuf (I)", + "block.mineralogy.tuff_relief_left": "Bas-relief en Tuf (gauche)", + "block.mineralogy.tuff_relief_pickaxe": "Bas-relief en Tuf (pioche)", + "block.mineralogy.tuff_relief_plus": "Bas-relief en Tuf (signe plus)", + "block.mineralogy.tuff_relief_right": "Bas-relief en Tuf (droite)", + "block.mineralogy.tuff_relief_sword": "Bas-relief en Tuf (épée)", + "block.mineralogy.tuff_relief_vertical": "Bas-relief en Tuf (vertical)", + "block.mineralogy.siltstone_relief_axe": "Bas-relief en Siltite (hache)", + "block.mineralogy.siltstone_relief_blank": "Bas-relief en Siltite (sans motif)", + "block.mineralogy.siltstone_relief_cross": "Bas-relief en Siltite (croix)", + "block.mineralogy.siltstone_relief_hammer": "Bas-relief en Siltite (marteau)", + "block.mineralogy.siltstone_relief_hoe": "Bas-relief en Siltite (houe)", + "block.mineralogy.siltstone_relief_horizontal": "Bas-relief en Siltite (horizontal)", + "block.mineralogy.siltstone_relief_i": "Bas-relief en Siltite (I)", + "block.mineralogy.siltstone_relief_left": "Bas-relief en Siltite (gauche)", + "block.mineralogy.siltstone_relief_pickaxe": "Bas-relief en Siltite (pioche)", + "block.mineralogy.siltstone_relief_plus": "Bas-relief en Siltite (signe plus)", + "block.mineralogy.siltstone_relief_right": "Bas-relief en Siltite (droite)", + "block.mineralogy.siltstone_relief_sword": "Bas-relief en Siltite (épée)", + "block.mineralogy.siltstone_relief_vertical": "Bas-relief en Siltite (vertical)", + "block.mineralogy.rock_salt_relief_axe": "Bas-relief en Sel gemme (hache)", + "block.mineralogy.rock_salt_relief_blank": "Bas-relief en Sel gemme (sans motif)", + "block.mineralogy.rock_salt_relief_cross": "Bas-relief en Sel gemme (croix)", + "block.mineralogy.rock_salt_relief_hammer": "Bas-relief en Sel gemme (marteau)", + "block.mineralogy.rock_salt_relief_hoe": "Bas-relief en Sel gemme (houe)", + "block.mineralogy.rock_salt_relief_horizontal": "Bas-relief en Sel gemme (horizontal)", + "block.mineralogy.rock_salt_relief_i": "Bas-relief en Sel gemme (I)", + "block.mineralogy.rock_salt_relief_left": "Bas-relief en Sel gemme (gauche)", + "block.mineralogy.rock_salt_relief_pickaxe": "Bas-relief en Sel gemme (pioche)", + "block.mineralogy.rock_salt_relief_plus": "Bas-relief en Sel gemme (signe plus)", + "block.mineralogy.rock_salt_relief_right": "Bas-relief en Sel gemme (droite)", + "block.mineralogy.rock_salt_relief_sword": "Bas-relief en Sel gemme (épée)", + "block.mineralogy.rock_salt_relief_vertical": "Bas-relief en Sel gemme (vertical)", + "block.mineralogy.hornfels_relief_axe": "Bas-relief en Cornéenne (hache)", + "block.mineralogy.hornfels_relief_blank": "Bas-relief en Cornéenne (sans motif)", + "block.mineralogy.hornfels_relief_cross": "Bas-relief en Cornéenne (croix)", + "block.mineralogy.hornfels_relief_hammer": "Bas-relief en Cornéenne (marteau)", + "block.mineralogy.hornfels_relief_hoe": "Bas-relief en Cornéenne (houe)", + "block.mineralogy.hornfels_relief_horizontal": "Bas-relief en Cornéenne (horizontal)", + "block.mineralogy.hornfels_relief_i": "Bas-relief en Cornéenne (I)", + "block.mineralogy.hornfels_relief_left": "Bas-relief en Cornéenne (gauche)", + "block.mineralogy.hornfels_relief_pickaxe": "Bas-relief en Cornéenne (pioche)", + "block.mineralogy.hornfels_relief_plus": "Bas-relief en Cornéenne (signe plus)", + "block.mineralogy.hornfels_relief_right": "Bas-relief en Cornéenne (droite)", + "block.mineralogy.hornfels_relief_sword": "Bas-relief en Cornéenne (épée)", + "block.mineralogy.hornfels_relief_vertical": "Bas-relief en Cornéenne (vertical)", + "block.mineralogy.quartzite_relief_axe": "Bas-relief en Quartzite (hache)", + "block.mineralogy.quartzite_relief_blank": "Bas-relief en Quartzite (sans motif)", + "block.mineralogy.quartzite_relief_cross": "Bas-relief en Quartzite (croix)", + "block.mineralogy.quartzite_relief_hammer": "Bas-relief en Quartzite (marteau)", + "block.mineralogy.quartzite_relief_hoe": "Bas-relief en Quartzite (houe)", + "block.mineralogy.quartzite_relief_horizontal": "Bas-relief en Quartzite (horizontal)", + "block.mineralogy.quartzite_relief_i": "Bas-relief en Quartzite (I)", + "block.mineralogy.quartzite_relief_left": "Bas-relief en Quartzite (gauche)", + "block.mineralogy.quartzite_relief_pickaxe": "Bas-relief en Quartzite (pioche)", + "block.mineralogy.quartzite_relief_plus": "Bas-relief en Quartzite (signe plus)", + "block.mineralogy.quartzite_relief_right": "Bas-relief en Quartzite (droite)", + "block.mineralogy.quartzite_relief_sword": "Bas-relief en Quartzite (épée)", + "block.mineralogy.quartzite_relief_vertical": "Bas-relief en Quartzite (vertical)", + "block.mineralogy.novaculite_relief_axe": "Bas-relief en Novaculite (hache)", + "block.mineralogy.novaculite_relief_blank": "Bas-relief en Novaculite (sans motif)", + "block.mineralogy.novaculite_relief_cross": "Bas-relief en Novaculite (croix)", + "block.mineralogy.novaculite_relief_hammer": "Bas-relief en Novaculite (marteau)", + "block.mineralogy.novaculite_relief_hoe": "Bas-relief en Novaculite (houe)", + "block.mineralogy.novaculite_relief_horizontal": "Bas-relief en Novaculite (horizontal)", + "block.mineralogy.novaculite_relief_i": "Bas-relief en Novaculite (I)", + "block.mineralogy.novaculite_relief_left": "Bas-relief en Novaculite (gauche)", + "block.mineralogy.novaculite_relief_pickaxe": "Bas-relief en Novaculite (pioche)", + "block.mineralogy.novaculite_relief_plus": "Bas-relief en Novaculite (signe plus)", + "block.mineralogy.novaculite_relief_right": "Bas-relief en Novaculite (droite)", + "block.mineralogy.novaculite_relief_sword": "Bas-relief en Novaculite (épée)", + "block.mineralogy.novaculite_relief_vertical": "Bas-relief en Novaculite (vertical)", + "itemGroup.mineralogy.mineralogy": "Minéralogie", + "itemGroup.mineralogy.rock": "Roches de Minéralogie", + "itemGroup.mineralogy.stair": "Escaliers de Minéralogie", + "itemGroup.mineralogy.slab": "Dalles de Minéralogie", + "itemGroup.mineralogy.wall": "Murets de Minéralogie", + "itemGroup.mineralogy.item": "Objets de Minéralogie", + "block.mineralogy.crude_oil": "Pétrole brut", + "item.mineralogy.crude_oil_bucket": "Seau de pétrole brut", + "fluid.mineralogy.crude_oil": "Pétrole brut", + "advancements.mineralogy.all_the_rocks.title": "Toutes les roches", + "advancements.mineralogy.all_the_rocks.description": "Vous avez trouvé tous les types de roches standard de Mineralogy !" } diff --git a/src/main/resources/assets/mineralogy/lang/fr_fr.json b/src/main/resources/assets/mineralogy/lang/fr_fr.json index db22a2f75..adfa816a0 100644 --- a/src/main/resources/assets/mineralogy/lang/fr_fr.json +++ b/src/main/resources/assets/mineralogy/lang/fr_fr.json @@ -1,196 +1,196 @@ { "block.mineralogy.andesite": "Andésite", - "block.mineralogy.andesite_stairs": "Escaliers Andésites", - "block.mineralogy.andesite_slab": "Dalle d'Andésite", - "block.mineralogy.andesite_brick": "Brique d'Andésite", - "block.mineralogy.andesite_brick_stairs": "Escaliers en brique d'Andesite", - "block.mineralogy.andesite_brick_slab": "Dalle de brique d'Andesite", - "block.mineralogy.andesite_smooth": "Andésite polie", - "block.mineralogy.andesite_smooth_stairs": "Escaliers polis d'Andésite", - "block.mineralogy.andesite_smooth_slab": "Dalle polie d'Andésite", - "block.mineralogy.andesite_smooth_brick": "Brique polie d'Andésite", - "block.mineralogy.andesite_smooth_brick_stairs": "Escaliers en brique polis par Andesite", - "block.mineralogy.andesite_smooth_brick_slab": "Dalle de brique polie d'Andésite", + "block.mineralogy.andesite_stairs": "Escalier en Andésite", + "block.mineralogy.andesite_slab": "Dalle en Andésite", + "block.mineralogy.andesite_brick": "Briques en Andésite", + "block.mineralogy.andesite_brick_stairs": "Escalier en briques de Andésite", + "block.mineralogy.andesite_brick_slab": "Dalle en briques de Andésite", + "block.mineralogy.andesite_smooth": "Bloc poli en Andésite", + "block.mineralogy.andesite_smooth_stairs": "Escalier poli en Andésite", + "block.mineralogy.andesite_smooth_slab": "Dalle polie en Andésite", + "block.mineralogy.andesite_smooth_brick": "Briques polies en Andésite", + "block.mineralogy.andesite_smooth_brick_stairs": "Escalier en briques polies de Andésite", + "block.mineralogy.andesite_smooth_brick_slab": "Dalle en briques polies de Andésite", "block.mineralogy.basalt": "Basalte", - "block.mineralogy.basalt_stairs": "Escaliers basaltiques", - "block.mineralogy.basalt_slab": "Dalle de basalte", - "block.mineralogy.basalt_brick": "Brique de basalte", - "block.mineralogy.basalt_brick_stairs": "Escaliers de brique de basalte", - "block.mineralogy.basalt_brick_slab": "Dalle de brique de basalte", - "block.mineralogy.basalt_smooth": "Basalte poli", - "block.mineralogy.basalt_smooth_stairs": "Escaliers polis au basalte", - "block.mineralogy.basalt_smooth_slab": "Dalle polie au basalte", - "block.mineralogy.basalt_smooth_brick": "Brique polie au basalte", - "block.mineralogy.basalt_smooth_brick_stairs": "Escaliers en brique polis au basalte", - "block.mineralogy.basalt_smooth_brick_slab": "Dalle de brique polie au basalte", + "block.mineralogy.basalt_stairs": "Escalier en Basalte", + "block.mineralogy.basalt_slab": "Dalle en Basalte", + "block.mineralogy.basalt_brick": "Briques en Basalte", + "block.mineralogy.basalt_brick_stairs": "Escalier en briques de Basalte", + "block.mineralogy.basalt_brick_slab": "Dalle en briques de Basalte", + "block.mineralogy.basalt_smooth": "Bloc poli en Basalte", + "block.mineralogy.basalt_smooth_stairs": "Escalier poli en Basalte", + "block.mineralogy.basalt_smooth_slab": "Dalle polie en Basalte", + "block.mineralogy.basalt_smooth_brick": "Briques polies en Basalte", + "block.mineralogy.basalt_smooth_brick_stairs": "Escalier en briques polies de Basalte", + "block.mineralogy.basalt_smooth_brick_slab": "Dalle en briques polies de Basalte", "block.mineralogy.diorite": "Diorite", - "block.mineralogy.diorite_stairs": "Escaliers Diorite", - "block.mineralogy.diorite_slab": "Dalle de Diorite", - "block.mineralogy.diorite_brick": "Brique Diorite", - "block.mineralogy.diorite_brick_stairs": "Escaliers en brique Diorite", - "block.mineralogy.diorite_brick_slab": "Dalle de brique Diorite", - "block.mineralogy.diorite_smooth": "Diorite polie", - "block.mineralogy.diorite_smooth_stairs": "Escaliers polis au Diorite", - "block.mineralogy.diorite_smooth_slab": "Dalle polie Diorite", - "block.mineralogy.diorite_smooth_brick": "Brique polie Diorite", - "block.mineralogy.diorite_smooth_brick_stairs": "Escaliers en briques polies Diorite", - "block.mineralogy.diorite_smooth_brick_slab": "Dalle de brique polie Diorite", - "block.mineralogy.granite": "Granit", - "block.mineralogy.granite_stairs": "Escaliers en granit", - "block.mineralogy.granite_slab": "Dalle de granit", - "block.mineralogy.granite_brick": "Brique de granit", - "block.mineralogy.granite_brick_stairs": "Escaliers en brique de granit", - "block.mineralogy.granite_brick_slab": "Dalle de brique de granit", - "block.mineralogy.granite_smooth": "Granit poli", - "block.mineralogy.granite_smooth_stairs": "Escaliers polis de granit", - "block.mineralogy.granite_smooth_slab": "Dalle polie de granit", - "block.mineralogy.granite_smooth_brick": "Brique polie de granit", - "block.mineralogy.granite_smooth_brick_stairs": "Escaliers en brique polis de granit", - "block.mineralogy.granite_smooth_brick_slab": "Dalle de brique polie de granit", + "block.mineralogy.diorite_stairs": "Escalier en Diorite", + "block.mineralogy.diorite_slab": "Dalle en Diorite", + "block.mineralogy.diorite_brick": "Briques en Diorite", + "block.mineralogy.diorite_brick_stairs": "Escalier en briques de Diorite", + "block.mineralogy.diorite_brick_slab": "Dalle en briques de Diorite", + "block.mineralogy.diorite_smooth": "Bloc poli en Diorite", + "block.mineralogy.diorite_smooth_stairs": "Escalier poli en Diorite", + "block.mineralogy.diorite_smooth_slab": "Dalle polie en Diorite", + "block.mineralogy.diorite_smooth_brick": "Briques polies en Diorite", + "block.mineralogy.diorite_smooth_brick_stairs": "Escalier en briques polies de Diorite", + "block.mineralogy.diorite_smooth_brick_slab": "Dalle en briques polies de Diorite", + "block.mineralogy.granite": "Granite", + "block.mineralogy.granite_stairs": "Escalier en Granite", + "block.mineralogy.granite_slab": "Dalle en Granite", + "block.mineralogy.granite_brick": "Briques en Granite", + "block.mineralogy.granite_brick_stairs": "Escalier en briques de Granite", + "block.mineralogy.granite_brick_slab": "Dalle en briques de Granite", + "block.mineralogy.granite_smooth": "Bloc poli en Granite", + "block.mineralogy.granite_smooth_stairs": "Escalier poli en Granite", + "block.mineralogy.granite_smooth_slab": "Dalle polie en Granite", + "block.mineralogy.granite_smooth_brick": "Briques polies en Granite", + "block.mineralogy.granite_smooth_brick_stairs": "Escalier en briques polies de Granite", + "block.mineralogy.granite_smooth_brick_slab": "Dalle en briques polies de Granite", "block.mineralogy.rhyolite": "Rhyolite", - "block.mineralogy.rhyolite_stairs": "Escaliers en rhyolite", - "block.mineralogy.rhyolite_slab": "Dalle de rhyolite", - "block.mineralogy.rhyolite_brick": "Brique de rhyolite", - "block.mineralogy.rhyolite_brick_stairs": "Escaliers en brique de rhyolite", - "block.mineralogy.rhyolite_brick_slab": "Dalle de brique de rhyolite", - "block.mineralogy.rhyolite_smooth": "Rhyolite polie", - "block.mineralogy.rhyolite_smooth_stairs": "Escaliers polis à la rhyolite", - "block.mineralogy.rhyolite_smooth_slab": "Dalle polie à la rhyolite", - "block.mineralogy.rhyolite_smooth_brick": "Brique polie de rhyolite", - "block.mineralogy.rhyolite_smooth_brick_stairs": "Escaliers en briques polies à la rhyolite", - "block.mineralogy.rhyolite_smooth_brick_slab": "Dalle de brique polie rhyolite", + "block.mineralogy.rhyolite_stairs": "Escalier en Rhyolite", + "block.mineralogy.rhyolite_slab": "Dalle en Rhyolite", + "block.mineralogy.rhyolite_brick": "Briques en Rhyolite", + "block.mineralogy.rhyolite_brick_stairs": "Escalier en briques de Rhyolite", + "block.mineralogy.rhyolite_brick_slab": "Dalle en briques de Rhyolite", + "block.mineralogy.rhyolite_smooth": "Bloc poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_stairs": "Escalier poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_slab": "Dalle polie en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick": "Briques polies en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Escalier en briques polies de Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_slab": "Dalle en briques polies de Rhyolite", "block.mineralogy.pegmatite": "Pegmatite", - "block.mineralogy.pegmatite_stairs": "Escaliers en Pegmatite", - "block.mineralogy.pegmatite_slab": "Dalle de Pegmatite", - "block.mineralogy.pegmatite_brick": "Brique de Pegmatite", - "block.mineralogy.pegmatite_brick_stairs": "Escaliers en brique de Pegmatite", - "block.mineralogy.pegmatite_brick_slab": "Dalle de brique de Pegmatite", - "block.mineralogy.pegmatite_smooth": "Pegmatite polie", - "block.mineralogy.pegmatite_smooth_stairs": "Escaliers polis à la Pegmatite", - "block.mineralogy.pegmatite_smooth_slab": "Dalle polie de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick": "Brique polie de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_stairs": "Escaliers en briques polies à la Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_slab": "Dalle de brique polie par Pegmatite", + "block.mineralogy.pegmatite_stairs": "Escalier en Pegmatite", + "block.mineralogy.pegmatite_slab": "Dalle en Pegmatite", + "block.mineralogy.pegmatite_brick": "Briques en Pegmatite", + "block.mineralogy.pegmatite_brick_stairs": "Escalier en briques de Pegmatite", + "block.mineralogy.pegmatite_brick_slab": "Dalle en briques de Pegmatite", + "block.mineralogy.pegmatite_smooth": "Bloc poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_stairs": "Escalier poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_slab": "Dalle polie en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick": "Briques polies en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Escalier en briques polies de Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_slab": "Dalle en briques polies de Pegmatite", "block.mineralogy.shale": "Schiste argileux", - "block.mineralogy.shale_stairs": "Escaliers de schiste", - "block.mineralogy.shale_slab": "Dalle de schiste", - "block.mineralogy.shale_brick": "Brique de schiste", - "block.mineralogy.shale_brick_stairs": "Escaliers de briques de schiste", - "block.mineralogy.shale_brick_slab": "Dalle de brique de schiste", - "block.mineralogy.shale_smooth": "Schiste poli", - "block.mineralogy.shale_smooth_stairs": "Escaliers polis au schiste", - "block.mineralogy.shale_smooth_slab": "Dalle polie au schiste", - "block.mineralogy.shale_smooth_brick": "Brique polie schiste", - "block.mineralogy.shale_smooth_brick_stairs": "Escaliers de brique polis au schiste", - "block.mineralogy.shale_smooth_brick_slab": "Dalle de brique polie au schiste", + "block.mineralogy.shale_stairs": "Escalier en Schiste argileux", + "block.mineralogy.shale_slab": "Dalle en Schiste argileux", + "block.mineralogy.shale_brick": "Briques en Schiste argileux", + "block.mineralogy.shale_brick_stairs": "Escalier en briques de Schiste argileux", + "block.mineralogy.shale_brick_slab": "Dalle en briques de Schiste argileux", + "block.mineralogy.shale_smooth": "Bloc poli en Schiste argileux", + "block.mineralogy.shale_smooth_stairs": "Escalier poli en Schiste argileux", + "block.mineralogy.shale_smooth_slab": "Dalle polie en Schiste argileux", + "block.mineralogy.shale_smooth_brick": "Briques polies en Schiste argileux", + "block.mineralogy.shale_smooth_brick_stairs": "Escalier en briques polies de Schiste argileux", + "block.mineralogy.shale_smooth_brick_slab": "Dalle en briques polies de Schiste argileux", "block.mineralogy.conglomerate": "Conglomérat", - "block.mineralogy.conglomerate_stairs": "Escaliers du Conglomérat", - "block.mineralogy.conglomerate_slab": "Dalle de conglomérat", - "block.mineralogy.conglomerate_brick": "Brique Conglomérat", - "block.mineralogy.conglomerate_brick_stairs": "Escaliers en brique de Conglomérat", - "block.mineralogy.conglomerate_brick_slab": "Dalle de brique de conglomérat", - "block.mineralogy.conglomerate_smooth": "Conglomérat poli", - "block.mineralogy.conglomerate_smooth_stairs": "Escaliers polis au conglomérat", - "block.mineralogy.conglomerate_smooth_slab": "Conglomerate dalle polie", - "block.mineralogy.conglomerate_smooth_brick": "Conglomerate brique polie", - "block.mineralogy.conglomerate_smooth_brick_stairs": "Conglomerate poli escalier en brique", - "block.mineralogy.conglomerate_smooth_brick_slab": "Plaque de brique polie Conglomerate", + "block.mineralogy.conglomerate_stairs": "Escalier en Conglomérat", + "block.mineralogy.conglomerate_slab": "Dalle en Conglomérat", + "block.mineralogy.conglomerate_brick": "Briques en Conglomérat", + "block.mineralogy.conglomerate_brick_stairs": "Escalier en briques de Conglomérat", + "block.mineralogy.conglomerate_brick_slab": "Dalle en briques de Conglomérat", + "block.mineralogy.conglomerate_smooth": "Bloc poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_stairs": "Escalier poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_slab": "Dalle polie en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick": "Briques polies en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Escalier en briques polies de Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_slab": "Dalle en briques polies de Conglomérat", "block.mineralogy.dolomite": "Dolomie", - "block.mineralogy.dolomite_stairs": "Escaliers en dolomite", - "block.mineralogy.dolomite_slab": "Dalle de dolomite", - "block.mineralogy.dolomite_brick": "Brique de dolomite", - "block.mineralogy.dolomite_brick_stairs": "Escaliers de brique en dolomite", - "block.mineralogy.dolomite_brick_slab": "Dalle de brique en dolomite", - "block.mineralogy.dolomite_smooth": "Dolomite polie", - "block.mineralogy.dolomite_smooth_stairs": "Escaliers polis en dolomite", - "block.mineralogy.dolomite_smooth_slab": "Dalle polie en dolomite", - "block.mineralogy.dolomite_smooth_brick": "Brique polie de Dolomite", - "block.mineralogy.dolomite_smooth_brick_stairs": "Escaliers en briques polies dolomitiques", - "block.mineralogy.dolomite_smooth_brick_slab": "Dalle de brique polie en dolomite", + "block.mineralogy.dolomite_stairs": "Escalier en Dolomie", + "block.mineralogy.dolomite_slab": "Dalle en Dolomie", + "block.mineralogy.dolomite_brick": "Briques en Dolomie", + "block.mineralogy.dolomite_brick_stairs": "Escalier en briques de Dolomie", + "block.mineralogy.dolomite_brick_slab": "Dalle en briques de Dolomie", + "block.mineralogy.dolomite_smooth": "Bloc poli en Dolomie", + "block.mineralogy.dolomite_smooth_stairs": "Escalier poli en Dolomie", + "block.mineralogy.dolomite_smooth_slab": "Dalle polie en Dolomie", + "block.mineralogy.dolomite_smooth_brick": "Briques polies en Dolomie", + "block.mineralogy.dolomite_smooth_brick_stairs": "Escalier en briques polies de Dolomie", + "block.mineralogy.dolomite_smooth_brick_slab": "Dalle en briques polies de Dolomie", "block.mineralogy.limestone": "Calcaire", - "block.mineralogy.limestone_stairs": "Escaliers en calcaire", - "block.mineralogy.limestone_slab": "Dalle de calcaire", - "block.mineralogy.limestone_brick": "Brique de calcaire", - "block.mineralogy.limestone_brick_stairs": "Escaliers en brique calcaire", - "block.mineralogy.limestone_brick_slab": "Dalle de brique en calcaire", - "block.mineralogy.limestone_smooth": "Calcaire poli", - "block.mineralogy.limestone_smooth_stairs": "Escaliers polis au calcaire", - "block.mineralogy.limestone_smooth_slab": "Dalle polie en calcaire", - "block.mineralogy.limestone_smooth_brick": "Brique polie au calcaire", - "block.mineralogy.limestone_smooth_brick_stairs": "Escaliers en briques polis à la chaux", - "block.mineralogy.limestone_smooth_brick_slab": "Dalle de brique polie au calcaire", + "block.mineralogy.limestone_stairs": "Escalier en Calcaire", + "block.mineralogy.limestone_slab": "Dalle en Calcaire", + "block.mineralogy.limestone_brick": "Briques en Calcaire", + "block.mineralogy.limestone_brick_stairs": "Escalier en briques de Calcaire", + "block.mineralogy.limestone_brick_slab": "Dalle en briques de Calcaire", + "block.mineralogy.limestone_smooth": "Bloc poli en Calcaire", + "block.mineralogy.limestone_smooth_stairs": "Escalier poli en Calcaire", + "block.mineralogy.limestone_smooth_slab": "Dalle polie en Calcaire", + "block.mineralogy.limestone_smooth_brick": "Briques polies en Calcaire", + "block.mineralogy.limestone_smooth_brick_stairs": "Escalier en briques polies de Calcaire", + "block.mineralogy.limestone_smooth_brick_slab": "Dalle en briques polies de Calcaire", "block.mineralogy.slate": "Ardoise", - "block.mineralogy.slate_stairs": "Escaliers en ardoise", - "block.mineralogy.slate_slab": "Dalle d'ardoise", - "block.mineralogy.slate_brick": "Brique d'ardoise", - "block.mineralogy.slate_brick_stairs": "Escaliers en briques d'ardoise", - "block.mineralogy.slate_brick_slab": "Dalle de briques d'ardoise", - "block.mineralogy.slate_smooth": "Ardoise polie", - "block.mineralogy.slate_smooth_stairs": "Escaliers polis en ardoise", - "block.mineralogy.slate_smooth_slab": "Dalle polie en ardoise", - "block.mineralogy.slate_smooth_brick": "Brique polie d'ardoise", - "block.mineralogy.slate_smooth_brick_stairs": "Escaliers en brique polie en ardoise", - "block.mineralogy.slate_smooth_brick_slab": "Dalle de brique polie ardoise", - "block.mineralogy.schist": "Schiste", - "block.mineralogy.schist_stairs": "Escaliers de schiste", - "block.mineralogy.schist_slab": "Dalle de schiste", - "block.mineralogy.schist_brick": "Brique de schiste", - "block.mineralogy.schist_brick_stairs": "Escaliers en brique de schiste", - "block.mineralogy.schist_brick_slab": "Dalle de brique de schiste", - "block.mineralogy.schist_smooth": "Schiste poli", - "block.mineralogy.schist_smooth_stairs": "Escaliers polis Schiste", - "block.mineralogy.schist_smooth_slab": "Dalle polie par schiste", - "block.mineralogy.schist_smooth_brick": "Brique polie par schiste", - "block.mineralogy.schist_smooth_brick_stairs": "Escaliers de brique polis par schiste", - "block.mineralogy.schist_smooth_brick_slab": "Dalle de brique polie par schiste", + "block.mineralogy.slate_stairs": "Escalier en Ardoise", + "block.mineralogy.slate_slab": "Dalle en Ardoise", + "block.mineralogy.slate_brick": "Briques en Ardoise", + "block.mineralogy.slate_brick_stairs": "Escalier en briques de Ardoise", + "block.mineralogy.slate_brick_slab": "Dalle en briques de Ardoise", + "block.mineralogy.slate_smooth": "Bloc poli en Ardoise", + "block.mineralogy.slate_smooth_stairs": "Escalier poli en Ardoise", + "block.mineralogy.slate_smooth_slab": "Dalle polie en Ardoise", + "block.mineralogy.slate_smooth_brick": "Briques polies en Ardoise", + "block.mineralogy.slate_smooth_brick_stairs": "Escalier en briques polies de Ardoise", + "block.mineralogy.slate_smooth_brick_slab": "Dalle en briques polies de Ardoise", + "block.mineralogy.schist": "Micaschiste", + "block.mineralogy.schist_stairs": "Escalier en Micaschiste", + "block.mineralogy.schist_slab": "Dalle en Micaschiste", + "block.mineralogy.schist_brick": "Briques en Micaschiste", + "block.mineralogy.schist_brick_stairs": "Escalier en briques de Micaschiste", + "block.mineralogy.schist_brick_slab": "Dalle en briques de Micaschiste", + "block.mineralogy.schist_smooth": "Bloc poli en Micaschiste", + "block.mineralogy.schist_smooth_stairs": "Escalier poli en Micaschiste", + "block.mineralogy.schist_smooth_slab": "Dalle polie en Micaschiste", + "block.mineralogy.schist_smooth_brick": "Briques polies en Micaschiste", + "block.mineralogy.schist_smooth_brick_stairs": "Escalier en briques polies de Micaschiste", + "block.mineralogy.schist_smooth_brick_slab": "Dalle en briques polies de Micaschiste", "block.mineralogy.gneiss": "Gneiss", - "block.mineralogy.gneiss_stairs": "Escaliers de gneiss", - "block.mineralogy.gneiss_slab": "Dalle de gneiss", - "block.mineralogy.gneiss_brick": "Brique de gneiss", - "block.mineralogy.gneiss_brick_stairs": "Escaliers en brique de gneiss", - "block.mineralogy.gneiss_brick_slab": "Dalle de brique de gneiss", - "block.mineralogy.gneiss_smooth": "Gneiss poli", - "block.mineralogy.gneiss_smooth_stairs": "Escaliers polis Gneiss", - "block.mineralogy.gneiss_smooth_slab": "Dalle polie au gneiss", - "block.mineralogy.gneiss_smooth_brick": "Brique polie gneiss", - "block.mineralogy.gneiss_smooth_brick_stairs": "Escaliers en brique polis gneiss", - "block.mineralogy.gneiss_smooth_brick_slab": "Dalle de brique polie par gneiss", + "block.mineralogy.gneiss_stairs": "Escalier en Gneiss", + "block.mineralogy.gneiss_slab": "Dalle en Gneiss", + "block.mineralogy.gneiss_brick": "Briques en Gneiss", + "block.mineralogy.gneiss_brick_stairs": "Escalier en briques de Gneiss", + "block.mineralogy.gneiss_brick_slab": "Dalle en briques de Gneiss", + "block.mineralogy.gneiss_smooth": "Bloc poli en Gneiss", + "block.mineralogy.gneiss_smooth_stairs": "Escalier poli en Gneiss", + "block.mineralogy.gneiss_smooth_slab": "Dalle polie en Gneiss", + "block.mineralogy.gneiss_smooth_brick": "Briques polies en Gneiss", + "block.mineralogy.gneiss_smooth_brick_stairs": "Escalier en briques polies de Gneiss", + "block.mineralogy.gneiss_smooth_brick_slab": "Dalle en briques polies de Gneiss", "block.mineralogy.marble": "Marbre", - "block.mineralogy.marble_stairs": "Escaliers en marbre", - "block.mineralogy.marble_slab": "Dalle de marbre", - "block.mineralogy.marble_brick": "Brique de marbre", - "block.mineralogy.marble_brick_stairs": "Escaliers en brique de marbre", - "block.mineralogy.marble_brick_slab": "Dalle de brique en marbre", - "block.mineralogy.marble_smooth": "Marbre poli", - "block.mineralogy.marble_smooth_stairs": "Escaliers polis en marbre", - "block.mineralogy.marble_smooth_slab": "Dalle polie en marbre", - "block.mineralogy.marble_smooth_brick": "Brique polie en marbre", - "block.mineralogy.marble_smooth_brick_stairs": "Escaliers en brique polis en marbre", - "block.mineralogy.marble_smooth_brick_slab": "Dalle de brique polie en marbre", - "block.mineralogy.phyllite": "Phyllite", - "block.mineralogy.phyllite_stairs": "Escaliers en phyllite", - "block.mineralogy.phyllite_slab": "Dalle de Phyllite", - "block.mineralogy.phyllite_brick": "Brique de phyllite", - "block.mineralogy.phyllite_brick_stairs": "Escaliers en brique de phyllite", - "block.mineralogy.phyllite_brick_slab": "Dalle de brique de phyllite", - "block.mineralogy.phyllite_smooth": "Phyllite polie", - "block.mineralogy.phyllite_smooth_stairs": "Escaliers polis en phyllite", - "block.mineralogy.phyllite_smooth_slab": "Dalle polie en phyllite", - "block.mineralogy.phyllite_smooth_brick": "Brique polie de phyllite", - "block.mineralogy.phyllite_smooth_brick_stairs": "Escaliers en briques polies en phyllite", - "block.mineralogy.phyllite_smooth_brick_slab": "Dalle de brique poli en phyllite", + "block.mineralogy.marble_stairs": "Escalier en Marbre", + "block.mineralogy.marble_slab": "Dalle en Marbre", + "block.mineralogy.marble_brick": "Briques en Marbre", + "block.mineralogy.marble_brick_stairs": "Escalier en briques de Marbre", + "block.mineralogy.marble_brick_slab": "Dalle en briques de Marbre", + "block.mineralogy.marble_smooth": "Bloc poli en Marbre", + "block.mineralogy.marble_smooth_stairs": "Escalier poli en Marbre", + "block.mineralogy.marble_smooth_slab": "Dalle polie en Marbre", + "block.mineralogy.marble_smooth_brick": "Briques polies en Marbre", + "block.mineralogy.marble_smooth_brick_stairs": "Escalier en briques polies de Marbre", + "block.mineralogy.marble_smooth_brick_slab": "Dalle en briques polies de Marbre", + "block.mineralogy.phyllite": "Phyllade", + "block.mineralogy.phyllite_stairs": "Escalier en Phyllade", + "block.mineralogy.phyllite_slab": "Dalle en Phyllade", + "block.mineralogy.phyllite_brick": "Briques en Phyllade", + "block.mineralogy.phyllite_brick_stairs": "Escalier en briques de Phyllade", + "block.mineralogy.phyllite_brick_slab": "Dalle en briques de Phyllade", + "block.mineralogy.phyllite_smooth": "Bloc poli en Phyllade", + "block.mineralogy.phyllite_smooth_stairs": "Escalier poli en Phyllade", + "block.mineralogy.phyllite_smooth_slab": "Dalle polie en Phyllade", + "block.mineralogy.phyllite_smooth_brick": "Briques polies en Phyllade", + "block.mineralogy.phyllite_smooth_brick_stairs": "Escalier en briques polies de Phyllade", + "block.mineralogy.phyllite_smooth_brick_slab": "Dalle en briques polies de Phyllade", "block.mineralogy.amphibolite": "Amphibolite", - "block.mineralogy.amphibolite_stairs": "Escaliers amphibolites", - "block.mineralogy.amphibolite_slab": "Plaque d'amphibolite", - "block.mineralogy.amphibolite_brick": "Brique d'amphibolite", - "block.mineralogy.amphibolite_brick_stairs": "Escaliers en brique amphibolite", - "block.mineralogy.amphibolite_brick_slab": "Plaque de brique d'amphibolite", - "block.mineralogy.amphibolite_smooth": "Amphibolite polie", - "block.mineralogy.amphibolite_smooth_stairs": "Escaliers polis à l'amphibolite", - "block.mineralogy.amphibolite_smooth_slab": "Dalle polie d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick": "Brique polie d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_stairs": "Escaliers en brique polis à l'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_slab": "Plaque de brique polie à l'amphibolite", + "block.mineralogy.amphibolite_stairs": "Escalier en Amphibolite", + "block.mineralogy.amphibolite_slab": "Dalle en Amphibolite", + "block.mineralogy.amphibolite_brick": "Briques en Amphibolite", + "block.mineralogy.amphibolite_brick_stairs": "Escalier en briques de Amphibolite", + "block.mineralogy.amphibolite_brick_slab": "Dalle en briques de Amphibolite", + "block.mineralogy.amphibolite_smooth": "Bloc poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_stairs": "Escalier poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_slab": "Dalle polie en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick": "Briques polies en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Escalier en briques polies de Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_slab": "Dalle en briques polies de Amphibolite", "item.mineralogy.gypsum_dust": "Poudre de gypse", "item.mineralogy.sulfur_dust": "Poudre de soufre", "item.mineralogy.phosphorous_dust": "Poudre de phosphore", @@ -201,722 +201,740 @@ "block.mineralogy.pumice": "Pierre ponce", "block.mineralogy.sulfur_block": "Soufre", "block.mineralogy.sulfur_ore": "Minerai de soufre", - "block.mineralogy.phosphorous_block": "Phosphoreux", + "block.mineralogy.phosphorous_block": "Phosphore", "block.mineralogy.phosphorous_ore": "Minerai de phosphore", "block.mineralogy.nitrate_block": "Nitrate", "block.mineralogy.nitrate_ore": "Minerai de nitrate", - "block.mineralogy.drywall_black": "Cloison sèche noire", - "block.mineralogy.drywall_red": "Cloison sèche rouge", - "block.mineralogy.drywall_green": "Cloison sèche verte", - "block.mineralogy.drywall_brown": "Cloison sèche brune", - "block.mineralogy.drywall_blue": "Cloison sèche bleue", - "block.mineralogy.drywall_purple": "Cloison sèche pourpre", - "block.mineralogy.drywall_cyan": "Cloison sèche cyan", - "block.mineralogy.drywall_silver": "Cloison sèche plafond gris", - "block.mineralogy.drywall_gray": "Cloison sèche grise", - "block.mineralogy.drywall_pink": "Cloison sèche rose", - "block.mineralogy.drywall_lime": "Cloison sèche vert-lime", - "block.mineralogy.drywall_yellow": "Cloison sèche jaune", - "block.mineralogy.drywall_light_blue": "Cloison sèche bleu clair", - "block.mineralogy.drywall_magenta": "Cloison sèche magenta", - "block.mineralogy.drywall_orange": "Cloison sèche orange", - "block.mineralogy.drywall_white": "Cloison sèche blanche", - "block.mineralogy.andesite_wall": "Mur d'Andésite", - "block.mineralogy.andesite_brick_wall": "Mur de briques d'Andésite", - "block.mineralogy.andesite_smooth_wall": "Mur poli d'Andésite", - "block.mineralogy.andesite_smooth_brick_wall": "Mur de briques polies par Andesite", - "block.mineralogy.basalt_wall": "Mur de basalte", - "block.mineralogy.basalt_brick_wall": "Mur de brique de basalte", - "block.mineralogy.basalt_smooth_wall": "Mur poli au basalte", - "block.mineralogy.basalt_smooth_brick_wall": "Mur de briques polies au basalte", - "block.mineralogy.diorite_wall": "Mur de Diorite", - "block.mineralogy.diorite_brick_wall": "Mur de briques Diorite", - "block.mineralogy.diorite_smooth_wall": "Mur Poli Diorite", - "block.mineralogy.diorite_smooth_brick_wall": "Mur de briques poli Diorite", - "block.mineralogy.granite_wall": "Mur de granit", - "block.mineralogy.granite_brick_wall": "Mur de briques de granit", - "block.mineralogy.granite_smooth_wall": "Mur poli de granit", - "block.mineralogy.granite_smooth_brick_wall": "Mur de briques poli de granit", - "block.mineralogy.rhyolite_wall": "Mur de rhyolite", - "block.mineralogy.rhyolite_brick_wall": "Mur de brique de rhyolite", - "block.mineralogy.rhyolite_smooth_wall": "Mur poli de rhyolite", - "block.mineralogy.rhyolite_smooth_brick_wall": "Mur de briques polies à la rhyolite", - "block.mineralogy.pegmatite_wall": "Mur de Pegmatite", - "block.mineralogy.pegmatite_brick_wall": "Mur de briques de Pegmatite", - "block.mineralogy.pegmatite_smooth_wall": "Mur poli de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_wall": "Mur de briques poli à la Pegmatite", - "block.mineralogy.shale_wall": "Mur de schiste", - "block.mineralogy.shale_brick_wall": "Mur de briques de schiste", - "block.mineralogy.shale_smooth_wall": "Mur poli de schiste", - "block.mineralogy.shale_smooth_brick_wall": "Mur de briques polies au schiste", - "block.mineralogy.conglomerate_wall": "Conglomérat mur", - "block.mineralogy.conglomerate_brick_wall": "Mur de briques Conglomérat", - "block.mineralogy.conglomerate_smooth_wall": "Conglomerate mur poli", - "block.mineralogy.conglomerate_smooth_brick_wall": "Conglomerate mur de briques polies", - "block.mineralogy.dolomite_wall": "Mur de dolomite", - "block.mineralogy.dolomite_brick_wall": "Mur de briques de dolomite", - "block.mineralogy.dolomite_smooth_wall": "Mur poli de Dolomite", - "block.mineralogy.dolomite_smooth_brick_wall": "Mur de briques poli à la dolomite", - "block.mineralogy.limestone_wall": "Mur de calcaire", - "block.mineralogy.limestone_brick_wall": "Mur de briques en calcaire", - "block.mineralogy.limestone_smooth_wall": "Mur poli au calcaire", - "block.mineralogy.limestone_smooth_brick_wall": "Mur de briques poli au calcaire", - "block.mineralogy.marble_wall": "Mur de marbre", - "block.mineralogy.marble_brick_wall": "Mur de briques en marbre", - "block.mineralogy.marble_smooth_wall": "Mur poli en marbre", - "block.mineralogy.marble_smooth_brick_wall": "Mur de briques polies en marbre", - "block.mineralogy.slate_wall": "Mur d'ardoise", - "block.mineralogy.slate_brick_wall": "Mur de briques d'ardoise", - "block.mineralogy.slate_smooth_wall": "Mur d'ardoise poli", - "block.mineralogy.slate_smooth_brick_wall": "Ardoise polie mur de briques", - "block.mineralogy.schist_wall": "Mur de schiste", - "block.mineralogy.schist_brick_wall": "Mur de briques de schiste", - "block.mineralogy.schist_smooth_wall": "Schiste poli mur", - "block.mineralogy.schist_smooth_brick_wall": "Mur de briques schist poli", - "block.mineralogy.gneiss_wall": "Mur de gneiss", - "block.mineralogy.gneiss_brick_wall": "Mur de briques en gneiss", - "block.mineralogy.gneiss_smooth_wall": "Gneiss poli mur", - "block.mineralogy.gneiss_smooth_brick_wall": "Gneiss poli mur de briques", - "block.mineralogy.phyllite_wall": "Mur de phyllite", - "block.mineralogy.phyllite_brick_wall": "Mur de briques de phyllite", - "block.mineralogy.phyllite_smooth_wall": "Mur poli de phyllite", - "block.mineralogy.phyllite_smooth_brick_wall": "Mur de briques poli en phyllite", - "block.mineralogy.amphibolite_wall": "Mur d'amphibolite", - "block.mineralogy.amphibolite_brick_wall": "Mur de briques d'amphibolite", - "block.mineralogy.amphibolite_smooth_wall": "Mur poli d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_wall": "Mur de briques poli à l'amphibolite", - "block.mineralogy.diorite_furnace": "Fourneau de Diorite", - "block.mineralogy.diorite_brick_furnace": "Fourneau de briques Diorite", - "block.mineralogy.diorite_smooth_furnace": "Fourneau Poli Diorite", - "block.mineralogy.diorite_smooth_brick_furnace": "Fourneau de briques poli Diorite", - "block.mineralogy.granite_furnace": "Fourneau de granit", - "block.mineralogy.granite_brick_furnace": "Fourneau de briques de granit", - "block.mineralogy.granite_smooth_furnace": "Fourneau poli de granit", - "block.mineralogy.granite_smooth_brick_furnace": "Fourneau de briques poli de granit", - "block.mineralogy.rhyolite_furnace": "Fourneau de rhyolite", - "block.mineralogy.rhyolite_brick_furnace": "Fourneau de brique de rhyolite", - "block.mineralogy.rhyolite_smooth_furnace": "Fourneau poli de rhyolite", - "block.mineralogy.rhyolite_smooth_brick_furnace": "Fourneau de briques polies à la rhyolite", - "block.mineralogy.pegmatite_furnace": "Fourneau de Pegmatite", - "block.mineralogy.pegmatite_brick_furnace": "Fourneau de briques de Pegmatite", - "block.mineralogy.pegmatite_smooth_furnace": "Fourneau poli de Pegmatite", - "block.mineralogy.pegmatite_smooth_brick_furnace": "Fourneau de briques poli à la Pegmatite", - "block.mineralogy.shale_furnace": "Fourneau de schiste", - "block.mineralogy.shale_brick_furnace": "Fourneau de briques de schiste", - "block.mineralogy.shale_smooth_furnace": "Fourneau poli de schiste", - "block.mineralogy.shale_smooth_brick_furnace": "Fourneau de briques polies au schiste", - "block.mineralogy.conglomerate_furnace": "Conglomérat mur", - "block.mineralogy.conglomerate_brick_furnace": "Fourneau de briques Conglomérat", - "block.mineralogy.conglomerate_smooth_furnace": "Conglomerate mur poli", - "block.mineralogy.conglomerate_smooth_brick_furnace": "Conglomerate mur de briques polies", - "block.mineralogy.dolomite_furnace": "Fourneau de dolomite", - "block.mineralogy.dolomite_brick_furnace": "Fourneau de briques de dolomite", - "block.mineralogy.dolomite_smooth_furnace": "Fourneau poli de Dolomite", - "block.mineralogy.dolomite_smooth_brick_furnace": "Fourneau de briques poli à la dolomite", - "block.mineralogy.limestone_furnace": "Fourneau de calcaire", - "block.mineralogy.limestone_brick_furnace": "Fourneau de briques en calcaire", - "block.mineralogy.limestone_smooth_furnace": "Fourneau poli au calcaire", - "block.mineralogy.limestone_smooth_brick_furnace": "Fourneau de briques poli au calcaire", - "block.mineralogy.marble_furnace": "Fourneau de marbre", - "block.mineralogy.marble_brick_furnace": "Fourneau de briques en marbre", - "block.mineralogy.marble_smooth_furnace": "Fourneau poli en marbre", - "block.mineralogy.marble_smooth_brick_furnace": "Fourneau de briques polies en marbre", - "block.mineralogy.slate_furnace": "Fourneau d'ardoise", - "block.mineralogy.slate_brick_furnace": "Fourneau de briques d'ardoise", - "block.mineralogy.slate_smooth_furnace": "Fourneau d'ardoise poli", - "block.mineralogy.slate_smooth_brick_furnace": "Ardoise polie mur de briques", - "block.mineralogy.schist_furnace": "Fourneau de schiste", - "block.mineralogy.schist_brick_furnace": "Fourneau de briques de schiste", - "block.mineralogy.schist_smooth_furnace": "Schiste poli mur", - "block.mineralogy.schist_smooth_brick_furnace": "Fourneau de briques schist poli", - "block.mineralogy.gneiss_furnace": "Fourneau de gneiss", - "block.mineralogy.gneiss_brick_furnace": "Fourneau de briques en gneiss", - "block.mineralogy.gneiss_smooth_furnace": "Gneiss poli mur", - "block.mineralogy.gneiss_smooth_brick_furnace": "Gneiss poli mur de briques", - "block.mineralogy.phyllite_furnace": "Fourneau de phyllite", - "block.mineralogy.phyllite_brick_furnace": "Fourneau de briques de phyllite", - "block.mineralogy.phyllite_smooth_furnace": "Fourneau poli de phyllite", - "block.mineralogy.phyllite_smooth_brick_furnace": "Fourneau de briques poli en phyllite", - "block.mineralogy.amphibolite_furnace": "Fourneau d'amphibolite", - "block.mineralogy.amphibolite_brick_furnace": "Fourneau de briques d'amphibolite", - "block.mineralogy.amphibolite_smooth_furnace": "Fourneau poli d'amphibolite", - "block.mineralogy.amphibolite_smooth_brick_furnace": "Fourneau de briques poli à l'amphibolite", + "block.mineralogy.drywall_black": "Plaque de plâtre noire", + "block.mineralogy.drywall_red": "Plaque de plâtre rouge", + "block.mineralogy.drywall_green": "Plaque de plâtre verte", + "block.mineralogy.drywall_brown": "Plaque de plâtre marron", + "block.mineralogy.drywall_blue": "Plaque de plâtre bleue", + "block.mineralogy.drywall_purple": "Plaque de plâtre violette", + "block.mineralogy.drywall_cyan": "Plaque de plâtre cyan", + "block.mineralogy.drywall_silver": "Plaque de plâtre gris clair", + "block.mineralogy.drywall_gray": "Plaque de plâtre grise", + "block.mineralogy.drywall_pink": "Plaque de plâtre rose", + "block.mineralogy.drywall_lime": "Plaque de plâtre vert citron", + "block.mineralogy.drywall_yellow": "Plaque de plâtre jaune", + "block.mineralogy.drywall_light_blue": "Plaque de plâtre bleu clair", + "block.mineralogy.drywall_magenta": "Plaque de plâtre magenta", + "block.mineralogy.drywall_orange": "Plaque de plâtre orange", + "block.mineralogy.drywall_white": "Plaque de plâtre blanche", + "block.mineralogy.andesite_wall": "Muret en Andésite", + "block.mineralogy.andesite_brick_wall": "Muret en briques de Andésite", + "block.mineralogy.andesite_smooth_wall": "Muret poli en Andésite", + "block.mineralogy.andesite_smooth_brick_wall": "Muret en briques polies de Andésite", + "block.mineralogy.basalt_wall": "Muret en Basalte", + "block.mineralogy.basalt_brick_wall": "Muret en briques de Basalte", + "block.mineralogy.basalt_smooth_wall": "Muret poli en Basalte", + "block.mineralogy.basalt_smooth_brick_wall": "Muret en briques polies de Basalte", + "block.mineralogy.diorite_wall": "Muret en Diorite", + "block.mineralogy.diorite_brick_wall": "Muret en briques de Diorite", + "block.mineralogy.diorite_smooth_wall": "Muret poli en Diorite", + "block.mineralogy.diorite_smooth_brick_wall": "Muret en briques polies de Diorite", + "block.mineralogy.granite_wall": "Muret en Granite", + "block.mineralogy.granite_brick_wall": "Muret en briques de Granite", + "block.mineralogy.granite_smooth_wall": "Muret poli en Granite", + "block.mineralogy.granite_smooth_brick_wall": "Muret en briques polies de Granite", + "block.mineralogy.rhyolite_wall": "Muret en Rhyolite", + "block.mineralogy.rhyolite_brick_wall": "Muret en briques de Rhyolite", + "block.mineralogy.rhyolite_smooth_wall": "Muret poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_wall": "Muret en briques polies de Rhyolite", + "block.mineralogy.pegmatite_wall": "Muret en Pegmatite", + "block.mineralogy.pegmatite_brick_wall": "Muret en briques de Pegmatite", + "block.mineralogy.pegmatite_smooth_wall": "Muret poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_wall": "Muret en briques polies de Pegmatite", + "block.mineralogy.shale_wall": "Muret en Schiste argileux", + "block.mineralogy.shale_brick_wall": "Muret en briques de Schiste argileux", + "block.mineralogy.shale_smooth_wall": "Muret poli en Schiste argileux", + "block.mineralogy.shale_smooth_brick_wall": "Muret en briques polies de Schiste argileux", + "block.mineralogy.conglomerate_wall": "Muret en Conglomérat", + "block.mineralogy.conglomerate_brick_wall": "Muret en briques de Conglomérat", + "block.mineralogy.conglomerate_smooth_wall": "Muret poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_wall": "Muret en briques polies de Conglomérat", + "block.mineralogy.dolomite_wall": "Muret en Dolomie", + "block.mineralogy.dolomite_brick_wall": "Muret en briques de Dolomie", + "block.mineralogy.dolomite_smooth_wall": "Muret poli en Dolomie", + "block.mineralogy.dolomite_smooth_brick_wall": "Muret en briques polies de Dolomie", + "block.mineralogy.limestone_wall": "Muret en Calcaire", + "block.mineralogy.limestone_brick_wall": "Muret en briques de Calcaire", + "block.mineralogy.limestone_smooth_wall": "Muret poli en Calcaire", + "block.mineralogy.limestone_smooth_brick_wall": "Muret en briques polies de Calcaire", + "block.mineralogy.marble_wall": "Muret en Marbre", + "block.mineralogy.marble_brick_wall": "Muret en briques de Marbre", + "block.mineralogy.marble_smooth_wall": "Muret poli en Marbre", + "block.mineralogy.marble_smooth_brick_wall": "Muret en briques polies de Marbre", + "block.mineralogy.slate_wall": "Muret en Ardoise", + "block.mineralogy.slate_brick_wall": "Muret en briques de Ardoise", + "block.mineralogy.slate_smooth_wall": "Muret poli en Ardoise", + "block.mineralogy.slate_smooth_brick_wall": "Muret en briques polies de Ardoise", + "block.mineralogy.schist_wall": "Muret en Micaschiste", + "block.mineralogy.schist_brick_wall": "Muret en briques de Micaschiste", + "block.mineralogy.schist_smooth_wall": "Muret poli en Micaschiste", + "block.mineralogy.schist_smooth_brick_wall": "Muret en briques polies de Micaschiste", + "block.mineralogy.gneiss_wall": "Muret en Gneiss", + "block.mineralogy.gneiss_brick_wall": "Muret en briques de Gneiss", + "block.mineralogy.gneiss_smooth_wall": "Muret poli en Gneiss", + "block.mineralogy.gneiss_smooth_brick_wall": "Muret en briques polies de Gneiss", + "block.mineralogy.phyllite_wall": "Muret en Phyllade", + "block.mineralogy.phyllite_brick_wall": "Muret en briques de Phyllade", + "block.mineralogy.phyllite_smooth_wall": "Muret poli en Phyllade", + "block.mineralogy.phyllite_smooth_brick_wall": "Muret en briques polies de Phyllade", + "block.mineralogy.amphibolite_wall": "Muret en Amphibolite", + "block.mineralogy.amphibolite_brick_wall": "Muret en briques de Amphibolite", + "block.mineralogy.amphibolite_smooth_wall": "Muret poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_wall": "Muret en briques polies de Amphibolite", + "block.mineralogy.andesite_furnace": "Fourneau en Andésite", + "block.mineralogy.andesite_brick_furnace": "Fourneau en briques de Andésite", + "block.mineralogy.andesite_smooth_furnace": "Fourneau poli en Andésite", + "block.mineralogy.andesite_smooth_brick_furnace": "Fourneau en briques polies de Andésite", + "block.mineralogy.basalt_furnace": "Fourneau en Basalte", + "block.mineralogy.basalt_brick_furnace": "Fourneau en briques de Basalte", + "block.mineralogy.basalt_smooth_furnace": "Fourneau poli en Basalte", + "block.mineralogy.basalt_smooth_brick_furnace": "Fourneau en briques polies de Basalte", + "block.mineralogy.diorite_furnace": "Fourneau en Diorite", + "block.mineralogy.diorite_brick_furnace": "Fourneau en briques de Diorite", + "block.mineralogy.diorite_smooth_furnace": "Fourneau poli en Diorite", + "block.mineralogy.diorite_smooth_brick_furnace": "Fourneau en briques polies de Diorite", + "block.mineralogy.granite_furnace": "Fourneau en Granite", + "block.mineralogy.granite_brick_furnace": "Fourneau en briques de Granite", + "block.mineralogy.granite_smooth_furnace": "Fourneau poli en Granite", + "block.mineralogy.granite_smooth_brick_furnace": "Fourneau en briques polies de Granite", + "block.mineralogy.rhyolite_furnace": "Fourneau en Rhyolite", + "block.mineralogy.rhyolite_brick_furnace": "Fourneau en briques de Rhyolite", + "block.mineralogy.rhyolite_smooth_furnace": "Fourneau poli en Rhyolite", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Fourneau en briques polies de Rhyolite", + "block.mineralogy.pegmatite_furnace": "Fourneau en Pegmatite", + "block.mineralogy.pegmatite_brick_furnace": "Fourneau en briques de Pegmatite", + "block.mineralogy.pegmatite_smooth_furnace": "Fourneau poli en Pegmatite", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Fourneau en briques polies de Pegmatite", + "block.mineralogy.shale_furnace": "Fourneau en Schiste argileux", + "block.mineralogy.shale_brick_furnace": "Fourneau en briques de Schiste argileux", + "block.mineralogy.shale_smooth_furnace": "Fourneau poli en Schiste argileux", + "block.mineralogy.shale_smooth_brick_furnace": "Fourneau en briques polies de Schiste argileux", + "block.mineralogy.conglomerate_furnace": "Fourneau en Conglomérat", + "block.mineralogy.conglomerate_brick_furnace": "Fourneau en briques de Conglomérat", + "block.mineralogy.conglomerate_smooth_furnace": "Fourneau poli en Conglomérat", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Fourneau en briques polies de Conglomérat", + "block.mineralogy.dolomite_furnace": "Fourneau en Dolomie", + "block.mineralogy.dolomite_brick_furnace": "Fourneau en briques de Dolomie", + "block.mineralogy.dolomite_smooth_furnace": "Fourneau poli en Dolomie", + "block.mineralogy.dolomite_smooth_brick_furnace": "Fourneau en briques polies de Dolomie", + "block.mineralogy.limestone_furnace": "Fourneau en Calcaire", + "block.mineralogy.limestone_brick_furnace": "Fourneau en briques de Calcaire", + "block.mineralogy.limestone_smooth_furnace": "Fourneau poli en Calcaire", + "block.mineralogy.limestone_smooth_brick_furnace": "Fourneau en briques polies de Calcaire", + "block.mineralogy.marble_furnace": "Fourneau en Marbre", + "block.mineralogy.marble_brick_furnace": "Fourneau en briques de Marbre", + "block.mineralogy.marble_smooth_furnace": "Fourneau poli en Marbre", + "block.mineralogy.marble_smooth_brick_furnace": "Fourneau en briques polies de Marbre", + "block.mineralogy.slate_furnace": "Fourneau en Ardoise", + "block.mineralogy.slate_brick_furnace": "Fourneau en briques de Ardoise", + "block.mineralogy.slate_smooth_furnace": "Fourneau poli en Ardoise", + "block.mineralogy.slate_smooth_brick_furnace": "Fourneau en briques polies de Ardoise", + "block.mineralogy.schist_furnace": "Fourneau en Micaschiste", + "block.mineralogy.schist_brick_furnace": "Fourneau en briques de Micaschiste", + "block.mineralogy.schist_smooth_furnace": "Fourneau poli en Micaschiste", + "block.mineralogy.schist_smooth_brick_furnace": "Fourneau en briques polies de Micaschiste", + "block.mineralogy.gneiss_furnace": "Fourneau en Gneiss", + "block.mineralogy.gneiss_brick_furnace": "Fourneau en briques de Gneiss", + "block.mineralogy.gneiss_smooth_furnace": "Fourneau poli en Gneiss", + "block.mineralogy.gneiss_smooth_brick_furnace": "Fourneau en briques polies de Gneiss", + "block.mineralogy.phyllite_furnace": "Fourneau en Phyllade", + "block.mineralogy.phyllite_brick_furnace": "Fourneau en briques de Phyllade", + "block.mineralogy.phyllite_smooth_furnace": "Fourneau poli en Phyllade", + "block.mineralogy.phyllite_smooth_brick_furnace": "Fourneau en briques polies de Phyllade", + "block.mineralogy.amphibolite_furnace": "Fourneau en Amphibolite", + "block.mineralogy.amphibolite_brick_furnace": "Fourneau en briques de Amphibolite", + "block.mineralogy.amphibolite_smooth_furnace": "Fourneau poli en Amphibolite", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Fourneau en briques polies de Amphibolite", "block.mineralogy.diabase": "Diabase", - "block.mineralogy.diabase_stairs": "Diabase Escaliers", - "block.mineralogy.diabase_slab": "Diabase Dalle", - "block.mineralogy.diabase_brick": "Diabase Brique", - "block.mineralogy.diabase_brick_stairs": "Diabase Escalier De Brique", - "block.mineralogy.diabase_brick_slab": "Diabase Dalle de brique", - "block.mineralogy.diabase_smooth": "Polished Diabase", - "block.mineralogy.diabase_smooth_stairs": "Diabase Escalier Poli", - "block.mineralogy.diabase_smooth_slab": "Diabase Dalle polie", - "block.mineralogy.diabase_smooth_brick": "Diabase Brique polie", - "block.mineralogy.diabase_smooth_brick_stairs": "Diabase Escalier en brique polie", - "block.mineralogy.diabase_smooth_brick_slab": "Diabase Dalle de brique polie", - "block.mineralogy.diabase_wall": "Diabase Wall", - "block.mineralogy.diabase_brick_wall": "Diabase Mur de briques", - "block.mineralogy.diabase_smooth_wall": "Diabase Mur poli", - "block.mineralogy.diabase_smooth_brick_wall": "Diabase Mur de brique poli", - "block.mineralogy.diabase_furnace": "Diabase Furnace", - "block.mineralogy.diabase_brick_furnace": "Diabase Four à briques", - "block.mineralogy.diabase_smooth_furnace": "Diabase Four poli", - "block.mineralogy.diabase_smooth_brick_furnace": "Diabase Four à brique polie", + "block.mineralogy.diabase_stairs": "Escalier en Diabase", + "block.mineralogy.diabase_slab": "Dalle en Diabase", + "block.mineralogy.diabase_brick": "Briques en Diabase", + "block.mineralogy.diabase_brick_stairs": "Escalier en briques de Diabase", + "block.mineralogy.diabase_brick_slab": "Dalle en briques de Diabase", + "block.mineralogy.diabase_smooth": "Bloc poli en Diabase", + "block.mineralogy.diabase_smooth_stairs": "Escalier poli en Diabase", + "block.mineralogy.diabase_smooth_slab": "Dalle polie en Diabase", + "block.mineralogy.diabase_smooth_brick": "Briques polies en Diabase", + "block.mineralogy.diabase_smooth_brick_stairs": "Escalier en briques polies de Diabase", + "block.mineralogy.diabase_smooth_brick_slab": "Dalle en briques polies de Diabase", + "block.mineralogy.diabase_wall": "Muret en Diabase", + "block.mineralogy.diabase_brick_wall": "Muret en briques de Diabase", + "block.mineralogy.diabase_smooth_wall": "Muret poli en Diabase", + "block.mineralogy.diabase_smooth_brick_wall": "Muret en briques polies de Diabase", + "block.mineralogy.diabase_furnace": "Fourneau en Diabase", + "block.mineralogy.diabase_brick_furnace": "Fourneau en briques de Diabase", + "block.mineralogy.diabase_smooth_furnace": "Fourneau poli en Diabase", + "block.mineralogy.diabase_smooth_brick_furnace": "Fourneau en briques polies de Diabase", "block.mineralogy.gabbro": "Gabbro", - "block.mineralogy.gabbro_stairs": "Gabbro Escaliers", - "block.mineralogy.gabbro_slab": "Gabbro Dalle", - "block.mineralogy.gabbro_brick": "Gabbro Brique", - "block.mineralogy.gabbro_brick_stairs": "Gabbro Escalier De Brique", - "block.mineralogy.gabbro_brick_slab": "Gabbro Dalle de brique", - "block.mineralogy.gabbro_smooth": "Polished Gabbro", - "block.mineralogy.gabbro_smooth_stairs": "Gabbro Escalier Poli", - "block.mineralogy.gabbro_smooth_slab": "Gabbro Dalle polie", - "block.mineralogy.gabbro_smooth_brick": "Gabbro Brique polie", - "block.mineralogy.gabbro_smooth_brick_stairs": "Gabbro Escalier en brique polie", - "block.mineralogy.gabbro_smooth_brick_slab": "Gabbro Dalle de brique polie", - "block.mineralogy.gabbro_wall": "Gabbro Wall", - "block.mineralogy.gabbro_brick_wall": "Gabbro Mur de briques", - "block.mineralogy.gabbro_smooth_wall": "Gabbro Mur poli", - "block.mineralogy.gabbro_smooth_brick_wall": "Gabbro Mur de brique poli", - "block.mineralogy.gabbro_furnace": "Gabbro Furnace", - "block.mineralogy.gabbro_brick_furnace": "Gabbro Four à briques", - "block.mineralogy.gabbro_smooth_furnace": "Gabbro Four poli", - "block.mineralogy.gabbro_smooth_brick_furnace": "Gabbro Four à brique polie", + "block.mineralogy.gabbro_stairs": "Escalier en Gabbro", + "block.mineralogy.gabbro_slab": "Dalle en Gabbro", + "block.mineralogy.gabbro_brick": "Briques en Gabbro", + "block.mineralogy.gabbro_brick_stairs": "Escalier en briques de Gabbro", + "block.mineralogy.gabbro_brick_slab": "Dalle en briques de Gabbro", + "block.mineralogy.gabbro_smooth": "Bloc poli en Gabbro", + "block.mineralogy.gabbro_smooth_stairs": "Escalier poli en Gabbro", + "block.mineralogy.gabbro_smooth_slab": "Dalle polie en Gabbro", + "block.mineralogy.gabbro_smooth_brick": "Briques polies en Gabbro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Escalier en briques polies de Gabbro", + "block.mineralogy.gabbro_smooth_brick_slab": "Dalle en briques polies de Gabbro", + "block.mineralogy.gabbro_wall": "Muret en Gabbro", + "block.mineralogy.gabbro_brick_wall": "Muret en briques de Gabbro", + "block.mineralogy.gabbro_smooth_wall": "Muret poli en Gabbro", + "block.mineralogy.gabbro_smooth_brick_wall": "Muret en briques polies de Gabbro", + "block.mineralogy.gabbro_furnace": "Fourneau en Gabbro", + "block.mineralogy.gabbro_brick_furnace": "Fourneau en briques de Gabbro", + "block.mineralogy.gabbro_smooth_furnace": "Fourneau poli en Gabbro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Fourneau en briques polies de Gabbro", "block.mineralogy.peridotite": "Péridotite", - "block.mineralogy.peridotite_stairs": "Péridotite Escaliers", - "block.mineralogy.peridotite_slab": "Péridotite Dalle", - "block.mineralogy.peridotite_brick": "Péridotite Brique", - "block.mineralogy.peridotite_brick_stairs": "Péridotite Escalier De Brique", - "block.mineralogy.peridotite_brick_slab": "Péridotite Dalle de brique", - "block.mineralogy.peridotite_smooth": "Polished Péridotite", - "block.mineralogy.peridotite_smooth_stairs": "Péridotite Escalier Poli", - "block.mineralogy.peridotite_smooth_slab": "Péridotite Dalle polie", - "block.mineralogy.peridotite_smooth_brick": "Péridotite Brique polie", - "block.mineralogy.peridotite_smooth_brick_stairs": "Péridotite Escalier en brique polie", - "block.mineralogy.peridotite_smooth_brick_slab": "Péridotite Dalle de brique polie", - "block.mineralogy.peridotite_wall": "Péridotite Wall", - "block.mineralogy.peridotite_brick_wall": "Péridotite Mur de briques", - "block.mineralogy.peridotite_smooth_wall": "Péridotite Mur poli", - "block.mineralogy.peridotite_smooth_brick_wall": "Péridotite Mur de brique poli", - "block.mineralogy.peridotite_furnace": "Péridotite Furnace", - "block.mineralogy.peridotite_brick_furnace": "Péridotite Four à briques", - "block.mineralogy.peridotite_smooth_furnace": "Péridotite Four poli", - "block.mineralogy.peridotite_smooth_brick_furnace": "Péridotite Four à brique polie", + "block.mineralogy.peridotite_stairs": "Escalier en Péridotite", + "block.mineralogy.peridotite_slab": "Dalle en Péridotite", + "block.mineralogy.peridotite_brick": "Briques en Péridotite", + "block.mineralogy.peridotite_brick_stairs": "Escalier en briques de Péridotite", + "block.mineralogy.peridotite_brick_slab": "Dalle en briques de Péridotite", + "block.mineralogy.peridotite_smooth": "Bloc poli en Péridotite", + "block.mineralogy.peridotite_smooth_stairs": "Escalier poli en Péridotite", + "block.mineralogy.peridotite_smooth_slab": "Dalle polie en Péridotite", + "block.mineralogy.peridotite_smooth_brick": "Briques polies en Péridotite", + "block.mineralogy.peridotite_smooth_brick_stairs": "Escalier en briques polies de Péridotite", + "block.mineralogy.peridotite_smooth_brick_slab": "Dalle en briques polies de Péridotite", + "block.mineralogy.peridotite_wall": "Muret en Péridotite", + "block.mineralogy.peridotite_brick_wall": "Muret en briques de Péridotite", + "block.mineralogy.peridotite_smooth_wall": "Muret poli en Péridotite", + "block.mineralogy.peridotite_smooth_brick_wall": "Muret en briques polies de Péridotite", + "block.mineralogy.peridotite_furnace": "Fourneau en Péridotite", + "block.mineralogy.peridotite_brick_furnace": "Fourneau en briques de Péridotite", + "block.mineralogy.peridotite_smooth_furnace": "Fourneau poli en Péridotite", + "block.mineralogy.peridotite_smooth_brick_furnace": "Fourneau en briques polies de Péridotite", "block.mineralogy.basaltic_glass": "Verre basaltique", - "block.mineralogy.basaltic_glass_stairs": "Verre basaltique Escaliers", - "block.mineralogy.basaltic_glass_slab": "Verre basaltique Dalle", - "block.mineralogy.basaltic_glass_brick": "Verre basaltique Brique", - "block.mineralogy.basaltic_glass_brick_stairs": "Verre basaltique Escalier De Brique", - "block.mineralogy.basaltic_glass_brick_slab": "Verre basaltique Dalle de brique", - "block.mineralogy.basaltic_glass_smooth": "Polished Verre basaltique", - "block.mineralogy.basaltic_glass_smooth_stairs": "Verre basaltique Escalier Poli", - "block.mineralogy.basaltic_glass_smooth_slab": "Verre basaltique Dalle polie", - "block.mineralogy.basaltic_glass_smooth_brick": "Verre basaltique Brique polie", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Verre basaltique Escalier en brique polie", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "Verre basaltique Dalle de brique polie", - "block.mineralogy.basaltic_glass_wall": "Verre basaltique Wall", - "block.mineralogy.basaltic_glass_brick_wall": "Verre basaltique Mur de briques", - "block.mineralogy.basaltic_glass_smooth_wall": "Verre basaltique Mur poli", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "Verre basaltique Mur de brique poli", - "block.mineralogy.basaltic_glass_furnace": "Verre basaltique Furnace", - "block.mineralogy.basaltic_glass_brick_furnace": "Verre basaltique Four à briques", - "block.mineralogy.basaltic_glass_smooth_furnace": "Verre basaltique Four poli", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Verre basaltique Four à brique polie", - "block.mineralogy.scoria": "Scories", - "block.mineralogy.scoria_stairs": "Scories Escaliers", - "block.mineralogy.scoria_slab": "Scories Dalle", - "block.mineralogy.scoria_brick": "Scories Brique", - "block.mineralogy.scoria_brick_stairs": "Scories Escalier De Brique", - "block.mineralogy.scoria_brick_slab": "Scories Dalle de brique", - "block.mineralogy.scoria_smooth": "Polished Scories", - "block.mineralogy.scoria_smooth_stairs": "Scories Escalier Poli", - "block.mineralogy.scoria_smooth_slab": "Scories Dalle polie", - "block.mineralogy.scoria_smooth_brick": "Scories Brique polie", - "block.mineralogy.scoria_smooth_brick_stairs": "Scories Escalier en brique polie", - "block.mineralogy.scoria_smooth_brick_slab": "Scories Dalle de brique polie", - "block.mineralogy.scoria_wall": "Scories Wall", - "block.mineralogy.scoria_brick_wall": "Scories Mur de briques", - "block.mineralogy.scoria_smooth_wall": "Scories Mur poli", - "block.mineralogy.scoria_smooth_brick_wall": "Scories Mur de brique poli", - "block.mineralogy.scoria_furnace": "Scories Furnace", - "block.mineralogy.scoria_brick_furnace": "Scories Four à briques", - "block.mineralogy.scoria_smooth_furnace": "Scories Four poli", - "block.mineralogy.scoria_smooth_brick_furnace": "Scories Four à brique polie", + "block.mineralogy.basaltic_glass_stairs": "Escalier en Verre basaltique", + "block.mineralogy.basaltic_glass_slab": "Dalle en Verre basaltique", + "block.mineralogy.basaltic_glass_brick": "Briques en Verre basaltique", + "block.mineralogy.basaltic_glass_brick_stairs": "Escalier en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_brick_slab": "Dalle en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth": "Bloc poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_stairs": "Escalier poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_slab": "Dalle polie en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick": "Briques polies en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Escalier en briques polies de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Dalle en briques polies de Verre basaltique", + "block.mineralogy.basaltic_glass_wall": "Muret en Verre basaltique", + "block.mineralogy.basaltic_glass_brick_wall": "Muret en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_wall": "Muret poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Muret en briques polies de Verre basaltique", + "block.mineralogy.basaltic_glass_furnace": "Fourneau en Verre basaltique", + "block.mineralogy.basaltic_glass_brick_furnace": "Fourneau en briques de Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_furnace": "Fourneau poli en Verre basaltique", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Fourneau en briques polies de Verre basaltique", + "block.mineralogy.scoria": "Scorie", + "block.mineralogy.scoria_stairs": "Escalier en Scorie", + "block.mineralogy.scoria_slab": "Dalle en Scorie", + "block.mineralogy.scoria_brick": "Briques en Scorie", + "block.mineralogy.scoria_brick_stairs": "Escalier en briques de Scorie", + "block.mineralogy.scoria_brick_slab": "Dalle en briques de Scorie", + "block.mineralogy.scoria_smooth": "Bloc poli en Scorie", + "block.mineralogy.scoria_smooth_stairs": "Escalier poli en Scorie", + "block.mineralogy.scoria_smooth_slab": "Dalle polie en Scorie", + "block.mineralogy.scoria_smooth_brick": "Briques polies en Scorie", + "block.mineralogy.scoria_smooth_brick_stairs": "Escalier en briques polies de Scorie", + "block.mineralogy.scoria_smooth_brick_slab": "Dalle en briques polies de Scorie", + "block.mineralogy.scoria_wall": "Muret en Scorie", + "block.mineralogy.scoria_brick_wall": "Muret en briques de Scorie", + "block.mineralogy.scoria_smooth_wall": "Muret poli en Scorie", + "block.mineralogy.scoria_smooth_brick_wall": "Muret en briques polies de Scorie", + "block.mineralogy.scoria_furnace": "Fourneau en Scorie", + "block.mineralogy.scoria_brick_furnace": "Fourneau en briques de Scorie", + "block.mineralogy.scoria_smooth_furnace": "Fourneau poli en Scorie", + "block.mineralogy.scoria_smooth_brick_furnace": "Fourneau en briques polies de Scorie", "block.mineralogy.tuff": "Tuf", - "block.mineralogy.tuff_stairs": "Tuf Escaliers", - "block.mineralogy.tuff_slab": "Tuf Dalle", - "block.mineralogy.tuff_brick": "Tuf Brique", - "block.mineralogy.tuff_brick_stairs": "Tuf Escalier De Brique", - "block.mineralogy.tuff_brick_slab": "Tuf Dalle de brique", - "block.mineralogy.tuff_smooth": "Polished Tuf", - "block.mineralogy.tuff_smooth_stairs": "Tuf Escalier Poli", - "block.mineralogy.tuff_smooth_slab": "Tuf Dalle polie", - "block.mineralogy.tuff_smooth_brick": "Tuf Brique polie", - "block.mineralogy.tuff_smooth_brick_stairs": "Tuf Escalier en brique polie", - "block.mineralogy.tuff_smooth_brick_slab": "Tuf Dalle de brique polie", - "block.mineralogy.tuff_wall": "Tuf Wall", - "block.mineralogy.tuff_brick_wall": "Tuf Mur de briques", - "block.mineralogy.tuff_smooth_wall": "Tuf Mur poli", - "block.mineralogy.tuff_smooth_brick_wall": "Tuf Mur de brique poli", - "block.mineralogy.tuff_furnace": "Tuf Furnace", - "block.mineralogy.tuff_brick_furnace": "Tuf Four à briques", - "block.mineralogy.tuff_smooth_furnace": "Tuf Four poli", - "block.mineralogy.tuff_smooth_brick_furnace": "Tuf Four à brique polie", - "block.mineralogy.siltstone": "Pierre de terre", - "block.mineralogy.siltstone_stairs": "Pierre de terre Escaliers", - "block.mineralogy.siltstone_slab": "Pierre de terre Dalle", - "block.mineralogy.siltstone_brick": "Pierre de terre Brique", - "block.mineralogy.siltstone_brick_stairs": "Pierre de terre Escalier De Brique", - "block.mineralogy.siltstone_brick_slab": "Pierre de terre Dalle de brique", - "block.mineralogy.siltstone_smooth": "Polished Pierre de terre", - "block.mineralogy.siltstone_smooth_stairs": "Pierre de terre Escalier Poli", - "block.mineralogy.siltstone_smooth_slab": "Pierre de terre Dalle polie", - "block.mineralogy.siltstone_smooth_brick": "Pierre de terre Brique polie", - "block.mineralogy.siltstone_smooth_brick_stairs": "Pierre de terre Escalier en brique polie", - "block.mineralogy.siltstone_smooth_brick_slab": "Pierre de terre Dalle de brique polie", - "block.mineralogy.siltstone_wall": "Pierre de terre Wall", - "block.mineralogy.siltstone_brick_wall": "Pierre de terre Mur de briques", - "block.mineralogy.siltstone_smooth_wall": "Pierre de terre Mur poli", - "block.mineralogy.siltstone_smooth_brick_wall": "Pierre de terre Mur de brique poli", - "block.mineralogy.siltstone_furnace": "Pierre de terre Furnace", - "block.mineralogy.siltstone_brick_furnace": "Pierre de terre Four à briques", - "block.mineralogy.siltstone_smooth_furnace": "Pierre de terre Four poli", - "block.mineralogy.siltstone_smooth_brick_furnace": "Pierre de terre Four à brique polie", + "block.mineralogy.tuff_stairs": "Escalier en Tuf", + "block.mineralogy.tuff_slab": "Dalle en Tuf", + "block.mineralogy.tuff_brick": "Briques en Tuf", + "block.mineralogy.tuff_brick_stairs": "Escalier en briques de Tuf", + "block.mineralogy.tuff_brick_slab": "Dalle en briques de Tuf", + "block.mineralogy.tuff_smooth": "Bloc poli en Tuf", + "block.mineralogy.tuff_smooth_stairs": "Escalier poli en Tuf", + "block.mineralogy.tuff_smooth_slab": "Dalle polie en Tuf", + "block.mineralogy.tuff_smooth_brick": "Briques polies en Tuf", + "block.mineralogy.tuff_smooth_brick_stairs": "Escalier en briques polies de Tuf", + "block.mineralogy.tuff_smooth_brick_slab": "Dalle en briques polies de Tuf", + "block.mineralogy.tuff_wall": "Muret en Tuf", + "block.mineralogy.tuff_brick_wall": "Muret en briques de Tuf", + "block.mineralogy.tuff_smooth_wall": "Muret poli en Tuf", + "block.mineralogy.tuff_smooth_brick_wall": "Muret en briques polies de Tuf", + "block.mineralogy.tuff_furnace": "Fourneau en Tuf", + "block.mineralogy.tuff_brick_furnace": "Fourneau en briques de Tuf", + "block.mineralogy.tuff_smooth_furnace": "Fourneau poli en Tuf", + "block.mineralogy.tuff_smooth_brick_furnace": "Fourneau en briques polies de Tuf", + "block.mineralogy.siltstone": "Siltite", + "block.mineralogy.siltstone_stairs": "Escalier en Siltite", + "block.mineralogy.siltstone_slab": "Dalle en Siltite", + "block.mineralogy.siltstone_brick": "Briques en Siltite", + "block.mineralogy.siltstone_brick_stairs": "Escalier en briques de Siltite", + "block.mineralogy.siltstone_brick_slab": "Dalle en briques de Siltite", + "block.mineralogy.siltstone_smooth": "Bloc poli en Siltite", + "block.mineralogy.siltstone_smooth_stairs": "Escalier poli en Siltite", + "block.mineralogy.siltstone_smooth_slab": "Dalle polie en Siltite", + "block.mineralogy.siltstone_smooth_brick": "Briques polies en Siltite", + "block.mineralogy.siltstone_smooth_brick_stairs": "Escalier en briques polies de Siltite", + "block.mineralogy.siltstone_smooth_brick_slab": "Dalle en briques polies de Siltite", + "block.mineralogy.siltstone_wall": "Muret en Siltite", + "block.mineralogy.siltstone_brick_wall": "Muret en briques de Siltite", + "block.mineralogy.siltstone_smooth_wall": "Muret poli en Siltite", + "block.mineralogy.siltstone_smooth_brick_wall": "Muret en briques polies de Siltite", + "block.mineralogy.siltstone_furnace": "Fourneau en Siltite", + "block.mineralogy.siltstone_brick_furnace": "Fourneau en briques de Siltite", + "block.mineralogy.siltstone_smooth_furnace": "Fourneau poli en Siltite", + "block.mineralogy.siltstone_smooth_brick_furnace": "Fourneau en briques polies de Siltite", "block.mineralogy.rock_salt": "Sel gemme", - "block.mineralogy.rock_salt_stairs": "Sel gemme Escaliers", - "block.mineralogy.rock_salt_slab": "Sel gemme Dalle", - "block.mineralogy.rock_salt_brick": "Sel gemme Brique", - "block.mineralogy.rock_salt_brick_stairs": "Sel gemme Escalier De Brique", - "block.mineralogy.rock_salt_brick_slab": "Sel gemme Dalle de brique", - "block.mineralogy.rock_salt_smooth": "Polished Sel gemme", - "block.mineralogy.rock_salt_smooth_stairs": "Sel gemme Escalier Poli", - "block.mineralogy.rock_salt_smooth_slab": "Sel gemme Dalle polie", - "block.mineralogy.rock_salt_smooth_brick": "Sel gemme Brique polie", - "block.mineralogy.rock_salt_smooth_brick_stairs": "Sel gemme Escalier en brique polie", - "block.mineralogy.rock_salt_smooth_brick_slab": "Sel gemme Dalle de brique polie", - "block.mineralogy.rock_salt_wall": "Sel gemme Wall", - "block.mineralogy.rock_salt_brick_wall": "Sel gemme Mur de briques", - "block.mineralogy.rock_salt_smooth_wall": "Sel gemme Mur poli", - "block.mineralogy.rock_salt_smooth_brick_wall": "Sel gemme Mur de brique poli", - "block.mineralogy.rock_salt_furnace": "Sel gemme Furnace", - "block.mineralogy.rock_salt_brick_furnace": "Sel gemme Four à briques", - "block.mineralogy.rock_salt_smooth_furnace": "Sel gemme Four poli", - "block.mineralogy.rock_salt_smooth_brick_furnace": "Sel gemme Four à brique polie", - "block.mineralogy.hornfels": "Hornfels", - "block.mineralogy.hornfels_stairs": "Hornfels Escaliers", - "block.mineralogy.hornfels_slab": "Hornfels Dalle", - "block.mineralogy.hornfels_brick": "Hornfels Brique", - "block.mineralogy.hornfels_brick_stairs": "Hornfels Escalier De Brique", - "block.mineralogy.hornfels_brick_slab": "Hornfels Dalle de brique", - "block.mineralogy.hornfels_smooth": "Polished Hornfels", - "block.mineralogy.hornfels_smooth_stairs": "Hornfels Escalier Poli", - "block.mineralogy.hornfels_smooth_slab": "Hornfels Dalle polie", - "block.mineralogy.hornfels_smooth_brick": "Hornfels Brique polie", - "block.mineralogy.hornfels_smooth_brick_stairs": "Hornfels Escalier en brique polie", - "block.mineralogy.hornfels_smooth_brick_slab": "Hornfels Dalle de brique polie", - "block.mineralogy.hornfels_wall": "Hornfels Wall", - "block.mineralogy.hornfels_brick_wall": "Hornfels Mur de briques", - "block.mineralogy.hornfels_smooth_wall": "Hornfels Mur poli", - "block.mineralogy.hornfels_smooth_brick_wall": "Hornfels Mur de brique poli", - "block.mineralogy.hornfels_furnace": "Hornfels Furnace", - "block.mineralogy.hornfels_brick_furnace": "Hornfels Four à briques", - "block.mineralogy.hornfels_smooth_furnace": "Hornfels Four poli", - "block.mineralogy.hornfels_smooth_brick_furnace": "Hornfels Four à brique polie", + "block.mineralogy.rock_salt_stairs": "Escalier en Sel gemme", + "block.mineralogy.rock_salt_slab": "Dalle en Sel gemme", + "block.mineralogy.rock_salt_brick": "Briques en Sel gemme", + "block.mineralogy.rock_salt_brick_stairs": "Escalier en briques de Sel gemme", + "block.mineralogy.rock_salt_brick_slab": "Dalle en briques de Sel gemme", + "block.mineralogy.rock_salt_smooth": "Bloc poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_stairs": "Escalier poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_slab": "Dalle polie en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick": "Briques polies en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Escalier en briques polies de Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_slab": "Dalle en briques polies de Sel gemme", + "block.mineralogy.rock_salt_wall": "Muret en Sel gemme", + "block.mineralogy.rock_salt_brick_wall": "Muret en briques de Sel gemme", + "block.mineralogy.rock_salt_smooth_wall": "Muret poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_wall": "Muret en briques polies de Sel gemme", + "block.mineralogy.rock_salt_furnace": "Fourneau en Sel gemme", + "block.mineralogy.rock_salt_brick_furnace": "Fourneau en briques de Sel gemme", + "block.mineralogy.rock_salt_smooth_furnace": "Fourneau poli en Sel gemme", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Fourneau en briques polies de Sel gemme", + "block.mineralogy.hornfels": "Cornéenne", + "block.mineralogy.hornfels_stairs": "Escalier en Cornéenne", + "block.mineralogy.hornfels_slab": "Dalle en Cornéenne", + "block.mineralogy.hornfels_brick": "Briques en Cornéenne", + "block.mineralogy.hornfels_brick_stairs": "Escalier en briques de Cornéenne", + "block.mineralogy.hornfels_brick_slab": "Dalle en briques de Cornéenne", + "block.mineralogy.hornfels_smooth": "Bloc poli en Cornéenne", + "block.mineralogy.hornfels_smooth_stairs": "Escalier poli en Cornéenne", + "block.mineralogy.hornfels_smooth_slab": "Dalle polie en Cornéenne", + "block.mineralogy.hornfels_smooth_brick": "Briques polies en Cornéenne", + "block.mineralogy.hornfels_smooth_brick_stairs": "Escalier en briques polies de Cornéenne", + "block.mineralogy.hornfels_smooth_brick_slab": "Dalle en briques polies de Cornéenne", + "block.mineralogy.hornfels_wall": "Muret en Cornéenne", + "block.mineralogy.hornfels_brick_wall": "Muret en briques de Cornéenne", + "block.mineralogy.hornfels_smooth_wall": "Muret poli en Cornéenne", + "block.mineralogy.hornfels_smooth_brick_wall": "Muret en briques polies de Cornéenne", + "block.mineralogy.hornfels_furnace": "Fourneau en Cornéenne", + "block.mineralogy.hornfels_brick_furnace": "Fourneau en briques de Cornéenne", + "block.mineralogy.hornfels_smooth_furnace": "Fourneau poli en Cornéenne", + "block.mineralogy.hornfels_smooth_brick_furnace": "Fourneau en briques polies de Cornéenne", "block.mineralogy.quartzite": "Quartzite", - "block.mineralogy.quartzite_stairs": "Quartzite Escaliers", - "block.mineralogy.quartzite_slab": "Quartzite Dalle", - "block.mineralogy.quartzite_brick": "Quartzite Brique", - "block.mineralogy.quartzite_brick_stairs": "Quartzite Escalier De Brique", - "block.mineralogy.quartzite_brick_slab": "Quartzite Dalle de brique", - "block.mineralogy.quartzite_smooth": "Polished Quartzite", - "block.mineralogy.quartzite_smooth_stairs": "Quartzite Escalier Poli", - "block.mineralogy.quartzite_smooth_slab": "Quartzite Dalle polie", - "block.mineralogy.quartzite_smooth_brick": "Quartzite Brique polie", - "block.mineralogy.quartzite_smooth_brick_stairs": "Quartzite Escalier en brique polie", - "block.mineralogy.quartzite_smooth_brick_slab": "Quartzite Dalle de brique polie", - "block.mineralogy.quartzite_wall": "Quartzite Wall", - "block.mineralogy.quartzite_brick_wall": "Quartzite Mur de briques", - "block.mineralogy.quartzite_smooth_wall": "Quartzite Mur poli", - "block.mineralogy.quartzite_smooth_brick_wall": "Quartzite Mur de brique poli", - "block.mineralogy.quartzite_furnace": "Quartzite Furnace", - "block.mineralogy.quartzite_brick_furnace": "Quartzite Four à briques", - "block.mineralogy.quartzite_smooth_furnace": "Quartzite Four poli", - "block.mineralogy.quartzite_smooth_brick_furnace": "Quartzite Four à brique polie", + "block.mineralogy.quartzite_stairs": "Escalier en Quartzite", + "block.mineralogy.quartzite_slab": "Dalle en Quartzite", + "block.mineralogy.quartzite_brick": "Briques en Quartzite", + "block.mineralogy.quartzite_brick_stairs": "Escalier en briques de Quartzite", + "block.mineralogy.quartzite_brick_slab": "Dalle en briques de Quartzite", + "block.mineralogy.quartzite_smooth": "Bloc poli en Quartzite", + "block.mineralogy.quartzite_smooth_stairs": "Escalier poli en Quartzite", + "block.mineralogy.quartzite_smooth_slab": "Dalle polie en Quartzite", + "block.mineralogy.quartzite_smooth_brick": "Briques polies en Quartzite", + "block.mineralogy.quartzite_smooth_brick_stairs": "Escalier en briques polies de Quartzite", + "block.mineralogy.quartzite_smooth_brick_slab": "Dalle en briques polies de Quartzite", + "block.mineralogy.quartzite_wall": "Muret en Quartzite", + "block.mineralogy.quartzite_brick_wall": "Muret en briques de Quartzite", + "block.mineralogy.quartzite_smooth_wall": "Muret poli en Quartzite", + "block.mineralogy.quartzite_smooth_brick_wall": "Muret en briques polies de Quartzite", + "block.mineralogy.quartzite_furnace": "Fourneau en Quartzite", + "block.mineralogy.quartzite_brick_furnace": "Fourneau en briques de Quartzite", + "block.mineralogy.quartzite_smooth_furnace": "Fourneau poli en Quartzite", + "block.mineralogy.quartzite_smooth_brick_furnace": "Fourneau en briques polies de Quartzite", "block.mineralogy.novaculite": "Novaculite", - "block.mineralogy.novaculite_stairs": "Novaculite Escaliers", - "block.mineralogy.novaculite_slab": "Novaculite Dalle", - "block.mineralogy.novaculite_brick": "Novaculite Brique", - "block.mineralogy.novaculite_brick_stairs": "Novaculite Escalier De Brique", - "block.mineralogy.novaculite_brick_slab": "Novaculite Dalle de brique", - "block.mineralogy.novaculite_smooth": "Polished Novaculite", - "block.mineralogy.novaculite_smooth_stairs": "Novaculite Escalier Poli", - "block.mineralogy.novaculite_smooth_slab": "Novaculite Dalle polie", - "block.mineralogy.novaculite_smooth_brick": "Novaculite Brique polie", - "block.mineralogy.novaculite_smooth_brick_stairs": "Novaculite Escalier en brique polie", - "block.mineralogy.novaculite_smooth_brick_slab": "Novaculite Dalle de brique polie", - "block.mineralogy.novaculite_wall": "Novaculite Wall", - "block.mineralogy.novaculite_brick_wall": "Novaculite Mur de briques", - "block.mineralogy.novaculite_smooth_wall": "Novaculite Mur poli", - "block.mineralogy.novaculite_smooth_brick_wall": "Novaculite Mur de brique poli", - "block.mineralogy.novaculite_furnace": "Novaculite Furnace", - "block.mineralogy.novaculite_brick_furnace": "Novaculite Four à briques", - "block.mineralogy.novaculite_smooth_furnace": "Novaculite Four poli", - "block.mineralogy.novaculite_smooth_brick_furnace": "Novaculite Four à brique polie", + "block.mineralogy.novaculite_stairs": "Escalier en Novaculite", + "block.mineralogy.novaculite_slab": "Dalle en Novaculite", + "block.mineralogy.novaculite_brick": "Briques en Novaculite", + "block.mineralogy.novaculite_brick_stairs": "Escalier en briques de Novaculite", + "block.mineralogy.novaculite_brick_slab": "Dalle en briques de Novaculite", + "block.mineralogy.novaculite_smooth": "Bloc poli en Novaculite", + "block.mineralogy.novaculite_smooth_stairs": "Escalier poli en Novaculite", + "block.mineralogy.novaculite_smooth_slab": "Dalle polie en Novaculite", + "block.mineralogy.novaculite_smooth_brick": "Briques polies en Novaculite", + "block.mineralogy.novaculite_smooth_brick_stairs": "Escalier en briques polies de Novaculite", + "block.mineralogy.novaculite_smooth_brick_slab": "Dalle en briques polies de Novaculite", + "block.mineralogy.novaculite_wall": "Muret en Novaculite", + "block.mineralogy.novaculite_brick_wall": "Muret en briques de Novaculite", + "block.mineralogy.novaculite_smooth_wall": "Muret poli en Novaculite", + "block.mineralogy.novaculite_smooth_brick_wall": "Muret en briques polies de Novaculite", + "block.mineralogy.novaculite_furnace": "Fourneau en Novaculite", + "block.mineralogy.novaculite_brick_furnace": "Fourneau en briques de Novaculite", + "block.mineralogy.novaculite_smooth_furnace": "Fourneau poli en Novaculite", + "block.mineralogy.novaculite_smooth_brick_furnace": "Fourneau en briques polies de Novaculite", "block.mineralogy.chalk": "Craie", "item.mineralogy.chalk_dust": "Poudre de craie", "item.mineralogy.salt_dust": "Sel", "item.mineralogy.rock_salt_dust": "Cristaux de sel gemme", - "block.mineralogy.rocksaltlamp": "Lampe à sel", - "block.mineralogy.rocksaltstreetlamp": "Lampadaire à sel", - "block.mineralogy.andesite_relief_axe": "Andésite Soulagement de la hache", - "block.mineralogy.andesite_relief_blank": "Andésite Relief vide", - "block.mineralogy.andesite_relief_cross": "Andésite Relief croisé", - "block.mineralogy.andesite_relief_hammer": "Andésite Soulagement marteau", - "block.mineralogy.andesite_relief_hoe": "Andésite Hoe Relief", - "block.mineralogy.andesite_relief_horizontal": "Andésite Relief horizontal", - "block.mineralogy.andesite_relief_i": "Andésite I Relief", - "block.mineralogy.andesite_relief_left": "Andésite Relief gauche", - "block.mineralogy.andesite_relief_pickaxe": "Andésite Relief de pioche", - "block.mineralogy.andesite_relief_plus": "Andésite Plus de soulagement", - "block.mineralogy.andesite_relief_right": "Andésite Bon soulagement", - "block.mineralogy.andesite_relief_sword": "Andésite Soulagement de l'épée", - "block.mineralogy.andesite_relief_vertical": "Andésite Relief vertical", - "block.mineralogy.basalt_relief_axe": "Basalte Soulagement de la hache", - "block.mineralogy.basalt_relief_blank": "Basalte Relief vide", - "block.mineralogy.basalt_relief_cross": "Basalte Relief croisé", - "block.mineralogy.basalt_relief_hammer": "Basalte Soulagement marteau", - "block.mineralogy.basalt_relief_hoe": "Basalte Hoe Relief", - "block.mineralogy.basalt_relief_horizontal": "Basalte Relief horizontal", - "block.mineralogy.basalt_relief_i": "Basalte I Relief", - "block.mineralogy.basalt_relief_left": "Basalte Relief gauche", - "block.mineralogy.basalt_relief_pickaxe": "Basalte Relief de pioche", - "block.mineralogy.basalt_relief_plus": "Basalte Plus de soulagement", - "block.mineralogy.basalt_relief_right": "Basalte Bon soulagement", - "block.mineralogy.basalt_relief_sword": "Basalte Soulagement de l'épée", - "block.mineralogy.basalt_relief_vertical": "Basalte Relief vertical", - "block.mineralogy.diorite_relief_axe": "Diorite Soulagement de la hache", - "block.mineralogy.diorite_relief_blank": "Diorite Relief vide", - "block.mineralogy.diorite_relief_cross": "Diorite Relief croisé", - "block.mineralogy.diorite_relief_hammer": "Diorite Soulagement marteau", - "block.mineralogy.diorite_relief_hoe": "Diorite Hoe Relief", - "block.mineralogy.diorite_relief_horizontal": "Diorite Relief horizontal", - "block.mineralogy.diorite_relief_i": "Diorite I Relief", - "block.mineralogy.diorite_relief_left": "Diorite Relief gauche", - "block.mineralogy.diorite_relief_pickaxe": "Diorite Relief de pioche", - "block.mineralogy.diorite_relief_plus": "Diorite Plus de soulagement", - "block.mineralogy.diorite_relief_right": "Diorite Bon soulagement", - "block.mineralogy.diorite_relief_sword": "Diorite Soulagement de l'épée", - "block.mineralogy.diorite_relief_vertical": "Diorite Relief vertical", - "block.mineralogy.granite_relief_axe": "Granit Soulagement de la hache", - "block.mineralogy.granite_relief_blank": "Granit Relief vide", - "block.mineralogy.granite_relief_cross": "Granit Relief croisé", - "block.mineralogy.granite_relief_hammer": "Granit Soulagement marteau", - "block.mineralogy.granite_relief_hoe": "Granit Hoe Relief", - "block.mineralogy.granite_relief_horizontal": "Granit Relief horizontal", - "block.mineralogy.granite_relief_i": "Granit I Relief", - "block.mineralogy.granite_relief_left": "Granit Relief gauche", - "block.mineralogy.granite_relief_pickaxe": "Granit Relief de pioche", - "block.mineralogy.granite_relief_plus": "Granit Plus de soulagement", - "block.mineralogy.granite_relief_right": "Granit Bon soulagement", - "block.mineralogy.granite_relief_sword": "Granit Soulagement de l'épée", - "block.mineralogy.granite_relief_vertical": "Granit Relief vertical", - "block.mineralogy.rhyolite_relief_axe": "Rhyolite Soulagement de la hache", - "block.mineralogy.rhyolite_relief_blank": "Rhyolite Relief vide", - "block.mineralogy.rhyolite_relief_cross": "Rhyolite Relief croisé", - "block.mineralogy.rhyolite_relief_hammer": "Rhyolite Soulagement marteau", - "block.mineralogy.rhyolite_relief_hoe": "Rhyolite Hoe Relief", - "block.mineralogy.rhyolite_relief_horizontal": "Rhyolite Relief horizontal", - "block.mineralogy.rhyolite_relief_i": "Rhyolite I Relief", - "block.mineralogy.rhyolite_relief_left": "Rhyolite Relief gauche", - "block.mineralogy.rhyolite_relief_pickaxe": "Rhyolite Relief de pioche", - "block.mineralogy.rhyolite_relief_plus": "Rhyolite Plus de soulagement", - "block.mineralogy.rhyolite_relief_right": "Rhyolite Bon soulagement", - "block.mineralogy.rhyolite_relief_sword": "Rhyolite Soulagement de l'épée", - "block.mineralogy.rhyolite_relief_vertical": "Rhyolite Relief vertical", - "block.mineralogy.pegmatite_relief_axe": "Pegmatite Soulagement de la hache", - "block.mineralogy.pegmatite_relief_blank": "Pegmatite Relief vide", - "block.mineralogy.pegmatite_relief_cross": "Pegmatite Relief croisé", - "block.mineralogy.pegmatite_relief_hammer": "Pegmatite Soulagement marteau", - "block.mineralogy.pegmatite_relief_hoe": "Pegmatite Hoe Relief", - "block.mineralogy.pegmatite_relief_horizontal": "Pegmatite Relief horizontal", - "block.mineralogy.pegmatite_relief_i": "Pegmatite I Relief", - "block.mineralogy.pegmatite_relief_left": "Pegmatite Relief gauche", - "block.mineralogy.pegmatite_relief_pickaxe": "Pegmatite Relief de pioche", - "block.mineralogy.pegmatite_relief_plus": "Pegmatite Plus de soulagement", - "block.mineralogy.pegmatite_relief_right": "Pegmatite Bon soulagement", - "block.mineralogy.pegmatite_relief_sword": "Pegmatite Soulagement de l'épée", - "block.mineralogy.pegmatite_relief_vertical": "Pegmatite Relief vertical", - "block.mineralogy.shale_relief_axe": "Schistee argileux Soulagement de la hache", - "block.mineralogy.shale_relief_blank": "Schistee argileux Relief vide", - "block.mineralogy.shale_relief_cross": "Schistee argileux Relief croisé", - "block.mineralogy.shale_relief_hammer": "Schistee argileux Soulagement marteau", - "block.mineralogy.shale_relief_hoe": "Schistee argileux Hoe Relief", - "block.mineralogy.shale_relief_horizontal": "Schistee argileux Relief horizontal", - "block.mineralogy.shale_relief_i": "Schistee argileux I Relief", - "block.mineralogy.shale_relief_left": "Schistee argileux Relief gauche", - "block.mineralogy.shale_relief_pickaxe": "Schistee argileux Relief de pioche", - "block.mineralogy.shale_relief_plus": "Schistee argileux Plus de soulagement", - "block.mineralogy.shale_relief_right": "Schistee argileux Bon soulagement", - "block.mineralogy.shale_relief_sword": "Schistee argileux Soulagement de l'épée", - "block.mineralogy.shale_relief_vertical": "Schistee argileux Relief vertical", - "block.mineralogy.conglomerate_relief_axe": "Conglomérat Soulagement de la hache", - "block.mineralogy.conglomerate_relief_blank": "Conglomérat Relief vide", - "block.mineralogy.conglomerate_relief_cross": "Conglomérat Relief croisé", - "block.mineralogy.conglomerate_relief_hammer": "Conglomérat Soulagement marteau", - "block.mineralogy.conglomerate_relief_hoe": "Conglomérat Hoe Relief", - "block.mineralogy.conglomerate_relief_horizontal": "Conglomérat Relief horizontal", - "block.mineralogy.conglomerate_relief_i": "Conglomérat I Relief", - "block.mineralogy.conglomerate_relief_left": "Conglomérat Relief gauche", - "block.mineralogy.conglomerate_relief_pickaxe": "Conglomérat Relief de pioche", - "block.mineralogy.conglomerate_relief_plus": "Conglomérat Plus de soulagement", - "block.mineralogy.conglomerate_relief_right": "Conglomérat Bon soulagement", - "block.mineralogy.conglomerate_relief_sword": "Conglomérat Soulagement de l'épée", - "block.mineralogy.conglomerate_relief_vertical": "Conglomérat Relief vertical", - "block.mineralogy.dolomite_relief_axe": "Dolomie Soulagement de la hache", - "block.mineralogy.dolomite_relief_blank": "Dolomie Relief vide", - "block.mineralogy.dolomite_relief_cross": "Dolomie Relief croisé", - "block.mineralogy.dolomite_relief_hammer": "Dolomie Soulagement marteau", - "block.mineralogy.dolomite_relief_hoe": "Dolomie Hoe Relief", - "block.mineralogy.dolomite_relief_horizontal": "Dolomie Relief horizontal", - "block.mineralogy.dolomite_relief_i": "Dolomie I Relief", - "block.mineralogy.dolomite_relief_left": "Dolomie Relief gauche", - "block.mineralogy.dolomite_relief_pickaxe": "Dolomie Relief de pioche", - "block.mineralogy.dolomite_relief_plus": "Dolomie Plus de soulagement", - "block.mineralogy.dolomite_relief_right": "Dolomie Bon soulagement", - "block.mineralogy.dolomite_relief_sword": "Dolomie Soulagement de l'épée", - "block.mineralogy.dolomite_relief_vertical": "Dolomie Relief vertical", - "block.mineralogy.limestone_relief_axe": "Calcaire Soulagement de la hache", - "block.mineralogy.limestone_relief_blank": "Calcaire Relief vide", - "block.mineralogy.limestone_relief_cross": "Calcaire Relief croisé", - "block.mineralogy.limestone_relief_hammer": "Calcaire Soulagement marteau", - "block.mineralogy.limestone_relief_hoe": "Calcaire Hoe Relief", - "block.mineralogy.limestone_relief_horizontal": "Calcaire Relief horizontal", - "block.mineralogy.limestone_relief_i": "Calcaire I Relief", - "block.mineralogy.limestone_relief_left": "Calcaire Relief gauche", - "block.mineralogy.limestone_relief_pickaxe": "Calcaire Relief de pioche", - "block.mineralogy.limestone_relief_plus": "Calcaire Plus de soulagement", - "block.mineralogy.limestone_relief_right": "Calcaire Bon soulagement", - "block.mineralogy.limestone_relief_sword": "Calcaire Soulagement de l'épée", - "block.mineralogy.limestone_relief_vertical": "Calcaire Relief vertical", - "block.mineralogy.marble_relief_axe": "Marbre Soulagement de la hache", - "block.mineralogy.marble_relief_blank": "Marbre Relief vide", - "block.mineralogy.marble_relief_cross": "Marbre Relief croisé", - "block.mineralogy.marble_relief_hammer": "Marbre Soulagement marteau", - "block.mineralogy.marble_relief_hoe": "Marbre Hoe Relief", - "block.mineralogy.marble_relief_horizontal": "Marbre Relief horizontal", - "block.mineralogy.marble_relief_i": "Marbre I Relief", - "block.mineralogy.marble_relief_left": "Marbre Relief gauche", - "block.mineralogy.marble_relief_pickaxe": "Marbre Relief de pioche", - "block.mineralogy.marble_relief_plus": "Marbre Plus de soulagement", - "block.mineralogy.marble_relief_right": "Marbre Bon soulagement", - "block.mineralogy.marble_relief_sword": "Marbre Soulagement de l'épée", - "block.mineralogy.marble_relief_vertical": "Marbre Relief vertical", - "block.mineralogy.slate_relief_axe": "Ardoise Soulagement de la hache", - "block.mineralogy.slate_relief_blank": "Ardoise Relief vide", - "block.mineralogy.slate_relief_cross": "Ardoise Relief croisé", - "block.mineralogy.slate_relief_hammer": "Ardoise Soulagement marteau", - "block.mineralogy.slate_relief_hoe": "Ardoise Hoe Relief", - "block.mineralogy.slate_relief_horizontal": "Ardoise Relief horizontal", - "block.mineralogy.slate_relief_i": "Ardoise I Relief", - "block.mineralogy.slate_relief_left": "Ardoise Relief gauche", - "block.mineralogy.slate_relief_pickaxe": "Ardoise Relief de pioche", - "block.mineralogy.slate_relief_plus": "Ardoise Plus de soulagement", - "block.mineralogy.slate_relief_right": "Ardoise Bon soulagement", - "block.mineralogy.slate_relief_sword": "Ardoise Soulagement de l'épée", - "block.mineralogy.slate_relief_vertical": "Ardoise Relief vertical", - "block.mineralogy.schist_relief_axe": "Schiste Soulagement de la hache", - "block.mineralogy.schist_relief_blank": "Schiste Relief vide", - "block.mineralogy.schist_relief_cross": "Schiste Relief croisé", - "block.mineralogy.schist_relief_hammer": "Schiste Soulagement marteau", - "block.mineralogy.schist_relief_hoe": "Schiste Hoe Relief", - "block.mineralogy.schist_relief_horizontal": "Schiste Relief horizontal", - "block.mineralogy.schist_relief_i": "Schiste I Relief", - "block.mineralogy.schist_relief_left": "Schiste Relief gauche", - "block.mineralogy.schist_relief_pickaxe": "Schiste Relief de pioche", - "block.mineralogy.schist_relief_plus": "Schiste Plus de soulagement", - "block.mineralogy.schist_relief_right": "Schiste Bon soulagement", - "block.mineralogy.schist_relief_sword": "Schiste Soulagement de l'épée", - "block.mineralogy.schist_relief_vertical": "Schiste Relief vertical", - "block.mineralogy.gneiss_relief_axe": "Gneiss Soulagement de la hache", - "block.mineralogy.gneiss_relief_blank": "Gneiss Relief vide", - "block.mineralogy.gneiss_relief_cross": "Gneiss Relief croisé", - "block.mineralogy.gneiss_relief_hammer": "Gneiss Soulagement marteau", - "block.mineralogy.gneiss_relief_hoe": "Gneiss Hoe Relief", - "block.mineralogy.gneiss_relief_horizontal": "Gneiss Relief horizontal", - "block.mineralogy.gneiss_relief_i": "Gneiss I Relief", - "block.mineralogy.gneiss_relief_left": "Gneiss Relief gauche", - "block.mineralogy.gneiss_relief_pickaxe": "Gneiss Relief de pioche", - "block.mineralogy.gneiss_relief_plus": "Gneiss Plus de soulagement", - "block.mineralogy.gneiss_relief_right": "Gneiss Bon soulagement", - "block.mineralogy.gneiss_relief_sword": "Gneiss Soulagement de l'épée", - "block.mineralogy.gneiss_relief_vertical": "Gneiss Relief vertical", - "block.mineralogy.phyllite_relief_axe": "Phyllite Soulagement de la hache", - "block.mineralogy.phyllite_relief_blank": "Phyllite Relief vide", - "block.mineralogy.phyllite_relief_cross": "Phyllite Relief croisé", - "block.mineralogy.phyllite_relief_hammer": "Phyllite Soulagement marteau", - "block.mineralogy.phyllite_relief_hoe": "Phyllite Hoe Relief", - "block.mineralogy.phyllite_relief_horizontal": "Phyllite Relief horizontal", - "block.mineralogy.phyllite_relief_i": "Phyllite I Relief", - "block.mineralogy.phyllite_relief_left": "Phyllite Relief gauche", - "block.mineralogy.phyllite_relief_pickaxe": "Phyllite Relief de pioche", - "block.mineralogy.phyllite_relief_plus": "Phyllite Plus de soulagement", - "block.mineralogy.phyllite_relief_right": "Phyllite Bon soulagement", - "block.mineralogy.phyllite_relief_sword": "Phyllite Soulagement de l'épée", - "block.mineralogy.phyllite_relief_vertical": "Phyllite Relief vertical", - "block.mineralogy.amphibolite_relief_axe": "Amphibolite Soulagement de la hache", - "block.mineralogy.amphibolite_relief_blank": "Amphibolite Relief vide", - "block.mineralogy.amphibolite_relief_cross": "Amphibolite Relief croisé", - "block.mineralogy.amphibolite_relief_hammer": "Amphibolite Soulagement marteau", - "block.mineralogy.amphibolite_relief_hoe": "Amphibolite Hoe Relief", - "block.mineralogy.amphibolite_relief_horizontal": "Amphibolite Relief horizontal", - "block.mineralogy.amphibolite_relief_i": "Amphibolite I Relief", - "block.mineralogy.amphibolite_relief_left": "Amphibolite Relief gauche", - "block.mineralogy.amphibolite_relief_pickaxe": "Amphibolite Relief de pioche", - "block.mineralogy.amphibolite_relief_plus": "Amphibolite Plus de soulagement", - "block.mineralogy.amphibolite_relief_right": "Amphibolite Bon soulagement", - "block.mineralogy.amphibolite_relief_sword": "Amphibolite Soulagement de l'épée", - "block.mineralogy.amphibolite_relief_vertical": "Amphibolite Relief vertical", - "block.mineralogy.diabase_relief_axe": "Diabase Soulagement de la hache", - "block.mineralogy.diabase_relief_blank": "Diabase Relief vide", - "block.mineralogy.diabase_relief_cross": "Diabase Relief croisé", - "block.mineralogy.diabase_relief_hammer": "Diabase Soulagement marteau", - "block.mineralogy.diabase_relief_hoe": "Diabase Hoe Relief", - "block.mineralogy.diabase_relief_horizontal": "Diabase Relief horizontal", - "block.mineralogy.diabase_relief_i": "Diabase I Relief", - "block.mineralogy.diabase_relief_left": "Diabase Relief gauche", - "block.mineralogy.diabase_relief_pickaxe": "Diabase Relief de pioche", - "block.mineralogy.diabase_relief_plus": "Diabase Plus de soulagement", - "block.mineralogy.diabase_relief_right": "Diabase Bon soulagement", - "block.mineralogy.diabase_relief_sword": "Diabase Soulagement de l'épée", - "block.mineralogy.diabase_relief_vertical": "Diabase Relief vertical", - "block.mineralogy.gabbro_relief_axe": "Gabbro Soulagement de la hache", - "block.mineralogy.gabbro_relief_blank": "Gabbro Relief vide", - "block.mineralogy.gabbro_relief_cross": "Gabbro Relief croisé", - "block.mineralogy.gabbro_relief_hammer": "Gabbro Soulagement marteau", - "block.mineralogy.gabbro_relief_hoe": "Gabbro Hoe Relief", - "block.mineralogy.gabbro_relief_horizontal": "Gabbro Relief horizontal", - "block.mineralogy.gabbro_relief_i": "Gabbro I Relief", - "block.mineralogy.gabbro_relief_left": "Gabbro Relief gauche", - "block.mineralogy.gabbro_relief_pickaxe": "Gabbro Relief de pioche", - "block.mineralogy.gabbro_relief_plus": "Gabbro Plus de soulagement", - "block.mineralogy.gabbro_relief_right": "Gabbro Bon soulagement", - "block.mineralogy.gabbro_relief_sword": "Gabbro Soulagement de l'épée", - "block.mineralogy.gabbro_relief_vertical": "Gabbro Relief vertical", - "block.mineralogy.peridotite_relief_axe": "Péridotite Soulagement de la hache", - "block.mineralogy.peridotite_relief_blank": "Péridotite Relief vide", - "block.mineralogy.peridotite_relief_cross": "Péridotite Relief croisé", - "block.mineralogy.peridotite_relief_hammer": "Péridotite Soulagement marteau", - "block.mineralogy.peridotite_relief_hoe": "Péridotite Hoe Relief", - "block.mineralogy.peridotite_relief_horizontal": "Péridotite Relief horizontal", - "block.mineralogy.peridotite_relief_i": "Péridotite I Relief", - "block.mineralogy.peridotite_relief_left": "Péridotite Relief gauche", - "block.mineralogy.peridotite_relief_pickaxe": "Péridotite Relief de pioche", - "block.mineralogy.peridotite_relief_plus": "Péridotite Plus de soulagement", - "block.mineralogy.peridotite_relief_right": "Péridotite Bon soulagement", - "block.mineralogy.peridotite_relief_sword": "Péridotite Soulagement de l'épée", - "block.mineralogy.peridotite_relief_vertical": "Péridotite Relief vertical", - "block.mineralogy.basaltic_glass_relief_axe": "Verre basaltique Soulagement de la hache", - "block.mineralogy.basaltic_glass_relief_blank": "Verre basaltique Relief vide", - "block.mineralogy.basaltic_glass_relief_cross": "Verre basaltique Relief croisé", - "block.mineralogy.basaltic_glass_relief_hammer": "Verre basaltique Soulagement marteau", - "block.mineralogy.basaltic_glass_relief_hoe": "Verre basaltique Hoe Relief", - "block.mineralogy.basaltic_glass_relief_horizontal": "Verre basaltique Relief horizontal", - "block.mineralogy.basaltic_glass_relief_i": "Verre basaltique I Relief", - "block.mineralogy.basaltic_glass_relief_left": "Verre basaltique Relief gauche", - "block.mineralogy.basaltic_glass_relief_pickaxe": "Verre basaltique Relief de pioche", - "block.mineralogy.basaltic_glass_relief_plus": "Verre basaltique Plus de soulagement", - "block.mineralogy.basaltic_glass_relief_right": "Verre basaltique Bon soulagement", - "block.mineralogy.basaltic_glass_relief_sword": "Verre basaltique Soulagement de l'épée", - "block.mineralogy.basaltic_glass_relief_vertical": "Verre basaltique Relief vertical", - "block.mineralogy.scoria_relief_axe": "Scories Soulagement de la hache", - "block.mineralogy.scoria_relief_blank": "Scories Relief vide", - "block.mineralogy.scoria_relief_cross": "Scories Relief croisé", - "block.mineralogy.scoria_relief_hammer": "Scories Soulagement marteau", - "block.mineralogy.scoria_relief_hoe": "Scories Hoe Relief", - "block.mineralogy.scoria_relief_horizontal": "Scories Relief horizontal", - "block.mineralogy.scoria_relief_i": "Scories I Relief", - "block.mineralogy.scoria_relief_left": "Scories Relief gauche", - "block.mineralogy.scoria_relief_pickaxe": "Scories Relief de pioche", - "block.mineralogy.scoria_relief_plus": "Scories Plus de soulagement", - "block.mineralogy.scoria_relief_right": "Scories Bon soulagement", - "block.mineralogy.scoria_relief_sword": "Scories Soulagement de l'épée", - "block.mineralogy.scoria_relief_vertical": "Scories Relief vertical", - "block.mineralogy.tuff_relief_axe": "Tuf Soulagement de la hache", - "block.mineralogy.tuff_relief_blank": "Tuf Relief vide", - "block.mineralogy.tuff_relief_cross": "Tuf Relief croisé", - "block.mineralogy.tuff_relief_hammer": "Tuf Soulagement marteau", - "block.mineralogy.tuff_relief_hoe": "Tuf Hoe Relief", - "block.mineralogy.tuff_relief_horizontal": "Tuf Relief horizontal", - "block.mineralogy.tuff_relief_i": "Tuf I Relief", - "block.mineralogy.tuff_relief_left": "Tuf Relief gauche", - "block.mineralogy.tuff_relief_pickaxe": "Tuf Relief de pioche", - "block.mineralogy.tuff_relief_plus": "Tuf Plus de soulagement", - "block.mineralogy.tuff_relief_right": "Tuf Bon soulagement", - "block.mineralogy.tuff_relief_sword": "Tuf Soulagement de l'épée", - "block.mineralogy.tuff_relief_vertical": "Tuf Relief vertical", - "block.mineralogy.siltstone_relief_axe": "Pierre de terre Soulagement de la hache", - "block.mineralogy.siltstone_relief_blank": "Pierre de terre Relief vide", - "block.mineralogy.siltstone_relief_cross": "Pierre de terre Relief croisé", - "block.mineralogy.siltstone_relief_hammer": "Pierre de terre Soulagement marteau", - "block.mineralogy.siltstone_relief_hoe": "Pierre de terre Hoe Relief", - "block.mineralogy.siltstone_relief_horizontal": "Pierre de terre Relief horizontal", - "block.mineralogy.siltstone_relief_i": "Pierre de terre I Relief", - "block.mineralogy.siltstone_relief_left": "Pierre de terre Relief gauche", - "block.mineralogy.siltstone_relief_pickaxe": "Pierre de terre Relief de pioche", - "block.mineralogy.siltstone_relief_plus": "Pierre de terre Plus de soulagement", - "block.mineralogy.siltstone_relief_right": "Pierre de terre Bon soulagement", - "block.mineralogy.siltstone_relief_sword": "Pierre de terre Soulagement de l'épée", - "block.mineralogy.siltstone_relief_vertical": "Pierre de terre Relief vertical", - "block.mineralogy.rock_salt_relief_axe": "Sel gemme Soulagement de la hache", - "block.mineralogy.rock_salt_relief_blank": "Sel gemme Relief vide", - "block.mineralogy.rock_salt_relief_cross": "Sel gemme Relief croisé", - "block.mineralogy.rock_salt_relief_hammer": "Sel gemme Soulagement marteau", - "block.mineralogy.rock_salt_relief_hoe": "Sel gemme Hoe Relief", - "block.mineralogy.rock_salt_relief_horizontal": "Sel gemme Relief horizontal", - "block.mineralogy.rock_salt_relief_i": "Sel gemme I Relief", - "block.mineralogy.rock_salt_relief_left": "Sel gemme Relief gauche", - "block.mineralogy.rock_salt_relief_pickaxe": "Sel gemme Relief de pioche", - "block.mineralogy.rock_salt_relief_plus": "Sel gemme Plus de soulagement", - "block.mineralogy.rock_salt_relief_right": "Sel gemme Bon soulagement", - "block.mineralogy.rock_salt_relief_sword": "Sel gemme Soulagement de l'épée", - "block.mineralogy.rock_salt_relief_vertical": "Sel gemme Relief vertical", - "block.mineralogy.hornfels_relief_axe": "Hornfels Soulagement de la hache", - "block.mineralogy.hornfels_relief_blank": "Hornfels Relief vide", - "block.mineralogy.hornfels_relief_cross": "Hornfels Relief croisé", - "block.mineralogy.hornfels_relief_hammer": "Hornfels Soulagement marteau", - "block.mineralogy.hornfels_relief_hoe": "Hornfels Hoe Relief", - "block.mineralogy.hornfels_relief_horizontal": "Hornfels Relief horizontal", - "block.mineralogy.hornfels_relief_i": "Hornfels I Relief", - "block.mineralogy.hornfels_relief_left": "Hornfels Relief gauche", - "block.mineralogy.hornfels_relief_pickaxe": "Hornfels Relief de pioche", - "block.mineralogy.hornfels_relief_plus": "Hornfels Plus de soulagement", - "block.mineralogy.hornfels_relief_right": "Hornfels Bon soulagement", - "block.mineralogy.hornfels_relief_sword": "Hornfels Soulagement de l'épée", - "block.mineralogy.hornfels_relief_vertical": "Hornfels Relief vertical", - "block.mineralogy.quartzite_relief_axe": "Quartzite Soulagement de la hache", - "block.mineralogy.quartzite_relief_blank": "Quartzite Relief vide", - "block.mineralogy.quartzite_relief_cross": "Quartzite Relief croisé", - "block.mineralogy.quartzite_relief_hammer": "Quartzite Soulagement marteau", - "block.mineralogy.quartzite_relief_hoe": "Quartzite Hoe Relief", - "block.mineralogy.quartzite_relief_horizontal": "Quartzite Relief horizontal", - "block.mineralogy.quartzite_relief_i": "Quartzite I Relief", - "block.mineralogy.quartzite_relief_left": "Quartzite Relief gauche", - "block.mineralogy.quartzite_relief_pickaxe": "Quartzite Relief de pioche", - "block.mineralogy.quartzite_relief_plus": "Quartzite Plus de soulagement", - "block.mineralogy.quartzite_relief_right": "Quartzite Bon soulagement", - "block.mineralogy.quartzite_relief_sword": "Quartzite Soulagement de l'épée", - "block.mineralogy.quartzite_relief_vertical": "Quartzite Relief vertical", - "block.mineralogy.novaculite_relief_axe": "Novaculite Soulagement de la hache", - "block.mineralogy.novaculite_relief_blank": "Novaculite Relief vide", - "block.mineralogy.novaculite_relief_cross": "Novaculite Relief croisé", - "block.mineralogy.novaculite_relief_hammer": "Novaculite Soulagement marteau", - "block.mineralogy.novaculite_relief_hoe": "Novaculite Hoe Relief", - "block.mineralogy.novaculite_relief_horizontal": "Novaculite Relief horizontal", - "block.mineralogy.novaculite_relief_i": "Novaculite I Relief", - "block.mineralogy.novaculite_relief_left": "Novaculite Relief gauche", - "block.mineralogy.novaculite_relief_pickaxe": "Novaculite Relief de pioche", - "block.mineralogy.novaculite_relief_plus": "Novaculite Plus de soulagement", - "block.mineralogy.novaculite_relief_right": "Novaculite Bon soulagement", - "block.mineralogy.novaculite_relief_sword": "Novaculite Soulagement de l'épée", - "block.mineralogy.novaculite_relief_vertical": "Novaculite Relief vertical", - "itemGroup.mineralogy.mineralogy": "Minéralogie" + "block.mineralogy.rocksaltlamp": "Lampe en sel gemme", + "block.mineralogy.rocksaltstreetlamp": "Réverbère en sel gemme", + "block.mineralogy.andesite_relief_axe": "Bas-relief en Andésite (hache)", + "block.mineralogy.andesite_relief_blank": "Bas-relief en Andésite (sans motif)", + "block.mineralogy.andesite_relief_cross": "Bas-relief en Andésite (croix)", + "block.mineralogy.andesite_relief_hammer": "Bas-relief en Andésite (marteau)", + "block.mineralogy.andesite_relief_hoe": "Bas-relief en Andésite (houe)", + "block.mineralogy.andesite_relief_horizontal": "Bas-relief en Andésite (horizontal)", + "block.mineralogy.andesite_relief_i": "Bas-relief en Andésite (I)", + "block.mineralogy.andesite_relief_left": "Bas-relief en Andésite (gauche)", + "block.mineralogy.andesite_relief_pickaxe": "Bas-relief en Andésite (pioche)", + "block.mineralogy.andesite_relief_plus": "Bas-relief en Andésite (signe plus)", + "block.mineralogy.andesite_relief_right": "Bas-relief en Andésite (droite)", + "block.mineralogy.andesite_relief_sword": "Bas-relief en Andésite (épée)", + "block.mineralogy.andesite_relief_vertical": "Bas-relief en Andésite (vertical)", + "block.mineralogy.basalt_relief_axe": "Bas-relief en Basalte (hache)", + "block.mineralogy.basalt_relief_blank": "Bas-relief en Basalte (sans motif)", + "block.mineralogy.basalt_relief_cross": "Bas-relief en Basalte (croix)", + "block.mineralogy.basalt_relief_hammer": "Bas-relief en Basalte (marteau)", + "block.mineralogy.basalt_relief_hoe": "Bas-relief en Basalte (houe)", + "block.mineralogy.basalt_relief_horizontal": "Bas-relief en Basalte (horizontal)", + "block.mineralogy.basalt_relief_i": "Bas-relief en Basalte (I)", + "block.mineralogy.basalt_relief_left": "Bas-relief en Basalte (gauche)", + "block.mineralogy.basalt_relief_pickaxe": "Bas-relief en Basalte (pioche)", + "block.mineralogy.basalt_relief_plus": "Bas-relief en Basalte (signe plus)", + "block.mineralogy.basalt_relief_right": "Bas-relief en Basalte (droite)", + "block.mineralogy.basalt_relief_sword": "Bas-relief en Basalte (épée)", + "block.mineralogy.basalt_relief_vertical": "Bas-relief en Basalte (vertical)", + "block.mineralogy.diorite_relief_axe": "Bas-relief en Diorite (hache)", + "block.mineralogy.diorite_relief_blank": "Bas-relief en Diorite (sans motif)", + "block.mineralogy.diorite_relief_cross": "Bas-relief en Diorite (croix)", + "block.mineralogy.diorite_relief_hammer": "Bas-relief en Diorite (marteau)", + "block.mineralogy.diorite_relief_hoe": "Bas-relief en Diorite (houe)", + "block.mineralogy.diorite_relief_horizontal": "Bas-relief en Diorite (horizontal)", + "block.mineralogy.diorite_relief_i": "Bas-relief en Diorite (I)", + "block.mineralogy.diorite_relief_left": "Bas-relief en Diorite (gauche)", + "block.mineralogy.diorite_relief_pickaxe": "Bas-relief en Diorite (pioche)", + "block.mineralogy.diorite_relief_plus": "Bas-relief en Diorite (signe plus)", + "block.mineralogy.diorite_relief_right": "Bas-relief en Diorite (droite)", + "block.mineralogy.diorite_relief_sword": "Bas-relief en Diorite (épée)", + "block.mineralogy.diorite_relief_vertical": "Bas-relief en Diorite (vertical)", + "block.mineralogy.granite_relief_axe": "Bas-relief en Granite (hache)", + "block.mineralogy.granite_relief_blank": "Bas-relief en Granite (sans motif)", + "block.mineralogy.granite_relief_cross": "Bas-relief en Granite (croix)", + "block.mineralogy.granite_relief_hammer": "Bas-relief en Granite (marteau)", + "block.mineralogy.granite_relief_hoe": "Bas-relief en Granite (houe)", + "block.mineralogy.granite_relief_horizontal": "Bas-relief en Granite (horizontal)", + "block.mineralogy.granite_relief_i": "Bas-relief en Granite (I)", + "block.mineralogy.granite_relief_left": "Bas-relief en Granite (gauche)", + "block.mineralogy.granite_relief_pickaxe": "Bas-relief en Granite (pioche)", + "block.mineralogy.granite_relief_plus": "Bas-relief en Granite (signe plus)", + "block.mineralogy.granite_relief_right": "Bas-relief en Granite (droite)", + "block.mineralogy.granite_relief_sword": "Bas-relief en Granite (épée)", + "block.mineralogy.granite_relief_vertical": "Bas-relief en Granite (vertical)", + "block.mineralogy.rhyolite_relief_axe": "Bas-relief en Rhyolite (hache)", + "block.mineralogy.rhyolite_relief_blank": "Bas-relief en Rhyolite (sans motif)", + "block.mineralogy.rhyolite_relief_cross": "Bas-relief en Rhyolite (croix)", + "block.mineralogy.rhyolite_relief_hammer": "Bas-relief en Rhyolite (marteau)", + "block.mineralogy.rhyolite_relief_hoe": "Bas-relief en Rhyolite (houe)", + "block.mineralogy.rhyolite_relief_horizontal": "Bas-relief en Rhyolite (horizontal)", + "block.mineralogy.rhyolite_relief_i": "Bas-relief en Rhyolite (I)", + "block.mineralogy.rhyolite_relief_left": "Bas-relief en Rhyolite (gauche)", + "block.mineralogy.rhyolite_relief_pickaxe": "Bas-relief en Rhyolite (pioche)", + "block.mineralogy.rhyolite_relief_plus": "Bas-relief en Rhyolite (signe plus)", + "block.mineralogy.rhyolite_relief_right": "Bas-relief en Rhyolite (droite)", + "block.mineralogy.rhyolite_relief_sword": "Bas-relief en Rhyolite (épée)", + "block.mineralogy.rhyolite_relief_vertical": "Bas-relief en Rhyolite (vertical)", + "block.mineralogy.pegmatite_relief_axe": "Bas-relief en Pegmatite (hache)", + "block.mineralogy.pegmatite_relief_blank": "Bas-relief en Pegmatite (sans motif)", + "block.mineralogy.pegmatite_relief_cross": "Bas-relief en Pegmatite (croix)", + "block.mineralogy.pegmatite_relief_hammer": "Bas-relief en Pegmatite (marteau)", + "block.mineralogy.pegmatite_relief_hoe": "Bas-relief en Pegmatite (houe)", + "block.mineralogy.pegmatite_relief_horizontal": "Bas-relief en Pegmatite (horizontal)", + "block.mineralogy.pegmatite_relief_i": "Bas-relief en Pegmatite (I)", + "block.mineralogy.pegmatite_relief_left": "Bas-relief en Pegmatite (gauche)", + "block.mineralogy.pegmatite_relief_pickaxe": "Bas-relief en Pegmatite (pioche)", + "block.mineralogy.pegmatite_relief_plus": "Bas-relief en Pegmatite (signe plus)", + "block.mineralogy.pegmatite_relief_right": "Bas-relief en Pegmatite (droite)", + "block.mineralogy.pegmatite_relief_sword": "Bas-relief en Pegmatite (épée)", + "block.mineralogy.pegmatite_relief_vertical": "Bas-relief en Pegmatite (vertical)", + "block.mineralogy.shale_relief_axe": "Bas-relief en Schiste argileux (hache)", + "block.mineralogy.shale_relief_blank": "Bas-relief en Schiste argileux (sans motif)", + "block.mineralogy.shale_relief_cross": "Bas-relief en Schiste argileux (croix)", + "block.mineralogy.shale_relief_hammer": "Bas-relief en Schiste argileux (marteau)", + "block.mineralogy.shale_relief_hoe": "Bas-relief en Schiste argileux (houe)", + "block.mineralogy.shale_relief_horizontal": "Bas-relief en Schiste argileux (horizontal)", + "block.mineralogy.shale_relief_i": "Bas-relief en Schiste argileux (I)", + "block.mineralogy.shale_relief_left": "Bas-relief en Schiste argileux (gauche)", + "block.mineralogy.shale_relief_pickaxe": "Bas-relief en Schiste argileux (pioche)", + "block.mineralogy.shale_relief_plus": "Bas-relief en Schiste argileux (signe plus)", + "block.mineralogy.shale_relief_right": "Bas-relief en Schiste argileux (droite)", + "block.mineralogy.shale_relief_sword": "Bas-relief en Schiste argileux (épée)", + "block.mineralogy.shale_relief_vertical": "Bas-relief en Schiste argileux (vertical)", + "block.mineralogy.conglomerate_relief_axe": "Bas-relief en Conglomérat (hache)", + "block.mineralogy.conglomerate_relief_blank": "Bas-relief en Conglomérat (sans motif)", + "block.mineralogy.conglomerate_relief_cross": "Bas-relief en Conglomérat (croix)", + "block.mineralogy.conglomerate_relief_hammer": "Bas-relief en Conglomérat (marteau)", + "block.mineralogy.conglomerate_relief_hoe": "Bas-relief en Conglomérat (houe)", + "block.mineralogy.conglomerate_relief_horizontal": "Bas-relief en Conglomérat (horizontal)", + "block.mineralogy.conglomerate_relief_i": "Bas-relief en Conglomérat (I)", + "block.mineralogy.conglomerate_relief_left": "Bas-relief en Conglomérat (gauche)", + "block.mineralogy.conglomerate_relief_pickaxe": "Bas-relief en Conglomérat (pioche)", + "block.mineralogy.conglomerate_relief_plus": "Bas-relief en Conglomérat (signe plus)", + "block.mineralogy.conglomerate_relief_right": "Bas-relief en Conglomérat (droite)", + "block.mineralogy.conglomerate_relief_sword": "Bas-relief en Conglomérat (épée)", + "block.mineralogy.conglomerate_relief_vertical": "Bas-relief en Conglomérat (vertical)", + "block.mineralogy.dolomite_relief_axe": "Bas-relief en Dolomie (hache)", + "block.mineralogy.dolomite_relief_blank": "Bas-relief en Dolomie (sans motif)", + "block.mineralogy.dolomite_relief_cross": "Bas-relief en Dolomie (croix)", + "block.mineralogy.dolomite_relief_hammer": "Bas-relief en Dolomie (marteau)", + "block.mineralogy.dolomite_relief_hoe": "Bas-relief en Dolomie (houe)", + "block.mineralogy.dolomite_relief_horizontal": "Bas-relief en Dolomie (horizontal)", + "block.mineralogy.dolomite_relief_i": "Bas-relief en Dolomie (I)", + "block.mineralogy.dolomite_relief_left": "Bas-relief en Dolomie (gauche)", + "block.mineralogy.dolomite_relief_pickaxe": "Bas-relief en Dolomie (pioche)", + "block.mineralogy.dolomite_relief_plus": "Bas-relief en Dolomie (signe plus)", + "block.mineralogy.dolomite_relief_right": "Bas-relief en Dolomie (droite)", + "block.mineralogy.dolomite_relief_sword": "Bas-relief en Dolomie (épée)", + "block.mineralogy.dolomite_relief_vertical": "Bas-relief en Dolomie (vertical)", + "block.mineralogy.limestone_relief_axe": "Bas-relief en Calcaire (hache)", + "block.mineralogy.limestone_relief_blank": "Bas-relief en Calcaire (sans motif)", + "block.mineralogy.limestone_relief_cross": "Bas-relief en Calcaire (croix)", + "block.mineralogy.limestone_relief_hammer": "Bas-relief en Calcaire (marteau)", + "block.mineralogy.limestone_relief_hoe": "Bas-relief en Calcaire (houe)", + "block.mineralogy.limestone_relief_horizontal": "Bas-relief en Calcaire (horizontal)", + "block.mineralogy.limestone_relief_i": "Bas-relief en Calcaire (I)", + "block.mineralogy.limestone_relief_left": "Bas-relief en Calcaire (gauche)", + "block.mineralogy.limestone_relief_pickaxe": "Bas-relief en Calcaire (pioche)", + "block.mineralogy.limestone_relief_plus": "Bas-relief en Calcaire (signe plus)", + "block.mineralogy.limestone_relief_right": "Bas-relief en Calcaire (droite)", + "block.mineralogy.limestone_relief_sword": "Bas-relief en Calcaire (épée)", + "block.mineralogy.limestone_relief_vertical": "Bas-relief en Calcaire (vertical)", + "block.mineralogy.marble_relief_axe": "Bas-relief en Marbre (hache)", + "block.mineralogy.marble_relief_blank": "Bas-relief en Marbre (sans motif)", + "block.mineralogy.marble_relief_cross": "Bas-relief en Marbre (croix)", + "block.mineralogy.marble_relief_hammer": "Bas-relief en Marbre (marteau)", + "block.mineralogy.marble_relief_hoe": "Bas-relief en Marbre (houe)", + "block.mineralogy.marble_relief_horizontal": "Bas-relief en Marbre (horizontal)", + "block.mineralogy.marble_relief_i": "Bas-relief en Marbre (I)", + "block.mineralogy.marble_relief_left": "Bas-relief en Marbre (gauche)", + "block.mineralogy.marble_relief_pickaxe": "Bas-relief en Marbre (pioche)", + "block.mineralogy.marble_relief_plus": "Bas-relief en Marbre (signe plus)", + "block.mineralogy.marble_relief_right": "Bas-relief en Marbre (droite)", + "block.mineralogy.marble_relief_sword": "Bas-relief en Marbre (épée)", + "block.mineralogy.marble_relief_vertical": "Bas-relief en Marbre (vertical)", + "block.mineralogy.slate_relief_axe": "Bas-relief en Ardoise (hache)", + "block.mineralogy.slate_relief_blank": "Bas-relief en Ardoise (sans motif)", + "block.mineralogy.slate_relief_cross": "Bas-relief en Ardoise (croix)", + "block.mineralogy.slate_relief_hammer": "Bas-relief en Ardoise (marteau)", + "block.mineralogy.slate_relief_hoe": "Bas-relief en Ardoise (houe)", + "block.mineralogy.slate_relief_horizontal": "Bas-relief en Ardoise (horizontal)", + "block.mineralogy.slate_relief_i": "Bas-relief en Ardoise (I)", + "block.mineralogy.slate_relief_left": "Bas-relief en Ardoise (gauche)", + "block.mineralogy.slate_relief_pickaxe": "Bas-relief en Ardoise (pioche)", + "block.mineralogy.slate_relief_plus": "Bas-relief en Ardoise (signe plus)", + "block.mineralogy.slate_relief_right": "Bas-relief en Ardoise (droite)", + "block.mineralogy.slate_relief_sword": "Bas-relief en Ardoise (épée)", + "block.mineralogy.slate_relief_vertical": "Bas-relief en Ardoise (vertical)", + "block.mineralogy.schist_relief_axe": "Bas-relief en Micaschiste (hache)", + "block.mineralogy.schist_relief_blank": "Bas-relief en Micaschiste (sans motif)", + "block.mineralogy.schist_relief_cross": "Bas-relief en Micaschiste (croix)", + "block.mineralogy.schist_relief_hammer": "Bas-relief en Micaschiste (marteau)", + "block.mineralogy.schist_relief_hoe": "Bas-relief en Micaschiste (houe)", + "block.mineralogy.schist_relief_horizontal": "Bas-relief en Micaschiste (horizontal)", + "block.mineralogy.schist_relief_i": "Bas-relief en Micaschiste (I)", + "block.mineralogy.schist_relief_left": "Bas-relief en Micaschiste (gauche)", + "block.mineralogy.schist_relief_pickaxe": "Bas-relief en Micaschiste (pioche)", + "block.mineralogy.schist_relief_plus": "Bas-relief en Micaschiste (signe plus)", + "block.mineralogy.schist_relief_right": "Bas-relief en Micaschiste (droite)", + "block.mineralogy.schist_relief_sword": "Bas-relief en Micaschiste (épée)", + "block.mineralogy.schist_relief_vertical": "Bas-relief en Micaschiste (vertical)", + "block.mineralogy.gneiss_relief_axe": "Bas-relief en Gneiss (hache)", + "block.mineralogy.gneiss_relief_blank": "Bas-relief en Gneiss (sans motif)", + "block.mineralogy.gneiss_relief_cross": "Bas-relief en Gneiss (croix)", + "block.mineralogy.gneiss_relief_hammer": "Bas-relief en Gneiss (marteau)", + "block.mineralogy.gneiss_relief_hoe": "Bas-relief en Gneiss (houe)", + "block.mineralogy.gneiss_relief_horizontal": "Bas-relief en Gneiss (horizontal)", + "block.mineralogy.gneiss_relief_i": "Bas-relief en Gneiss (I)", + "block.mineralogy.gneiss_relief_left": "Bas-relief en Gneiss (gauche)", + "block.mineralogy.gneiss_relief_pickaxe": "Bas-relief en Gneiss (pioche)", + "block.mineralogy.gneiss_relief_plus": "Bas-relief en Gneiss (signe plus)", + "block.mineralogy.gneiss_relief_right": "Bas-relief en Gneiss (droite)", + "block.mineralogy.gneiss_relief_sword": "Bas-relief en Gneiss (épée)", + "block.mineralogy.gneiss_relief_vertical": "Bas-relief en Gneiss (vertical)", + "block.mineralogy.phyllite_relief_axe": "Bas-relief en Phyllade (hache)", + "block.mineralogy.phyllite_relief_blank": "Bas-relief en Phyllade (sans motif)", + "block.mineralogy.phyllite_relief_cross": "Bas-relief en Phyllade (croix)", + "block.mineralogy.phyllite_relief_hammer": "Bas-relief en Phyllade (marteau)", + "block.mineralogy.phyllite_relief_hoe": "Bas-relief en Phyllade (houe)", + "block.mineralogy.phyllite_relief_horizontal": "Bas-relief en Phyllade (horizontal)", + "block.mineralogy.phyllite_relief_i": "Bas-relief en Phyllade (I)", + "block.mineralogy.phyllite_relief_left": "Bas-relief en Phyllade (gauche)", + "block.mineralogy.phyllite_relief_pickaxe": "Bas-relief en Phyllade (pioche)", + "block.mineralogy.phyllite_relief_plus": "Bas-relief en Phyllade (signe plus)", + "block.mineralogy.phyllite_relief_right": "Bas-relief en Phyllade (droite)", + "block.mineralogy.phyllite_relief_sword": "Bas-relief en Phyllade (épée)", + "block.mineralogy.phyllite_relief_vertical": "Bas-relief en Phyllade (vertical)", + "block.mineralogy.amphibolite_relief_axe": "Bas-relief en Amphibolite (hache)", + "block.mineralogy.amphibolite_relief_blank": "Bas-relief en Amphibolite (sans motif)", + "block.mineralogy.amphibolite_relief_cross": "Bas-relief en Amphibolite (croix)", + "block.mineralogy.amphibolite_relief_hammer": "Bas-relief en Amphibolite (marteau)", + "block.mineralogy.amphibolite_relief_hoe": "Bas-relief en Amphibolite (houe)", + "block.mineralogy.amphibolite_relief_horizontal": "Bas-relief en Amphibolite (horizontal)", + "block.mineralogy.amphibolite_relief_i": "Bas-relief en Amphibolite (I)", + "block.mineralogy.amphibolite_relief_left": "Bas-relief en Amphibolite (gauche)", + "block.mineralogy.amphibolite_relief_pickaxe": "Bas-relief en Amphibolite (pioche)", + "block.mineralogy.amphibolite_relief_plus": "Bas-relief en Amphibolite (signe plus)", + "block.mineralogy.amphibolite_relief_right": "Bas-relief en Amphibolite (droite)", + "block.mineralogy.amphibolite_relief_sword": "Bas-relief en Amphibolite (épée)", + "block.mineralogy.amphibolite_relief_vertical": "Bas-relief en Amphibolite (vertical)", + "block.mineralogy.diabase_relief_axe": "Bas-relief en Diabase (hache)", + "block.mineralogy.diabase_relief_blank": "Bas-relief en Diabase (sans motif)", + "block.mineralogy.diabase_relief_cross": "Bas-relief en Diabase (croix)", + "block.mineralogy.diabase_relief_hammer": "Bas-relief en Diabase (marteau)", + "block.mineralogy.diabase_relief_hoe": "Bas-relief en Diabase (houe)", + "block.mineralogy.diabase_relief_horizontal": "Bas-relief en Diabase (horizontal)", + "block.mineralogy.diabase_relief_i": "Bas-relief en Diabase (I)", + "block.mineralogy.diabase_relief_left": "Bas-relief en Diabase (gauche)", + "block.mineralogy.diabase_relief_pickaxe": "Bas-relief en Diabase (pioche)", + "block.mineralogy.diabase_relief_plus": "Bas-relief en Diabase (signe plus)", + "block.mineralogy.diabase_relief_right": "Bas-relief en Diabase (droite)", + "block.mineralogy.diabase_relief_sword": "Bas-relief en Diabase (épée)", + "block.mineralogy.diabase_relief_vertical": "Bas-relief en Diabase (vertical)", + "block.mineralogy.gabbro_relief_axe": "Bas-relief en Gabbro (hache)", + "block.mineralogy.gabbro_relief_blank": "Bas-relief en Gabbro (sans motif)", + "block.mineralogy.gabbro_relief_cross": "Bas-relief en Gabbro (croix)", + "block.mineralogy.gabbro_relief_hammer": "Bas-relief en Gabbro (marteau)", + "block.mineralogy.gabbro_relief_hoe": "Bas-relief en Gabbro (houe)", + "block.mineralogy.gabbro_relief_horizontal": "Bas-relief en Gabbro (horizontal)", + "block.mineralogy.gabbro_relief_i": "Bas-relief en Gabbro (I)", + "block.mineralogy.gabbro_relief_left": "Bas-relief en Gabbro (gauche)", + "block.mineralogy.gabbro_relief_pickaxe": "Bas-relief en Gabbro (pioche)", + "block.mineralogy.gabbro_relief_plus": "Bas-relief en Gabbro (signe plus)", + "block.mineralogy.gabbro_relief_right": "Bas-relief en Gabbro (droite)", + "block.mineralogy.gabbro_relief_sword": "Bas-relief en Gabbro (épée)", + "block.mineralogy.gabbro_relief_vertical": "Bas-relief en Gabbro (vertical)", + "block.mineralogy.peridotite_relief_axe": "Bas-relief en Péridotite (hache)", + "block.mineralogy.peridotite_relief_blank": "Bas-relief en Péridotite (sans motif)", + "block.mineralogy.peridotite_relief_cross": "Bas-relief en Péridotite (croix)", + "block.mineralogy.peridotite_relief_hammer": "Bas-relief en Péridotite (marteau)", + "block.mineralogy.peridotite_relief_hoe": "Bas-relief en Péridotite (houe)", + "block.mineralogy.peridotite_relief_horizontal": "Bas-relief en Péridotite (horizontal)", + "block.mineralogy.peridotite_relief_i": "Bas-relief en Péridotite (I)", + "block.mineralogy.peridotite_relief_left": "Bas-relief en Péridotite (gauche)", + "block.mineralogy.peridotite_relief_pickaxe": "Bas-relief en Péridotite (pioche)", + "block.mineralogy.peridotite_relief_plus": "Bas-relief en Péridotite (signe plus)", + "block.mineralogy.peridotite_relief_right": "Bas-relief en Péridotite (droite)", + "block.mineralogy.peridotite_relief_sword": "Bas-relief en Péridotite (épée)", + "block.mineralogy.peridotite_relief_vertical": "Bas-relief en Péridotite (vertical)", + "block.mineralogy.basaltic_glass_relief_axe": "Bas-relief en Verre basaltique (hache)", + "block.mineralogy.basaltic_glass_relief_blank": "Bas-relief en Verre basaltique (sans motif)", + "block.mineralogy.basaltic_glass_relief_cross": "Bas-relief en Verre basaltique (croix)", + "block.mineralogy.basaltic_glass_relief_hammer": "Bas-relief en Verre basaltique (marteau)", + "block.mineralogy.basaltic_glass_relief_hoe": "Bas-relief en Verre basaltique (houe)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Bas-relief en Verre basaltique (horizontal)", + "block.mineralogy.basaltic_glass_relief_i": "Bas-relief en Verre basaltique (I)", + "block.mineralogy.basaltic_glass_relief_left": "Bas-relief en Verre basaltique (gauche)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Bas-relief en Verre basaltique (pioche)", + "block.mineralogy.basaltic_glass_relief_plus": "Bas-relief en Verre basaltique (signe plus)", + "block.mineralogy.basaltic_glass_relief_right": "Bas-relief en Verre basaltique (droite)", + "block.mineralogy.basaltic_glass_relief_sword": "Bas-relief en Verre basaltique (épée)", + "block.mineralogy.basaltic_glass_relief_vertical": "Bas-relief en Verre basaltique (vertical)", + "block.mineralogy.scoria_relief_axe": "Bas-relief en Scorie (hache)", + "block.mineralogy.scoria_relief_blank": "Bas-relief en Scorie (sans motif)", + "block.mineralogy.scoria_relief_cross": "Bas-relief en Scorie (croix)", + "block.mineralogy.scoria_relief_hammer": "Bas-relief en Scorie (marteau)", + "block.mineralogy.scoria_relief_hoe": "Bas-relief en Scorie (houe)", + "block.mineralogy.scoria_relief_horizontal": "Bas-relief en Scorie (horizontal)", + "block.mineralogy.scoria_relief_i": "Bas-relief en Scorie (I)", + "block.mineralogy.scoria_relief_left": "Bas-relief en Scorie (gauche)", + "block.mineralogy.scoria_relief_pickaxe": "Bas-relief en Scorie (pioche)", + "block.mineralogy.scoria_relief_plus": "Bas-relief en Scorie (signe plus)", + "block.mineralogy.scoria_relief_right": "Bas-relief en Scorie (droite)", + "block.mineralogy.scoria_relief_sword": "Bas-relief en Scorie (épée)", + "block.mineralogy.scoria_relief_vertical": "Bas-relief en Scorie (vertical)", + "block.mineralogy.tuff_relief_axe": "Bas-relief en Tuf (hache)", + "block.mineralogy.tuff_relief_blank": "Bas-relief en Tuf (sans motif)", + "block.mineralogy.tuff_relief_cross": "Bas-relief en Tuf (croix)", + "block.mineralogy.tuff_relief_hammer": "Bas-relief en Tuf (marteau)", + "block.mineralogy.tuff_relief_hoe": "Bas-relief en Tuf (houe)", + "block.mineralogy.tuff_relief_horizontal": "Bas-relief en Tuf (horizontal)", + "block.mineralogy.tuff_relief_i": "Bas-relief en Tuf (I)", + "block.mineralogy.tuff_relief_left": "Bas-relief en Tuf (gauche)", + "block.mineralogy.tuff_relief_pickaxe": "Bas-relief en Tuf (pioche)", + "block.mineralogy.tuff_relief_plus": "Bas-relief en Tuf (signe plus)", + "block.mineralogy.tuff_relief_right": "Bas-relief en Tuf (droite)", + "block.mineralogy.tuff_relief_sword": "Bas-relief en Tuf (épée)", + "block.mineralogy.tuff_relief_vertical": "Bas-relief en Tuf (vertical)", + "block.mineralogy.siltstone_relief_axe": "Bas-relief en Siltite (hache)", + "block.mineralogy.siltstone_relief_blank": "Bas-relief en Siltite (sans motif)", + "block.mineralogy.siltstone_relief_cross": "Bas-relief en Siltite (croix)", + "block.mineralogy.siltstone_relief_hammer": "Bas-relief en Siltite (marteau)", + "block.mineralogy.siltstone_relief_hoe": "Bas-relief en Siltite (houe)", + "block.mineralogy.siltstone_relief_horizontal": "Bas-relief en Siltite (horizontal)", + "block.mineralogy.siltstone_relief_i": "Bas-relief en Siltite (I)", + "block.mineralogy.siltstone_relief_left": "Bas-relief en Siltite (gauche)", + "block.mineralogy.siltstone_relief_pickaxe": "Bas-relief en Siltite (pioche)", + "block.mineralogy.siltstone_relief_plus": "Bas-relief en Siltite (signe plus)", + "block.mineralogy.siltstone_relief_right": "Bas-relief en Siltite (droite)", + "block.mineralogy.siltstone_relief_sword": "Bas-relief en Siltite (épée)", + "block.mineralogy.siltstone_relief_vertical": "Bas-relief en Siltite (vertical)", + "block.mineralogy.rock_salt_relief_axe": "Bas-relief en Sel gemme (hache)", + "block.mineralogy.rock_salt_relief_blank": "Bas-relief en Sel gemme (sans motif)", + "block.mineralogy.rock_salt_relief_cross": "Bas-relief en Sel gemme (croix)", + "block.mineralogy.rock_salt_relief_hammer": "Bas-relief en Sel gemme (marteau)", + "block.mineralogy.rock_salt_relief_hoe": "Bas-relief en Sel gemme (houe)", + "block.mineralogy.rock_salt_relief_horizontal": "Bas-relief en Sel gemme (horizontal)", + "block.mineralogy.rock_salt_relief_i": "Bas-relief en Sel gemme (I)", + "block.mineralogy.rock_salt_relief_left": "Bas-relief en Sel gemme (gauche)", + "block.mineralogy.rock_salt_relief_pickaxe": "Bas-relief en Sel gemme (pioche)", + "block.mineralogy.rock_salt_relief_plus": "Bas-relief en Sel gemme (signe plus)", + "block.mineralogy.rock_salt_relief_right": "Bas-relief en Sel gemme (droite)", + "block.mineralogy.rock_salt_relief_sword": "Bas-relief en Sel gemme (épée)", + "block.mineralogy.rock_salt_relief_vertical": "Bas-relief en Sel gemme (vertical)", + "block.mineralogy.hornfels_relief_axe": "Bas-relief en Cornéenne (hache)", + "block.mineralogy.hornfels_relief_blank": "Bas-relief en Cornéenne (sans motif)", + "block.mineralogy.hornfels_relief_cross": "Bas-relief en Cornéenne (croix)", + "block.mineralogy.hornfels_relief_hammer": "Bas-relief en Cornéenne (marteau)", + "block.mineralogy.hornfels_relief_hoe": "Bas-relief en Cornéenne (houe)", + "block.mineralogy.hornfels_relief_horizontal": "Bas-relief en Cornéenne (horizontal)", + "block.mineralogy.hornfels_relief_i": "Bas-relief en Cornéenne (I)", + "block.mineralogy.hornfels_relief_left": "Bas-relief en Cornéenne (gauche)", + "block.mineralogy.hornfels_relief_pickaxe": "Bas-relief en Cornéenne (pioche)", + "block.mineralogy.hornfels_relief_plus": "Bas-relief en Cornéenne (signe plus)", + "block.mineralogy.hornfels_relief_right": "Bas-relief en Cornéenne (droite)", + "block.mineralogy.hornfels_relief_sword": "Bas-relief en Cornéenne (épée)", + "block.mineralogy.hornfels_relief_vertical": "Bas-relief en Cornéenne (vertical)", + "block.mineralogy.quartzite_relief_axe": "Bas-relief en Quartzite (hache)", + "block.mineralogy.quartzite_relief_blank": "Bas-relief en Quartzite (sans motif)", + "block.mineralogy.quartzite_relief_cross": "Bas-relief en Quartzite (croix)", + "block.mineralogy.quartzite_relief_hammer": "Bas-relief en Quartzite (marteau)", + "block.mineralogy.quartzite_relief_hoe": "Bas-relief en Quartzite (houe)", + "block.mineralogy.quartzite_relief_horizontal": "Bas-relief en Quartzite (horizontal)", + "block.mineralogy.quartzite_relief_i": "Bas-relief en Quartzite (I)", + "block.mineralogy.quartzite_relief_left": "Bas-relief en Quartzite (gauche)", + "block.mineralogy.quartzite_relief_pickaxe": "Bas-relief en Quartzite (pioche)", + "block.mineralogy.quartzite_relief_plus": "Bas-relief en Quartzite (signe plus)", + "block.mineralogy.quartzite_relief_right": "Bas-relief en Quartzite (droite)", + "block.mineralogy.quartzite_relief_sword": "Bas-relief en Quartzite (épée)", + "block.mineralogy.quartzite_relief_vertical": "Bas-relief en Quartzite (vertical)", + "block.mineralogy.novaculite_relief_axe": "Bas-relief en Novaculite (hache)", + "block.mineralogy.novaculite_relief_blank": "Bas-relief en Novaculite (sans motif)", + "block.mineralogy.novaculite_relief_cross": "Bas-relief en Novaculite (croix)", + "block.mineralogy.novaculite_relief_hammer": "Bas-relief en Novaculite (marteau)", + "block.mineralogy.novaculite_relief_hoe": "Bas-relief en Novaculite (houe)", + "block.mineralogy.novaculite_relief_horizontal": "Bas-relief en Novaculite (horizontal)", + "block.mineralogy.novaculite_relief_i": "Bas-relief en Novaculite (I)", + "block.mineralogy.novaculite_relief_left": "Bas-relief en Novaculite (gauche)", + "block.mineralogy.novaculite_relief_pickaxe": "Bas-relief en Novaculite (pioche)", + "block.mineralogy.novaculite_relief_plus": "Bas-relief en Novaculite (signe plus)", + "block.mineralogy.novaculite_relief_right": "Bas-relief en Novaculite (droite)", + "block.mineralogy.novaculite_relief_sword": "Bas-relief en Novaculite (épée)", + "block.mineralogy.novaculite_relief_vertical": "Bas-relief en Novaculite (vertical)", + "itemGroup.mineralogy.mineralogy": "Minéralogie", + "itemGroup.mineralogy.rock": "Roches de Minéralogie", + "itemGroup.mineralogy.stair": "Escaliers de Minéralogie", + "itemGroup.mineralogy.slab": "Dalles de Minéralogie", + "itemGroup.mineralogy.wall": "Murets de Minéralogie", + "itemGroup.mineralogy.item": "Objets de Minéralogie", + "block.mineralogy.crude_oil": "Pétrole brut", + "item.mineralogy.crude_oil_bucket": "Seau de pétrole brut", + "fluid.mineralogy.crude_oil": "Pétrole brut", + "advancements.mineralogy.all_the_rocks.title": "Toutes les roches", + "advancements.mineralogy.all_the_rocks.description": "Vous avez trouvé tous les types de roches standard de Mineralogy !" } diff --git a/src/main/resources/assets/mineralogy/lang/ja_jp.json b/src/main/resources/assets/mineralogy/lang/ja_jp.json new file mode 100644 index 000000000..16f64de12 --- /dev/null +++ b/src/main/resources/assets/mineralogy/lang/ja_jp.json @@ -0,0 +1,940 @@ +{ + "block.mineralogy.andesite": "安山岩", + "block.mineralogy.andesite_stairs": "安山岩ã®éšŽæ®µ", + "block.mineralogy.andesite_slab": "安山岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.andesite_brick": "安山岩レンガ", + "block.mineralogy.andesite_brick_stairs": "安山岩レンガã®éšŽæ®µ", + "block.mineralogy.andesite_brick_slab": "安山岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.andesite_smooth": "磨ã‹ã‚ŒãŸå®‰å±±å²©", + "block.mineralogy.andesite_smooth_stairs": "磨ã‹ã‚ŒãŸå®‰å±±å²©ã®éšŽæ®µ", + "block.mineralogy.andesite_smooth_slab": "磨ã‹ã‚ŒãŸå®‰å±±å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.andesite_smooth_brick": "磨ã‹ã‚ŒãŸå®‰å±±å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.andesite_smooth_brick_stairs": "磨ã‹ã‚ŒãŸå®‰å±±å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.andesite_smooth_brick_slab": "磨ã‹ã‚ŒãŸå®‰å±±å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.basalt": "玄武岩", + "block.mineralogy.basalt_stairs": "玄武岩ã®éšŽæ®µ", + "block.mineralogy.basalt_slab": "玄武岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.basalt_brick": "玄武岩レンガ", + "block.mineralogy.basalt_brick_stairs": "玄武岩レンガã®éšŽæ®µ", + "block.mineralogy.basalt_brick_slab": "玄武岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.basalt_smooth": "磨ã‹ã‚ŒãŸçŽ„武岩", + "block.mineralogy.basalt_smooth_stairs": "磨ã‹ã‚ŒãŸçŽ„武岩ã®éšŽæ®µ", + "block.mineralogy.basalt_smooth_slab": "磨ã‹ã‚ŒãŸçŽ„武岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.basalt_smooth_brick": "磨ã‹ã‚ŒãŸçŽ„武岩レンガ", + "block.mineralogy.basalt_smooth_brick_stairs": "磨ã‹ã‚ŒãŸçŽ„武岩レンガã®éšŽæ®µ", + "block.mineralogy.basalt_smooth_brick_slab": "磨ã‹ã‚ŒãŸçŽ„武岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.diorite": "閃緑岩", + "block.mineralogy.diorite_stairs": "閃緑岩ã®éšŽæ®µ", + "block.mineralogy.diorite_slab": "閃緑岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.diorite_brick": "閃緑岩レンガ", + "block.mineralogy.diorite_brick_stairs": "閃緑岩レンガã®éšŽæ®µ", + "block.mineralogy.diorite_brick_slab": "閃緑岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.diorite_smooth": "磨ã‹ã‚ŒãŸé–ƒç·‘岩", + "block.mineralogy.diorite_smooth_stairs": "磨ã‹ã‚ŒãŸé–ƒç·‘岩ã®éšŽæ®µ", + "block.mineralogy.diorite_smooth_slab": "磨ã‹ã‚ŒãŸé–ƒç·‘岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.diorite_smooth_brick": "磨ã‹ã‚ŒãŸé–ƒç·‘岩レンガ", + "block.mineralogy.diorite_smooth_brick_stairs": "磨ã‹ã‚ŒãŸé–ƒç·‘岩レンガã®éšŽæ®µ", + "block.mineralogy.diorite_smooth_brick_slab": "磨ã‹ã‚ŒãŸé–ƒç·‘岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.granite": "花崗岩", + "block.mineralogy.granite_stairs": "花崗岩ã®éšŽæ®µ", + "block.mineralogy.granite_slab": "花崗岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.granite_brick": "花崗岩レンガ", + "block.mineralogy.granite_brick_stairs": "花崗岩レンガã®éšŽæ®µ", + "block.mineralogy.granite_brick_slab": "花崗岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.granite_smooth": "磨ã‹ã‚ŒãŸèŠ±å´—岩", + "block.mineralogy.granite_smooth_stairs": "磨ã‹ã‚ŒãŸèŠ±å´—岩ã®éšŽæ®µ", + "block.mineralogy.granite_smooth_slab": "磨ã‹ã‚ŒãŸèŠ±å´—岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.granite_smooth_brick": "磨ã‹ã‚ŒãŸèŠ±å´—岩レンガ", + "block.mineralogy.granite_smooth_brick_stairs": "磨ã‹ã‚ŒãŸèŠ±å´—岩レンガã®éšŽæ®µ", + "block.mineralogy.granite_smooth_brick_slab": "磨ã‹ã‚ŒãŸèŠ±å´—岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.rhyolite": "æµç´‹å²©", + "block.mineralogy.rhyolite_stairs": "æµç´‹å²©ã®éšŽæ®µ", + "block.mineralogy.rhyolite_slab": "æµç´‹å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.rhyolite_brick": "æµç´‹å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.rhyolite_brick_stairs": "æµç´‹å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.rhyolite_brick_slab": "æµç´‹å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.rhyolite_smooth": "磨ã‹ã‚ŒãŸæµç´‹å²©", + "block.mineralogy.rhyolite_smooth_stairs": "磨ã‹ã‚ŒãŸæµç´‹å²©ã®éšŽæ®µ", + "block.mineralogy.rhyolite_smooth_slab": "磨ã‹ã‚ŒãŸæµç´‹å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.rhyolite_smooth_brick": "磨ã‹ã‚ŒãŸæµç´‹å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.rhyolite_smooth_brick_stairs": "磨ã‹ã‚ŒãŸæµç´‹å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.rhyolite_smooth_brick_slab": "磨ã‹ã‚ŒãŸæµç´‹å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.pegmatite": "ペグマタイト", + "block.mineralogy.pegmatite_stairs": "ペグマタイトã®éšŽæ®µ", + "block.mineralogy.pegmatite_slab": "ペグマタイトã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.pegmatite_brick": "ペグマタイトレンガ", + "block.mineralogy.pegmatite_brick_stairs": "ペグマタイトレンガã®éšŽæ®µ", + "block.mineralogy.pegmatite_brick_slab": "ペグマタイトレンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.pegmatite_smooth": "磨ã‹ã‚ŒãŸãƒšã‚°ãƒžã‚¿ã‚¤ãƒˆ", + "block.mineralogy.pegmatite_smooth_stairs": "磨ã‹ã‚ŒãŸãƒšã‚°ãƒžã‚¿ã‚¤ãƒˆã®éšŽæ®µ", + "block.mineralogy.pegmatite_smooth_slab": "磨ã‹ã‚ŒãŸãƒšã‚°ãƒžã‚¿ã‚¤ãƒˆã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.pegmatite_smooth_brick": "磨ã‹ã‚ŒãŸãƒšã‚°ãƒžã‚¿ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬", + "block.mineralogy.pegmatite_smooth_brick_stairs": "磨ã‹ã‚ŒãŸãƒšã‚°ãƒžã‚¿ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.pegmatite_smooth_brick_slab": "磨ã‹ã‚ŒãŸãƒšã‚°ãƒžã‚¿ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.shale": "é å²©", + "block.mineralogy.shale_stairs": "é å²©ã®éšŽæ®µ", + "block.mineralogy.shale_slab": "é å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.shale_brick": "é å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.shale_brick_stairs": "é å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.shale_brick_slab": "é å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.shale_smooth": "磨ã‹ã‚ŒãŸé å²©", + "block.mineralogy.shale_smooth_stairs": "磨ã‹ã‚ŒãŸé å²©ã®éšŽæ®µ", + "block.mineralogy.shale_smooth_slab": "磨ã‹ã‚ŒãŸé å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.shale_smooth_brick": "磨ã‹ã‚ŒãŸé å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.shale_smooth_brick_stairs": "磨ã‹ã‚ŒãŸé å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.shale_smooth_brick_slab": "磨ã‹ã‚ŒãŸé å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.conglomerate": "礫岩", + "block.mineralogy.conglomerate_stairs": "礫岩ã®éšŽæ®µ", + "block.mineralogy.conglomerate_slab": "礫岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.conglomerate_brick": "礫岩レンガ", + "block.mineralogy.conglomerate_brick_stairs": "礫岩レンガã®éšŽæ®µ", + "block.mineralogy.conglomerate_brick_slab": "礫岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.conglomerate_smooth": "磨ã‹ã‚ŒãŸç¤«å²©", + "block.mineralogy.conglomerate_smooth_stairs": "磨ã‹ã‚ŒãŸç¤«å²©ã®éšŽæ®µ", + "block.mineralogy.conglomerate_smooth_slab": "磨ã‹ã‚ŒãŸç¤«å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.conglomerate_smooth_brick": "磨ã‹ã‚ŒãŸç¤«å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.conglomerate_smooth_brick_stairs": "磨ã‹ã‚ŒãŸç¤«å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.conglomerate_smooth_brick_slab": "磨ã‹ã‚ŒãŸç¤«å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.dolomite": "苦ç°å²©", + "block.mineralogy.dolomite_stairs": "苦ç°å²©ã®éšŽæ®µ", + "block.mineralogy.dolomite_slab": "苦ç°å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.dolomite_brick": "苦ç°å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.dolomite_brick_stairs": "苦ç°å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.dolomite_brick_slab": "苦ç°å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.dolomite_smooth": "磨ã‹ã‚ŒãŸè‹¦ç°å²©", + "block.mineralogy.dolomite_smooth_stairs": "磨ã‹ã‚ŒãŸè‹¦ç°å²©ã®éšŽæ®µ", + "block.mineralogy.dolomite_smooth_slab": "磨ã‹ã‚ŒãŸè‹¦ç°å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.dolomite_smooth_brick": "磨ã‹ã‚ŒãŸè‹¦ç°å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.dolomite_smooth_brick_stairs": "磨ã‹ã‚ŒãŸè‹¦ç°å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.dolomite_smooth_brick_slab": "磨ã‹ã‚ŒãŸè‹¦ç°å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.limestone": "石ç°å²©", + "block.mineralogy.limestone_stairs": "石ç°å²©ã®éšŽæ®µ", + "block.mineralogy.limestone_slab": "石ç°å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.limestone_brick": "石ç°å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.limestone_brick_stairs": "石ç°å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.limestone_brick_slab": "石ç°å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.limestone_smooth": "磨ã‹ã‚ŒãŸçŸ³ç°å²©", + "block.mineralogy.limestone_smooth_stairs": "磨ã‹ã‚ŒãŸçŸ³ç°å²©ã®éšŽæ®µ", + "block.mineralogy.limestone_smooth_slab": "磨ã‹ã‚ŒãŸçŸ³ç°å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.limestone_smooth_brick": "磨ã‹ã‚ŒãŸçŸ³ç°å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.limestone_smooth_brick_stairs": "磨ã‹ã‚ŒãŸçŸ³ç°å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.limestone_smooth_brick_slab": "磨ã‹ã‚ŒãŸçŸ³ç°å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.slate": "粘æ¿å²©", + "block.mineralogy.slate_stairs": "粘æ¿å²©ã®éšŽæ®µ", + "block.mineralogy.slate_slab": "粘æ¿å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.slate_brick": "粘æ¿å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.slate_brick_stairs": "粘æ¿å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.slate_brick_slab": "粘æ¿å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.slate_smooth": "磨ã‹ã‚ŒãŸç²˜æ¿å²©", + "block.mineralogy.slate_smooth_stairs": "磨ã‹ã‚ŒãŸç²˜æ¿å²©ã®éšŽæ®µ", + "block.mineralogy.slate_smooth_slab": "磨ã‹ã‚ŒãŸç²˜æ¿å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.slate_smooth_brick": "磨ã‹ã‚ŒãŸç²˜æ¿å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.slate_smooth_brick_stairs": "磨ã‹ã‚ŒãŸç²˜æ¿å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.slate_smooth_brick_slab": "磨ã‹ã‚ŒãŸç²˜æ¿å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.schist": "çµæ™¶ç‰‡å²©", + "block.mineralogy.schist_stairs": "çµæ™¶ç‰‡å²©ã®éšŽæ®µ", + "block.mineralogy.schist_slab": "çµæ™¶ç‰‡å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.schist_brick": "çµæ™¶ç‰‡å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.schist_brick_stairs": "çµæ™¶ç‰‡å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.schist_brick_slab": "çµæ™¶ç‰‡å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.schist_smooth": "磨ã‹ã‚ŒãŸçµæ™¶ç‰‡å²©", + "block.mineralogy.schist_smooth_stairs": "磨ã‹ã‚ŒãŸçµæ™¶ç‰‡å²©ã®éšŽæ®µ", + "block.mineralogy.schist_smooth_slab": "磨ã‹ã‚ŒãŸçµæ™¶ç‰‡å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.schist_smooth_brick": "磨ã‹ã‚ŒãŸçµæ™¶ç‰‡å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.schist_smooth_brick_stairs": "磨ã‹ã‚ŒãŸçµæ™¶ç‰‡å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.schist_smooth_brick_slab": "磨ã‹ã‚ŒãŸçµæ™¶ç‰‡å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.gneiss": "片麻岩", + "block.mineralogy.gneiss_stairs": "片麻岩ã®éšŽæ®µ", + "block.mineralogy.gneiss_slab": "片麻岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.gneiss_brick": "片麻岩レンガ", + "block.mineralogy.gneiss_brick_stairs": "片麻岩レンガã®éšŽæ®µ", + "block.mineralogy.gneiss_brick_slab": "片麻岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.gneiss_smooth": "磨ã‹ã‚ŒãŸç‰‡éº»å²©", + "block.mineralogy.gneiss_smooth_stairs": "磨ã‹ã‚ŒãŸç‰‡éº»å²©ã®éšŽæ®µ", + "block.mineralogy.gneiss_smooth_slab": "磨ã‹ã‚ŒãŸç‰‡éº»å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.gneiss_smooth_brick": "磨ã‹ã‚ŒãŸç‰‡éº»å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.gneiss_smooth_brick_stairs": "磨ã‹ã‚ŒãŸç‰‡éº»å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.gneiss_smooth_brick_slab": "磨ã‹ã‚ŒãŸç‰‡éº»å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.marble": "大ç†çŸ³", + "block.mineralogy.marble_stairs": "大ç†çŸ³ã®éšŽæ®µ", + "block.mineralogy.marble_slab": "大ç†çŸ³ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.marble_brick": "大ç†çŸ³ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.marble_brick_stairs": "大ç†çŸ³ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.marble_brick_slab": "大ç†çŸ³ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.marble_smooth": "磨ã‹ã‚ŒãŸå¤§ç†çŸ³", + "block.mineralogy.marble_smooth_stairs": "磨ã‹ã‚ŒãŸå¤§ç†çŸ³ã®éšŽæ®µ", + "block.mineralogy.marble_smooth_slab": "磨ã‹ã‚ŒãŸå¤§ç†çŸ³ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.marble_smooth_brick": "磨ã‹ã‚ŒãŸå¤§ç†çŸ³ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.marble_smooth_brick_stairs": "磨ã‹ã‚ŒãŸå¤§ç†çŸ³ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.marble_smooth_brick_slab": "磨ã‹ã‚ŒãŸå¤§ç†çŸ³ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.phyllite": "åƒæžšå²©", + "block.mineralogy.phyllite_stairs": "åƒæžšå²©ã®éšŽæ®µ", + "block.mineralogy.phyllite_slab": "åƒæžšå²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.phyllite_brick": "åƒæžšå²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.phyllite_brick_stairs": "åƒæžšå²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.phyllite_brick_slab": "åƒæžšå²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.phyllite_smooth": "磨ã‹ã‚ŒãŸåƒæžšå²©", + "block.mineralogy.phyllite_smooth_stairs": "磨ã‹ã‚ŒãŸåƒæžšå²©ã®éšŽæ®µ", + "block.mineralogy.phyllite_smooth_slab": "磨ã‹ã‚ŒãŸåƒæžšå²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.phyllite_smooth_brick": "磨ã‹ã‚ŒãŸåƒæžšå²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.phyllite_smooth_brick_stairs": "磨ã‹ã‚ŒãŸåƒæžšå²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.phyllite_smooth_brick_slab": "磨ã‹ã‚ŒãŸåƒæžšå²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.amphibolite": "角閃岩", + "block.mineralogy.amphibolite_stairs": "角閃岩ã®éšŽæ®µ", + "block.mineralogy.amphibolite_slab": "角閃岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.amphibolite_brick": "角閃岩レンガ", + "block.mineralogy.amphibolite_brick_stairs": "角閃岩レンガã®éšŽæ®µ", + "block.mineralogy.amphibolite_brick_slab": "角閃岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.amphibolite_smooth": "磨ã‹ã‚ŒãŸè§’閃岩", + "block.mineralogy.amphibolite_smooth_stairs": "磨ã‹ã‚ŒãŸè§’閃岩ã®éšŽæ®µ", + "block.mineralogy.amphibolite_smooth_slab": "磨ã‹ã‚ŒãŸè§’閃岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.amphibolite_smooth_brick": "磨ã‹ã‚ŒãŸè§’閃岩レンガ", + "block.mineralogy.amphibolite_smooth_brick_stairs": "磨ã‹ã‚ŒãŸè§’閃岩レンガã®éšŽæ®µ", + "block.mineralogy.amphibolite_smooth_brick_slab": "磨ã‹ã‚ŒãŸè§’閃岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "item.mineralogy.gypsum_dust": "石è†ç²‰æœ«", + "item.mineralogy.sulfur_dust": "硫黄粉末", + "item.mineralogy.phosphorous_dust": "リン粉末", + "item.mineralogy.nitrate_dust": "ç¡é…¸å¡©ç²‰æœ«", + "item.mineralogy.mineral_fertilizer": "鉱物肥料", + "block.mineralogy.chert": "ãƒãƒ£ãƒ¼ãƒˆ", + "block.mineralogy.gypsum": "石è†", + "block.mineralogy.pumice": "軽石", + "block.mineralogy.sulfur_block": "硫黄", + "block.mineralogy.sulfur_ore": "硫黄鉱石", + "block.mineralogy.phosphorous_block": "リン", + "block.mineralogy.phosphorous_ore": "リン鉱石", + "block.mineralogy.nitrate_block": "ç¡é…¸å¡©", + "block.mineralogy.nitrate_ore": "ç¡é…¸å¡©é‰±çŸ³", + "block.mineralogy.drywall_black": "黒色ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_red": "赤色ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_green": "緑色ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_brown": "茶色ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_blue": "é’色ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_purple": "紫色ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_cyan": "é’緑色ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_silver": "è–„ç°è‰²ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_gray": "ç°è‰²ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_pink": "桃色ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_lime": "黄緑色ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_yellow": "黄色ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_light_blue": "空色ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_magenta": "赤紫色ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_orange": "橙色ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.drywall_white": "白色ã®çŸ³è†ãƒœãƒ¼ãƒ‰", + "block.mineralogy.andesite_wall": "安山岩ã®å¡€", + "block.mineralogy.andesite_brick_wall": "安山岩レンガã®å¡€", + "block.mineralogy.andesite_smooth_wall": "磨ã‹ã‚ŒãŸå®‰å±±å²©ã®å¡€", + "block.mineralogy.andesite_smooth_brick_wall": "磨ã‹ã‚ŒãŸå®‰å±±å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.basalt_wall": "玄武岩ã®å¡€", + "block.mineralogy.basalt_brick_wall": "玄武岩レンガã®å¡€", + "block.mineralogy.basalt_smooth_wall": "磨ã‹ã‚ŒãŸçŽ„武岩ã®å¡€", + "block.mineralogy.basalt_smooth_brick_wall": "磨ã‹ã‚ŒãŸçŽ„武岩レンガã®å¡€", + "block.mineralogy.diorite_wall": "閃緑岩ã®å¡€", + "block.mineralogy.diorite_brick_wall": "閃緑岩レンガã®å¡€", + "block.mineralogy.diorite_smooth_wall": "磨ã‹ã‚ŒãŸé–ƒç·‘岩ã®å¡€", + "block.mineralogy.diorite_smooth_brick_wall": "磨ã‹ã‚ŒãŸé–ƒç·‘岩レンガã®å¡€", + "block.mineralogy.granite_wall": "花崗岩ã®å¡€", + "block.mineralogy.granite_brick_wall": "花崗岩レンガã®å¡€", + "block.mineralogy.granite_smooth_wall": "磨ã‹ã‚ŒãŸèŠ±å´—岩ã®å¡€", + "block.mineralogy.granite_smooth_brick_wall": "磨ã‹ã‚ŒãŸèŠ±å´—岩レンガã®å¡€", + "block.mineralogy.rhyolite_wall": "æµç´‹å²©ã®å¡€", + "block.mineralogy.rhyolite_brick_wall": "æµç´‹å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.rhyolite_smooth_wall": "磨ã‹ã‚ŒãŸæµç´‹å²©ã®å¡€", + "block.mineralogy.rhyolite_smooth_brick_wall": "磨ã‹ã‚ŒãŸæµç´‹å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.pegmatite_wall": "ペグマタイトã®å¡€", + "block.mineralogy.pegmatite_brick_wall": "ペグマタイトレンガã®å¡€", + "block.mineralogy.pegmatite_smooth_wall": "磨ã‹ã‚ŒãŸãƒšã‚°ãƒžã‚¿ã‚¤ãƒˆã®å¡€", + "block.mineralogy.pegmatite_smooth_brick_wall": "磨ã‹ã‚ŒãŸãƒšã‚°ãƒžã‚¿ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.shale_wall": "é å²©ã®å¡€", + "block.mineralogy.shale_brick_wall": "é å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.shale_smooth_wall": "磨ã‹ã‚ŒãŸé å²©ã®å¡€", + "block.mineralogy.shale_smooth_brick_wall": "磨ã‹ã‚ŒãŸé å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.conglomerate_wall": "礫岩ã®å¡€", + "block.mineralogy.conglomerate_brick_wall": "礫岩レンガã®å¡€", + "block.mineralogy.conglomerate_smooth_wall": "磨ã‹ã‚ŒãŸç¤«å²©ã®å¡€", + "block.mineralogy.conglomerate_smooth_brick_wall": "磨ã‹ã‚ŒãŸç¤«å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.dolomite_wall": "苦ç°å²©ã®å¡€", + "block.mineralogy.dolomite_brick_wall": "苦ç°å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.dolomite_smooth_wall": "磨ã‹ã‚ŒãŸè‹¦ç°å²©ã®å¡€", + "block.mineralogy.dolomite_smooth_brick_wall": "磨ã‹ã‚ŒãŸè‹¦ç°å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.limestone_wall": "石ç°å²©ã®å¡€", + "block.mineralogy.limestone_brick_wall": "石ç°å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.limestone_smooth_wall": "磨ã‹ã‚ŒãŸçŸ³ç°å²©ã®å¡€", + "block.mineralogy.limestone_smooth_brick_wall": "磨ã‹ã‚ŒãŸçŸ³ç°å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.marble_wall": "大ç†çŸ³ã®å¡€", + "block.mineralogy.marble_brick_wall": "大ç†çŸ³ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.marble_smooth_wall": "磨ã‹ã‚ŒãŸå¤§ç†çŸ³ã®å¡€", + "block.mineralogy.marble_smooth_brick_wall": "磨ã‹ã‚ŒãŸå¤§ç†çŸ³ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.slate_wall": "粘æ¿å²©ã®å¡€", + "block.mineralogy.slate_brick_wall": "粘æ¿å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.slate_smooth_wall": "磨ã‹ã‚ŒãŸç²˜æ¿å²©ã®å¡€", + "block.mineralogy.slate_smooth_brick_wall": "磨ã‹ã‚ŒãŸç²˜æ¿å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.schist_wall": "çµæ™¶ç‰‡å²©ã®å¡€", + "block.mineralogy.schist_brick_wall": "çµæ™¶ç‰‡å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.schist_smooth_wall": "磨ã‹ã‚ŒãŸçµæ™¶ç‰‡å²©ã®å¡€", + "block.mineralogy.schist_smooth_brick_wall": "磨ã‹ã‚ŒãŸçµæ™¶ç‰‡å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.gneiss_wall": "片麻岩ã®å¡€", + "block.mineralogy.gneiss_brick_wall": "片麻岩レンガã®å¡€", + "block.mineralogy.gneiss_smooth_wall": "磨ã‹ã‚ŒãŸç‰‡éº»å²©ã®å¡€", + "block.mineralogy.gneiss_smooth_brick_wall": "磨ã‹ã‚ŒãŸç‰‡éº»å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.phyllite_wall": "åƒæžšå²©ã®å¡€", + "block.mineralogy.phyllite_brick_wall": "åƒæžšå²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.phyllite_smooth_wall": "磨ã‹ã‚ŒãŸåƒæžšå²©ã®å¡€", + "block.mineralogy.phyllite_smooth_brick_wall": "磨ã‹ã‚ŒãŸåƒæžšå²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.amphibolite_wall": "角閃岩ã®å¡€", + "block.mineralogy.amphibolite_brick_wall": "角閃岩レンガã®å¡€", + "block.mineralogy.amphibolite_smooth_wall": "磨ã‹ã‚ŒãŸè§’閃岩ã®å¡€", + "block.mineralogy.amphibolite_smooth_brick_wall": "磨ã‹ã‚ŒãŸè§’閃岩レンガã®å¡€", + "block.mineralogy.andesite_furnace": "安山岩ã®ã‹ã¾ã©", + "block.mineralogy.andesite_brick_furnace": "安山岩レンガã®ã‹ã¾ã©", + "block.mineralogy.andesite_smooth_furnace": "磨ã‹ã‚ŒãŸå®‰å±±å²©ã®ã‹ã¾ã©", + "block.mineralogy.andesite_smooth_brick_furnace": "磨ã‹ã‚ŒãŸå®‰å±±å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.basalt_furnace": "玄武岩ã®ã‹ã¾ã©", + "block.mineralogy.basalt_brick_furnace": "玄武岩レンガã®ã‹ã¾ã©", + "block.mineralogy.basalt_smooth_furnace": "磨ã‹ã‚ŒãŸçŽ„武岩ã®ã‹ã¾ã©", + "block.mineralogy.basalt_smooth_brick_furnace": "磨ã‹ã‚ŒãŸçŽ„武岩レンガã®ã‹ã¾ã©", + "block.mineralogy.diorite_furnace": "閃緑岩ã®ã‹ã¾ã©", + "block.mineralogy.diorite_brick_furnace": "閃緑岩レンガã®ã‹ã¾ã©", + "block.mineralogy.diorite_smooth_furnace": "磨ã‹ã‚ŒãŸé–ƒç·‘岩ã®ã‹ã¾ã©", + "block.mineralogy.diorite_smooth_brick_furnace": "磨ã‹ã‚ŒãŸé–ƒç·‘岩レンガã®ã‹ã¾ã©", + "block.mineralogy.granite_furnace": "花崗岩ã®ã‹ã¾ã©", + "block.mineralogy.granite_brick_furnace": "花崗岩レンガã®ã‹ã¾ã©", + "block.mineralogy.granite_smooth_furnace": "磨ã‹ã‚ŒãŸèŠ±å´—岩ã®ã‹ã¾ã©", + "block.mineralogy.granite_smooth_brick_furnace": "磨ã‹ã‚ŒãŸèŠ±å´—岩レンガã®ã‹ã¾ã©", + "block.mineralogy.rhyolite_furnace": "æµç´‹å²©ã®ã‹ã¾ã©", + "block.mineralogy.rhyolite_brick_furnace": "æµç´‹å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.rhyolite_smooth_furnace": "磨ã‹ã‚ŒãŸæµç´‹å²©ã®ã‹ã¾ã©", + "block.mineralogy.rhyolite_smooth_brick_furnace": "磨ã‹ã‚ŒãŸæµç´‹å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.pegmatite_furnace": "ペグマタイトã®ã‹ã¾ã©", + "block.mineralogy.pegmatite_brick_furnace": "ペグマタイトレンガã®ã‹ã¾ã©", + "block.mineralogy.pegmatite_smooth_furnace": "磨ã‹ã‚ŒãŸãƒšã‚°ãƒžã‚¿ã‚¤ãƒˆã®ã‹ã¾ã©", + "block.mineralogy.pegmatite_smooth_brick_furnace": "磨ã‹ã‚ŒãŸãƒšã‚°ãƒžã‚¿ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.shale_furnace": "é å²©ã®ã‹ã¾ã©", + "block.mineralogy.shale_brick_furnace": "é å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.shale_smooth_furnace": "磨ã‹ã‚ŒãŸé å²©ã®ã‹ã¾ã©", + "block.mineralogy.shale_smooth_brick_furnace": "磨ã‹ã‚ŒãŸé å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.conglomerate_furnace": "礫岩ã®ã‹ã¾ã©", + "block.mineralogy.conglomerate_brick_furnace": "礫岩レンガã®ã‹ã¾ã©", + "block.mineralogy.conglomerate_smooth_furnace": "磨ã‹ã‚ŒãŸç¤«å²©ã®ã‹ã¾ã©", + "block.mineralogy.conglomerate_smooth_brick_furnace": "磨ã‹ã‚ŒãŸç¤«å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.dolomite_furnace": "苦ç°å²©ã®ã‹ã¾ã©", + "block.mineralogy.dolomite_brick_furnace": "苦ç°å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.dolomite_smooth_furnace": "磨ã‹ã‚ŒãŸè‹¦ç°å²©ã®ã‹ã¾ã©", + "block.mineralogy.dolomite_smooth_brick_furnace": "磨ã‹ã‚ŒãŸè‹¦ç°å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.limestone_furnace": "石ç°å²©ã®ã‹ã¾ã©", + "block.mineralogy.limestone_brick_furnace": "石ç°å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.limestone_smooth_furnace": "磨ã‹ã‚ŒãŸçŸ³ç°å²©ã®ã‹ã¾ã©", + "block.mineralogy.limestone_smooth_brick_furnace": "磨ã‹ã‚ŒãŸçŸ³ç°å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.marble_furnace": "大ç†çŸ³ã®ã‹ã¾ã©", + "block.mineralogy.marble_brick_furnace": "大ç†çŸ³ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.marble_smooth_furnace": "磨ã‹ã‚ŒãŸå¤§ç†çŸ³ã®ã‹ã¾ã©", + "block.mineralogy.marble_smooth_brick_furnace": "磨ã‹ã‚ŒãŸå¤§ç†çŸ³ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.slate_furnace": "粘æ¿å²©ã®ã‹ã¾ã©", + "block.mineralogy.slate_brick_furnace": "粘æ¿å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.slate_smooth_furnace": "磨ã‹ã‚ŒãŸç²˜æ¿å²©ã®ã‹ã¾ã©", + "block.mineralogy.slate_smooth_brick_furnace": "磨ã‹ã‚ŒãŸç²˜æ¿å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.schist_furnace": "çµæ™¶ç‰‡å²©ã®ã‹ã¾ã©", + "block.mineralogy.schist_brick_furnace": "çµæ™¶ç‰‡å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.schist_smooth_furnace": "磨ã‹ã‚ŒãŸçµæ™¶ç‰‡å²©ã®ã‹ã¾ã©", + "block.mineralogy.schist_smooth_brick_furnace": "磨ã‹ã‚ŒãŸçµæ™¶ç‰‡å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.gneiss_furnace": "片麻岩ã®ã‹ã¾ã©", + "block.mineralogy.gneiss_brick_furnace": "片麻岩レンガã®ã‹ã¾ã©", + "block.mineralogy.gneiss_smooth_furnace": "磨ã‹ã‚ŒãŸç‰‡éº»å²©ã®ã‹ã¾ã©", + "block.mineralogy.gneiss_smooth_brick_furnace": "磨ã‹ã‚ŒãŸç‰‡éº»å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.phyllite_furnace": "åƒæžšå²©ã®ã‹ã¾ã©", + "block.mineralogy.phyllite_brick_furnace": "åƒæžšå²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.phyllite_smooth_furnace": "磨ã‹ã‚ŒãŸåƒæžšå²©ã®ã‹ã¾ã©", + "block.mineralogy.phyllite_smooth_brick_furnace": "磨ã‹ã‚ŒãŸåƒæžšå²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.amphibolite_furnace": "角閃岩ã®ã‹ã¾ã©", + "block.mineralogy.amphibolite_brick_furnace": "角閃岩レンガã®ã‹ã¾ã©", + "block.mineralogy.amphibolite_smooth_furnace": "磨ã‹ã‚ŒãŸè§’閃岩ã®ã‹ã¾ã©", + "block.mineralogy.amphibolite_smooth_brick_furnace": "磨ã‹ã‚ŒãŸè§’閃岩レンガã®ã‹ã¾ã©", + "block.mineralogy.diabase": "è¼ç·‘岩", + "block.mineralogy.diabase_stairs": "è¼ç·‘岩ã®éšŽæ®µ", + "block.mineralogy.diabase_slab": "è¼ç·‘岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.diabase_brick": "è¼ç·‘岩レンガ", + "block.mineralogy.diabase_brick_stairs": "è¼ç·‘岩レンガã®éšŽæ®µ", + "block.mineralogy.diabase_brick_slab": "è¼ç·‘岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.diabase_smooth": "磨ã‹ã‚ŒãŸè¼ç·‘岩", + "block.mineralogy.diabase_smooth_stairs": "磨ã‹ã‚ŒãŸè¼ç·‘岩ã®éšŽæ®µ", + "block.mineralogy.diabase_smooth_slab": "磨ã‹ã‚ŒãŸè¼ç·‘岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.diabase_smooth_brick": "磨ã‹ã‚ŒãŸè¼ç·‘岩レンガ", + "block.mineralogy.diabase_smooth_brick_stairs": "磨ã‹ã‚ŒãŸè¼ç·‘岩レンガã®éšŽæ®µ", + "block.mineralogy.diabase_smooth_brick_slab": "磨ã‹ã‚ŒãŸè¼ç·‘岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.diabase_wall": "è¼ç·‘岩ã®å¡€", + "block.mineralogy.diabase_brick_wall": "è¼ç·‘岩レンガã®å¡€", + "block.mineralogy.diabase_smooth_wall": "磨ã‹ã‚ŒãŸè¼ç·‘岩ã®å¡€", + "block.mineralogy.diabase_smooth_brick_wall": "磨ã‹ã‚ŒãŸè¼ç·‘岩レンガã®å¡€", + "block.mineralogy.diabase_furnace": "è¼ç·‘岩ã®ã‹ã¾ã©", + "block.mineralogy.diabase_brick_furnace": "è¼ç·‘岩レンガã®ã‹ã¾ã©", + "block.mineralogy.diabase_smooth_furnace": "磨ã‹ã‚ŒãŸè¼ç·‘岩ã®ã‹ã¾ã©", + "block.mineralogy.diabase_smooth_brick_furnace": "磨ã‹ã‚ŒãŸè¼ç·‘岩レンガã®ã‹ã¾ã©", + "block.mineralogy.gabbro": "ã¯ã‚“ã‚Œã„岩", + "block.mineralogy.gabbro_stairs": "ã¯ã‚“ã‚Œã„岩ã®éšŽæ®µ", + "block.mineralogy.gabbro_slab": "ã¯ã‚“ã‚Œã„岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.gabbro_brick": "ã¯ã‚“ã‚Œã„岩レンガ", + "block.mineralogy.gabbro_brick_stairs": "ã¯ã‚“ã‚Œã„岩レンガã®éšŽæ®µ", + "block.mineralogy.gabbro_brick_slab": "ã¯ã‚“ã‚Œã„岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.gabbro_smooth": "磨ã‹ã‚ŒãŸã¯ã‚“ã‚Œã„岩", + "block.mineralogy.gabbro_smooth_stairs": "磨ã‹ã‚ŒãŸã¯ã‚“ã‚Œã„岩ã®éšŽæ®µ", + "block.mineralogy.gabbro_smooth_slab": "磨ã‹ã‚ŒãŸã¯ã‚“ã‚Œã„岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.gabbro_smooth_brick": "磨ã‹ã‚ŒãŸã¯ã‚“ã‚Œã„岩レンガ", + "block.mineralogy.gabbro_smooth_brick_stairs": "磨ã‹ã‚ŒãŸã¯ã‚“ã‚Œã„岩レンガã®éšŽæ®µ", + "block.mineralogy.gabbro_smooth_brick_slab": "磨ã‹ã‚ŒãŸã¯ã‚“ã‚Œã„岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.gabbro_wall": "ã¯ã‚“ã‚Œã„岩ã®å¡€", + "block.mineralogy.gabbro_brick_wall": "ã¯ã‚“ã‚Œã„岩レンガã®å¡€", + "block.mineralogy.gabbro_smooth_wall": "磨ã‹ã‚ŒãŸã¯ã‚“ã‚Œã„岩ã®å¡€", + "block.mineralogy.gabbro_smooth_brick_wall": "磨ã‹ã‚ŒãŸã¯ã‚“ã‚Œã„岩レンガã®å¡€", + "block.mineralogy.gabbro_furnace": "ã¯ã‚“ã‚Œã„岩ã®ã‹ã¾ã©", + "block.mineralogy.gabbro_brick_furnace": "ã¯ã‚“ã‚Œã„岩レンガã®ã‹ã¾ã©", + "block.mineralogy.gabbro_smooth_furnace": "磨ã‹ã‚ŒãŸã¯ã‚“ã‚Œã„岩ã®ã‹ã¾ã©", + "block.mineralogy.gabbro_smooth_brick_furnace": "磨ã‹ã‚ŒãŸã¯ã‚“ã‚Œã„岩レンガã®ã‹ã¾ã©", + "block.mineralogy.peridotite": "ã‹ã‚“らん岩", + "block.mineralogy.peridotite_stairs": "ã‹ã‚“らん岩ã®éšŽæ®µ", + "block.mineralogy.peridotite_slab": "ã‹ã‚“らん岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.peridotite_brick": "ã‹ã‚“らん岩レンガ", + "block.mineralogy.peridotite_brick_stairs": "ã‹ã‚“らん岩レンガã®éšŽæ®µ", + "block.mineralogy.peridotite_brick_slab": "ã‹ã‚“らん岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.peridotite_smooth": "磨ã‹ã‚ŒãŸã‹ã‚“らん岩", + "block.mineralogy.peridotite_smooth_stairs": "磨ã‹ã‚ŒãŸã‹ã‚“らん岩ã®éšŽæ®µ", + "block.mineralogy.peridotite_smooth_slab": "磨ã‹ã‚ŒãŸã‹ã‚“らん岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.peridotite_smooth_brick": "磨ã‹ã‚ŒãŸã‹ã‚“らん岩レンガ", + "block.mineralogy.peridotite_smooth_brick_stairs": "磨ã‹ã‚ŒãŸã‹ã‚“らん岩レンガã®éšŽæ®µ", + "block.mineralogy.peridotite_smooth_brick_slab": "磨ã‹ã‚ŒãŸã‹ã‚“らん岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.peridotite_wall": "ã‹ã‚“らん岩ã®å¡€", + "block.mineralogy.peridotite_brick_wall": "ã‹ã‚“らん岩レンガã®å¡€", + "block.mineralogy.peridotite_smooth_wall": "磨ã‹ã‚ŒãŸã‹ã‚“らん岩ã®å¡€", + "block.mineralogy.peridotite_smooth_brick_wall": "磨ã‹ã‚ŒãŸã‹ã‚“らん岩レンガã®å¡€", + "block.mineralogy.peridotite_furnace": "ã‹ã‚“らん岩ã®ã‹ã¾ã©", + "block.mineralogy.peridotite_brick_furnace": "ã‹ã‚“らん岩レンガã®ã‹ã¾ã©", + "block.mineralogy.peridotite_smooth_furnace": "磨ã‹ã‚ŒãŸã‹ã‚“らん岩ã®ã‹ã¾ã©", + "block.mineralogy.peridotite_smooth_brick_furnace": "磨ã‹ã‚ŒãŸã‹ã‚“らん岩レンガã®ã‹ã¾ã©", + "block.mineralogy.basaltic_glass": "玄武岩質ガラス", + "block.mineralogy.basaltic_glass_stairs": "玄武岩質ガラスã®éšŽæ®µ", + "block.mineralogy.basaltic_glass_slab": "玄武岩質ガラスã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.basaltic_glass_brick": "玄武岩質ガラスレンガ", + "block.mineralogy.basaltic_glass_brick_stairs": "玄武岩質ガラスレンガã®éšŽæ®µ", + "block.mineralogy.basaltic_glass_brick_slab": "玄武岩質ガラスレンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.basaltic_glass_smooth": "磨ã‹ã‚ŒãŸçŽ„武岩質ガラス", + "block.mineralogy.basaltic_glass_smooth_stairs": "磨ã‹ã‚ŒãŸçŽ„武岩質ガラスã®éšŽæ®µ", + "block.mineralogy.basaltic_glass_smooth_slab": "磨ã‹ã‚ŒãŸçŽ„武岩質ガラスã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.basaltic_glass_smooth_brick": "磨ã‹ã‚ŒãŸçŽ„武岩質ガラスレンガ", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "磨ã‹ã‚ŒãŸçŽ„武岩質ガラスレンガã®éšŽæ®µ", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "磨ã‹ã‚ŒãŸçŽ„武岩質ガラスレンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.basaltic_glass_wall": "玄武岩質ガラスã®å¡€", + "block.mineralogy.basaltic_glass_brick_wall": "玄武岩質ガラスレンガã®å¡€", + "block.mineralogy.basaltic_glass_smooth_wall": "磨ã‹ã‚ŒãŸçŽ„武岩質ガラスã®å¡€", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "磨ã‹ã‚ŒãŸçŽ„武岩質ガラスレンガã®å¡€", + "block.mineralogy.basaltic_glass_furnace": "玄武岩質ガラスã®ã‹ã¾ã©", + "block.mineralogy.basaltic_glass_brick_furnace": "玄武岩質ガラスレンガã®ã‹ã¾ã©", + "block.mineralogy.basaltic_glass_smooth_furnace": "磨ã‹ã‚ŒãŸçŽ„武岩質ガラスã®ã‹ã¾ã©", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "磨ã‹ã‚ŒãŸçŽ„武岩質ガラスレンガã®ã‹ã¾ã©", + "block.mineralogy.scoria": "スコリア", + "block.mineralogy.scoria_stairs": "スコリアã®éšŽæ®µ", + "block.mineralogy.scoria_slab": "スコリアã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.scoria_brick": "スコリアレンガ", + "block.mineralogy.scoria_brick_stairs": "スコリアレンガã®éšŽæ®µ", + "block.mineralogy.scoria_brick_slab": "スコリアレンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.scoria_smooth": "磨ã‹ã‚ŒãŸã‚¹ã‚³ãƒªã‚¢", + "block.mineralogy.scoria_smooth_stairs": "磨ã‹ã‚ŒãŸã‚¹ã‚³ãƒªã‚¢ã®éšŽæ®µ", + "block.mineralogy.scoria_smooth_slab": "磨ã‹ã‚ŒãŸã‚¹ã‚³ãƒªã‚¢ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.scoria_smooth_brick": "磨ã‹ã‚ŒãŸã‚¹ã‚³ãƒªã‚¢ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.scoria_smooth_brick_stairs": "磨ã‹ã‚ŒãŸã‚¹ã‚³ãƒªã‚¢ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.scoria_smooth_brick_slab": "磨ã‹ã‚ŒãŸã‚¹ã‚³ãƒªã‚¢ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.scoria_wall": "スコリアã®å¡€", + "block.mineralogy.scoria_brick_wall": "スコリアレンガã®å¡€", + "block.mineralogy.scoria_smooth_wall": "磨ã‹ã‚ŒãŸã‚¹ã‚³ãƒªã‚¢ã®å¡€", + "block.mineralogy.scoria_smooth_brick_wall": "磨ã‹ã‚ŒãŸã‚¹ã‚³ãƒªã‚¢ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.scoria_furnace": "スコリアã®ã‹ã¾ã©", + "block.mineralogy.scoria_brick_furnace": "スコリアレンガã®ã‹ã¾ã©", + "block.mineralogy.scoria_smooth_furnace": "磨ã‹ã‚ŒãŸã‚¹ã‚³ãƒªã‚¢ã®ã‹ã¾ã©", + "block.mineralogy.scoria_smooth_brick_furnace": "磨ã‹ã‚ŒãŸã‚¹ã‚³ãƒªã‚¢ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.tuff": "å‡ç°å²©", + "block.mineralogy.tuff_stairs": "å‡ç°å²©ã®éšŽæ®µ", + "block.mineralogy.tuff_slab": "å‡ç°å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.tuff_brick": "å‡ç°å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.tuff_brick_stairs": "å‡ç°å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.tuff_brick_slab": "å‡ç°å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.tuff_smooth": "磨ã‹ã‚ŒãŸå‡ç°å²©", + "block.mineralogy.tuff_smooth_stairs": "磨ã‹ã‚ŒãŸå‡ç°å²©ã®éšŽæ®µ", + "block.mineralogy.tuff_smooth_slab": "磨ã‹ã‚ŒãŸå‡ç°å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.tuff_smooth_brick": "磨ã‹ã‚ŒãŸå‡ç°å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.tuff_smooth_brick_stairs": "磨ã‹ã‚ŒãŸå‡ç°å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.tuff_smooth_brick_slab": "磨ã‹ã‚ŒãŸå‡ç°å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.tuff_wall": "å‡ç°å²©ã®å¡€", + "block.mineralogy.tuff_brick_wall": "å‡ç°å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.tuff_smooth_wall": "磨ã‹ã‚ŒãŸå‡ç°å²©ã®å¡€", + "block.mineralogy.tuff_smooth_brick_wall": "磨ã‹ã‚ŒãŸå‡ç°å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.tuff_furnace": "å‡ç°å²©ã®ã‹ã¾ã©", + "block.mineralogy.tuff_brick_furnace": "å‡ç°å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.tuff_smooth_furnace": "磨ã‹ã‚ŒãŸå‡ç°å²©ã®ã‹ã¾ã©", + "block.mineralogy.tuff_smooth_brick_furnace": "磨ã‹ã‚ŒãŸå‡ç°å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.siltstone": "シルト岩", + "block.mineralogy.siltstone_stairs": "シルト岩ã®éšŽæ®µ", + "block.mineralogy.siltstone_slab": "シルト岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.siltstone_brick": "シルト岩レンガ", + "block.mineralogy.siltstone_brick_stairs": "シルト岩レンガã®éšŽæ®µ", + "block.mineralogy.siltstone_brick_slab": "シルト岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.siltstone_smooth": "磨ã‹ã‚ŒãŸã‚·ãƒ«ãƒˆå²©", + "block.mineralogy.siltstone_smooth_stairs": "磨ã‹ã‚ŒãŸã‚·ãƒ«ãƒˆå²©ã®éšŽæ®µ", + "block.mineralogy.siltstone_smooth_slab": "磨ã‹ã‚ŒãŸã‚·ãƒ«ãƒˆå²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.siltstone_smooth_brick": "磨ã‹ã‚ŒãŸã‚·ãƒ«ãƒˆå²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.siltstone_smooth_brick_stairs": "磨ã‹ã‚ŒãŸã‚·ãƒ«ãƒˆå²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.siltstone_smooth_brick_slab": "磨ã‹ã‚ŒãŸã‚·ãƒ«ãƒˆå²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.siltstone_wall": "シルト岩ã®å¡€", + "block.mineralogy.siltstone_brick_wall": "シルト岩レンガã®å¡€", + "block.mineralogy.siltstone_smooth_wall": "磨ã‹ã‚ŒãŸã‚·ãƒ«ãƒˆå²©ã®å¡€", + "block.mineralogy.siltstone_smooth_brick_wall": "磨ã‹ã‚ŒãŸã‚·ãƒ«ãƒˆå²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.siltstone_furnace": "シルト岩ã®ã‹ã¾ã©", + "block.mineralogy.siltstone_brick_furnace": "シルト岩レンガã®ã‹ã¾ã©", + "block.mineralogy.siltstone_smooth_furnace": "磨ã‹ã‚ŒãŸã‚·ãƒ«ãƒˆå²©ã®ã‹ã¾ã©", + "block.mineralogy.siltstone_smooth_brick_furnace": "磨ã‹ã‚ŒãŸã‚·ãƒ«ãƒˆå²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.rock_salt": "岩塩", + "block.mineralogy.rock_salt_stairs": "岩塩ã®éšŽæ®µ", + "block.mineralogy.rock_salt_slab": "岩塩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.rock_salt_brick": "岩塩レンガ", + "block.mineralogy.rock_salt_brick_stairs": "岩塩レンガã®éšŽæ®µ", + "block.mineralogy.rock_salt_brick_slab": "岩塩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.rock_salt_smooth": "磨ã‹ã‚ŒãŸå²©å¡©", + "block.mineralogy.rock_salt_smooth_stairs": "磨ã‹ã‚ŒãŸå²©å¡©ã®éšŽæ®µ", + "block.mineralogy.rock_salt_smooth_slab": "磨ã‹ã‚ŒãŸå²©å¡©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.rock_salt_smooth_brick": "磨ã‹ã‚ŒãŸå²©å¡©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.rock_salt_smooth_brick_stairs": "磨ã‹ã‚ŒãŸå²©å¡©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.rock_salt_smooth_brick_slab": "磨ã‹ã‚ŒãŸå²©å¡©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.rock_salt_wall": "岩塩ã®å¡€", + "block.mineralogy.rock_salt_brick_wall": "岩塩レンガã®å¡€", + "block.mineralogy.rock_salt_smooth_wall": "磨ã‹ã‚ŒãŸå²©å¡©ã®å¡€", + "block.mineralogy.rock_salt_smooth_brick_wall": "磨ã‹ã‚ŒãŸå²©å¡©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.rock_salt_furnace": "岩塩ã®ã‹ã¾ã©", + "block.mineralogy.rock_salt_brick_furnace": "岩塩レンガã®ã‹ã¾ã©", + "block.mineralogy.rock_salt_smooth_furnace": "磨ã‹ã‚ŒãŸå²©å¡©ã®ã‹ã¾ã©", + "block.mineralogy.rock_salt_smooth_brick_furnace": "磨ã‹ã‚ŒãŸå²©å¡©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.hornfels": "ホルンフェルス", + "block.mineralogy.hornfels_stairs": "ホルンフェルスã®éšŽæ®µ", + "block.mineralogy.hornfels_slab": "ホルンフェルスã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.hornfels_brick": "ホルンフェルスレンガ", + "block.mineralogy.hornfels_brick_stairs": "ホルンフェルスレンガã®éšŽæ®µ", + "block.mineralogy.hornfels_brick_slab": "ホルンフェルスレンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.hornfels_smooth": "磨ã‹ã‚ŒãŸãƒ›ãƒ«ãƒ³ãƒ•ã‚§ãƒ«ã‚¹", + "block.mineralogy.hornfels_smooth_stairs": "磨ã‹ã‚ŒãŸãƒ›ãƒ«ãƒ³ãƒ•ã‚§ãƒ«ã‚¹ã®éšŽæ®µ", + "block.mineralogy.hornfels_smooth_slab": "磨ã‹ã‚ŒãŸãƒ›ãƒ«ãƒ³ãƒ•ã‚§ãƒ«ã‚¹ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.hornfels_smooth_brick": "磨ã‹ã‚ŒãŸãƒ›ãƒ«ãƒ³ãƒ•ã‚§ãƒ«ã‚¹ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.hornfels_smooth_brick_stairs": "磨ã‹ã‚ŒãŸãƒ›ãƒ«ãƒ³ãƒ•ã‚§ãƒ«ã‚¹ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.hornfels_smooth_brick_slab": "磨ã‹ã‚ŒãŸãƒ›ãƒ«ãƒ³ãƒ•ã‚§ãƒ«ã‚¹ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.hornfels_wall": "ホルンフェルスã®å¡€", + "block.mineralogy.hornfels_brick_wall": "ホルンフェルスレンガã®å¡€", + "block.mineralogy.hornfels_smooth_wall": "磨ã‹ã‚ŒãŸãƒ›ãƒ«ãƒ³ãƒ•ã‚§ãƒ«ã‚¹ã®å¡€", + "block.mineralogy.hornfels_smooth_brick_wall": "磨ã‹ã‚ŒãŸãƒ›ãƒ«ãƒ³ãƒ•ã‚§ãƒ«ã‚¹ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.hornfels_furnace": "ホルンフェルスã®ã‹ã¾ã©", + "block.mineralogy.hornfels_brick_furnace": "ホルンフェルスレンガã®ã‹ã¾ã©", + "block.mineralogy.hornfels_smooth_furnace": "磨ã‹ã‚ŒãŸãƒ›ãƒ«ãƒ³ãƒ•ã‚§ãƒ«ã‚¹ã®ã‹ã¾ã©", + "block.mineralogy.hornfels_smooth_brick_furnace": "磨ã‹ã‚ŒãŸãƒ›ãƒ«ãƒ³ãƒ•ã‚§ãƒ«ã‚¹ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.quartzite": "石英岩", + "block.mineralogy.quartzite_stairs": "石英岩ã®éšŽæ®µ", + "block.mineralogy.quartzite_slab": "石英岩ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.quartzite_brick": "石英岩レンガ", + "block.mineralogy.quartzite_brick_stairs": "石英岩レンガã®éšŽæ®µ", + "block.mineralogy.quartzite_brick_slab": "石英岩レンガã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.quartzite_smooth": "磨ã‹ã‚ŒãŸçŸ³è‹±å²©", + "block.mineralogy.quartzite_smooth_stairs": "磨ã‹ã‚ŒãŸçŸ³è‹±å²©ã®éšŽæ®µ", + "block.mineralogy.quartzite_smooth_slab": "磨ã‹ã‚ŒãŸçŸ³è‹±å²©ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.quartzite_smooth_brick": "磨ã‹ã‚ŒãŸçŸ³è‹±å²©ãƒ¬ãƒ³ã‚¬", + "block.mineralogy.quartzite_smooth_brick_stairs": "磨ã‹ã‚ŒãŸçŸ³è‹±å²©ãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.quartzite_smooth_brick_slab": "磨ã‹ã‚ŒãŸçŸ³è‹±å²©ãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.quartzite_wall": "石英岩ã®å¡€", + "block.mineralogy.quartzite_brick_wall": "石英岩レンガã®å¡€", + "block.mineralogy.quartzite_smooth_wall": "磨ã‹ã‚ŒãŸçŸ³è‹±å²©ã®å¡€", + "block.mineralogy.quartzite_smooth_brick_wall": "磨ã‹ã‚ŒãŸçŸ³è‹±å²©ãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.quartzite_furnace": "石英岩ã®ã‹ã¾ã©", + "block.mineralogy.quartzite_brick_furnace": "石英岩レンガã®ã‹ã¾ã©", + "block.mineralogy.quartzite_smooth_furnace": "磨ã‹ã‚ŒãŸçŸ³è‹±å²©ã®ã‹ã¾ã©", + "block.mineralogy.quartzite_smooth_brick_furnace": "磨ã‹ã‚ŒãŸçŸ³è‹±å²©ãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.novaculite": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆ", + "block.mineralogy.novaculite_stairs": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®éšŽæ®µ", + "block.mineralogy.novaculite_slab": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.novaculite_brick": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬", + "block.mineralogy.novaculite_brick_stairs": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.novaculite_brick_slab": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.novaculite_smooth": "磨ã‹ã‚ŒãŸãƒŽãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆ", + "block.mineralogy.novaculite_smooth_stairs": "磨ã‹ã‚ŒãŸãƒŽãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®éšŽæ®µ", + "block.mineralogy.novaculite_smooth_slab": "磨ã‹ã‚ŒãŸãƒŽãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.novaculite_smooth_brick": "磨ã‹ã‚ŒãŸãƒŽãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬", + "block.mineralogy.novaculite_smooth_brick_stairs": "磨ã‹ã‚ŒãŸãƒŽãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬ã®éšŽæ®µ", + "block.mineralogy.novaculite_smooth_brick_slab": "磨ã‹ã‚ŒãŸãƒŽãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "block.mineralogy.novaculite_wall": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®å¡€", + "block.mineralogy.novaculite_brick_wall": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.novaculite_smooth_wall": "磨ã‹ã‚ŒãŸãƒŽãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®å¡€", + "block.mineralogy.novaculite_smooth_brick_wall": "磨ã‹ã‚ŒãŸãƒŽãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬ã®å¡€", + "block.mineralogy.novaculite_furnace": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ã‹ã¾ã©", + "block.mineralogy.novaculite_brick_furnace": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.novaculite_smooth_furnace": "磨ã‹ã‚ŒãŸãƒŽãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ã‹ã¾ã©", + "block.mineralogy.novaculite_smooth_brick_furnace": "磨ã‹ã‚ŒãŸãƒŽãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆãƒ¬ãƒ³ã‚¬ã®ã‹ã¾ã©", + "block.mineralogy.chalk": "ãƒãƒ§ãƒ¼ã‚¯", + "item.mineralogy.chalk_dust": "ãƒãƒ§ãƒ¼ã‚¯ç²‰æœ«", + "item.mineralogy.salt_dust": "å¡©", + "item.mineralogy.rock_salt_dust": "岩塩ã®çµæ™¶", + "block.mineralogy.rocksaltlamp": "岩塩ランプ", + "block.mineralogy.rocksaltstreetlamp": "岩塩街ç¯", + "block.mineralogy.andesite_relief_axe": "安山岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.andesite_relief_blank": "安山岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.andesite_relief_cross": "安山岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.andesite_relief_hammer": "安山岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.andesite_relief_hoe": "安山岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.andesite_relief_horizontal": "安山岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.andesite_relief_i": "安山岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.andesite_relief_left": "安山岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.andesite_relief_pickaxe": "安山岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.andesite_relief_plus": "安山岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.andesite_relief_right": "安山岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.andesite_relief_sword": "安山岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.andesite_relief_vertical": "安山岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.basalt_relief_axe": "玄武岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.basalt_relief_blank": "玄武岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.basalt_relief_cross": "玄武岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.basalt_relief_hammer": "玄武岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.basalt_relief_hoe": "玄武岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.basalt_relief_horizontal": "玄武岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.basalt_relief_i": "玄武岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.basalt_relief_left": "玄武岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.basalt_relief_pickaxe": "玄武岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.basalt_relief_plus": "玄武岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.basalt_relief_right": "玄武岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.basalt_relief_sword": "玄武岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.basalt_relief_vertical": "玄武岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.diorite_relief_axe": "閃緑岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.diorite_relief_blank": "閃緑岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.diorite_relief_cross": "閃緑岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.diorite_relief_hammer": "閃緑岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.diorite_relief_hoe": "閃緑岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.diorite_relief_horizontal": "閃緑岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.diorite_relief_i": "閃緑岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.diorite_relief_left": "閃緑岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.diorite_relief_pickaxe": "閃緑岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.diorite_relief_plus": "閃緑岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.diorite_relief_right": "閃緑岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.diorite_relief_sword": "閃緑岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.diorite_relief_vertical": "閃緑岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.granite_relief_axe": "花崗岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.granite_relief_blank": "花崗岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.granite_relief_cross": "花崗岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.granite_relief_hammer": "花崗岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.granite_relief_hoe": "花崗岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.granite_relief_horizontal": "花崗岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.granite_relief_i": "花崗岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.granite_relief_left": "花崗岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.granite_relief_pickaxe": "花崗岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.granite_relief_plus": "花崗岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.granite_relief_right": "花崗岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.granite_relief_sword": "花崗岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.granite_relief_vertical": "花崗岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.rhyolite_relief_axe": "æµç´‹å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.rhyolite_relief_blank": "æµç´‹å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.rhyolite_relief_cross": "æµç´‹å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.rhyolite_relief_hammer": "æµç´‹å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.rhyolite_relief_hoe": "æµç´‹å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.rhyolite_relief_horizontal": "æµç´‹å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.rhyolite_relief_i": "æµç´‹å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.rhyolite_relief_left": "æµç´‹å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.rhyolite_relief_pickaxe": "æµç´‹å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.rhyolite_relief_plus": "æµç´‹å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.rhyolite_relief_right": "æµç´‹å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.rhyolite_relief_sword": "æµç´‹å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.rhyolite_relief_vertical": "æµç´‹å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.pegmatite_relief_axe": "ペグマタイトã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.pegmatite_relief_blank": "ペグマタイトã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.pegmatite_relief_cross": "ペグマタイトã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.pegmatite_relief_hammer": "ペグマタイトã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.pegmatite_relief_hoe": "ペグマタイトã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.pegmatite_relief_horizontal": "ペグマタイトã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.pegmatite_relief_i": "ペグマタイトã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.pegmatite_relief_left": "ペグマタイトã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.pegmatite_relief_pickaxe": "ペグマタイトã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.pegmatite_relief_plus": "ペグマタイトã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.pegmatite_relief_right": "ペグマタイトã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.pegmatite_relief_sword": "ペグマタイトã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.pegmatite_relief_vertical": "ペグマタイトã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.shale_relief_axe": "é å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.shale_relief_blank": "é å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.shale_relief_cross": "é å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.shale_relief_hammer": "é å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.shale_relief_hoe": "é å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.shale_relief_horizontal": "é å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.shale_relief_i": "é å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.shale_relief_left": "é å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.shale_relief_pickaxe": "é å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.shale_relief_plus": "é å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.shale_relief_right": "é å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.shale_relief_sword": "é å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.shale_relief_vertical": "é å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.conglomerate_relief_axe": "礫岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.conglomerate_relief_blank": "礫岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.conglomerate_relief_cross": "礫岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.conglomerate_relief_hammer": "礫岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.conglomerate_relief_hoe": "礫岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.conglomerate_relief_horizontal": "礫岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.conglomerate_relief_i": "礫岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.conglomerate_relief_left": "礫岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.conglomerate_relief_pickaxe": "礫岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.conglomerate_relief_plus": "礫岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.conglomerate_relief_right": "礫岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.conglomerate_relief_sword": "礫岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.conglomerate_relief_vertical": "礫岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.dolomite_relief_axe": "苦ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.dolomite_relief_blank": "苦ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.dolomite_relief_cross": "苦ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.dolomite_relief_hammer": "苦ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.dolomite_relief_hoe": "苦ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.dolomite_relief_horizontal": "苦ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.dolomite_relief_i": "苦ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.dolomite_relief_left": "苦ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.dolomite_relief_pickaxe": "苦ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.dolomite_relief_plus": "苦ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.dolomite_relief_right": "苦ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.dolomite_relief_sword": "苦ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.dolomite_relief_vertical": "苦ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.limestone_relief_axe": "石ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.limestone_relief_blank": "石ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.limestone_relief_cross": "石ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.limestone_relief_hammer": "石ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.limestone_relief_hoe": "石ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.limestone_relief_horizontal": "石ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.limestone_relief_i": "石ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.limestone_relief_left": "石ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.limestone_relief_pickaxe": "石ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.limestone_relief_plus": "石ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.limestone_relief_right": "石ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.limestone_relief_sword": "石ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.limestone_relief_vertical": "石ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.marble_relief_axe": "大ç†çŸ³ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.marble_relief_blank": "大ç†çŸ³ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.marble_relief_cross": "大ç†çŸ³ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.marble_relief_hammer": "大ç†çŸ³ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.marble_relief_hoe": "大ç†çŸ³ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.marble_relief_horizontal": "大ç†çŸ³ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.marble_relief_i": "大ç†çŸ³ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.marble_relief_left": "大ç†çŸ³ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.marble_relief_pickaxe": "大ç†çŸ³ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.marble_relief_plus": "大ç†çŸ³ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.marble_relief_right": "大ç†çŸ³ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.marble_relief_sword": "大ç†çŸ³ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.marble_relief_vertical": "大ç†çŸ³ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.slate_relief_axe": "粘æ¿å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.slate_relief_blank": "粘æ¿å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.slate_relief_cross": "粘æ¿å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.slate_relief_hammer": "粘æ¿å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.slate_relief_hoe": "粘æ¿å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.slate_relief_horizontal": "粘æ¿å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.slate_relief_i": "粘æ¿å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.slate_relief_left": "粘æ¿å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.slate_relief_pickaxe": "粘æ¿å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.slate_relief_plus": "粘æ¿å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.slate_relief_right": "粘æ¿å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.slate_relief_sword": "粘æ¿å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.slate_relief_vertical": "粘æ¿å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.schist_relief_axe": "çµæ™¶ç‰‡å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.schist_relief_blank": "çµæ™¶ç‰‡å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.schist_relief_cross": "çµæ™¶ç‰‡å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.schist_relief_hammer": "çµæ™¶ç‰‡å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.schist_relief_hoe": "çµæ™¶ç‰‡å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.schist_relief_horizontal": "çµæ™¶ç‰‡å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.schist_relief_i": "çµæ™¶ç‰‡å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.schist_relief_left": "çµæ™¶ç‰‡å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.schist_relief_pickaxe": "çµæ™¶ç‰‡å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.schist_relief_plus": "çµæ™¶ç‰‡å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.schist_relief_right": "çµæ™¶ç‰‡å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.schist_relief_sword": "çµæ™¶ç‰‡å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.schist_relief_vertical": "çµæ™¶ç‰‡å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.gneiss_relief_axe": "片麻岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.gneiss_relief_blank": "片麻岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.gneiss_relief_cross": "片麻岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.gneiss_relief_hammer": "片麻岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.gneiss_relief_hoe": "片麻岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.gneiss_relief_horizontal": "片麻岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.gneiss_relief_i": "片麻岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.gneiss_relief_left": "片麻岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.gneiss_relief_pickaxe": "片麻岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.gneiss_relief_plus": "片麻岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.gneiss_relief_right": "片麻岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.gneiss_relief_sword": "片麻岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.gneiss_relief_vertical": "片麻岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.phyllite_relief_axe": "åƒæžšå²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.phyllite_relief_blank": "åƒæžšå²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.phyllite_relief_cross": "åƒæžšå²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.phyllite_relief_hammer": "åƒæžšå²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.phyllite_relief_hoe": "åƒæžšå²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.phyllite_relief_horizontal": "åƒæžšå²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.phyllite_relief_i": "åƒæžšå²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.phyllite_relief_left": "åƒæžšå²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.phyllite_relief_pickaxe": "åƒæžšå²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.phyllite_relief_plus": "åƒæžšå²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.phyllite_relief_right": "åƒæžšå²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.phyllite_relief_sword": "åƒæžšå²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.phyllite_relief_vertical": "åƒæžšå²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.amphibolite_relief_axe": "角閃岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.amphibolite_relief_blank": "角閃岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.amphibolite_relief_cross": "角閃岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.amphibolite_relief_hammer": "角閃岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.amphibolite_relief_hoe": "角閃岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.amphibolite_relief_horizontal": "角閃岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.amphibolite_relief_i": "角閃岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.amphibolite_relief_left": "角閃岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.amphibolite_relief_pickaxe": "角閃岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.amphibolite_relief_plus": "角閃岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.amphibolite_relief_right": "角閃岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.amphibolite_relief_sword": "角閃岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.amphibolite_relief_vertical": "角閃岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.diabase_relief_axe": "è¼ç·‘岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.diabase_relief_blank": "è¼ç·‘岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.diabase_relief_cross": "è¼ç·‘岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.diabase_relief_hammer": "è¼ç·‘岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.diabase_relief_hoe": "è¼ç·‘岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.diabase_relief_horizontal": "è¼ç·‘岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.diabase_relief_i": "è¼ç·‘岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.diabase_relief_left": "è¼ç·‘岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.diabase_relief_pickaxe": "è¼ç·‘岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.diabase_relief_plus": "è¼ç·‘岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.diabase_relief_right": "è¼ç·‘岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.diabase_relief_sword": "è¼ç·‘岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.diabase_relief_vertical": "è¼ç·‘岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.gabbro_relief_axe": "ã¯ã‚“ã‚Œã„岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.gabbro_relief_blank": "ã¯ã‚“ã‚Œã„岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.gabbro_relief_cross": "ã¯ã‚“ã‚Œã„岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.gabbro_relief_hammer": "ã¯ã‚“ã‚Œã„岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.gabbro_relief_hoe": "ã¯ã‚“ã‚Œã„岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.gabbro_relief_horizontal": "ã¯ã‚“ã‚Œã„岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.gabbro_relief_i": "ã¯ã‚“ã‚Œã„岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.gabbro_relief_left": "ã¯ã‚“ã‚Œã„岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.gabbro_relief_pickaxe": "ã¯ã‚“ã‚Œã„岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.gabbro_relief_plus": "ã¯ã‚“ã‚Œã„岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.gabbro_relief_right": "ã¯ã‚“ã‚Œã„岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.gabbro_relief_sword": "ã¯ã‚“ã‚Œã„岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.gabbro_relief_vertical": "ã¯ã‚“ã‚Œã„岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.peridotite_relief_axe": "ã‹ã‚“らん岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.peridotite_relief_blank": "ã‹ã‚“らん岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.peridotite_relief_cross": "ã‹ã‚“らん岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.peridotite_relief_hammer": "ã‹ã‚“らん岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.peridotite_relief_hoe": "ã‹ã‚“らん岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.peridotite_relief_horizontal": "ã‹ã‚“らん岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.peridotite_relief_i": "ã‹ã‚“らん岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.peridotite_relief_left": "ã‹ã‚“らん岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.peridotite_relief_pickaxe": "ã‹ã‚“らん岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.peridotite_relief_plus": "ã‹ã‚“らん岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.peridotite_relief_right": "ã‹ã‚“らん岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.peridotite_relief_sword": "ã‹ã‚“らん岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.peridotite_relief_vertical": "ã‹ã‚“らん岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.basaltic_glass_relief_axe": "玄武岩質ガラスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.basaltic_glass_relief_blank": "玄武岩質ガラスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.basaltic_glass_relief_cross": "玄武岩質ガラスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.basaltic_glass_relief_hammer": "玄武岩質ガラスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.basaltic_glass_relief_hoe": "玄武岩質ガラスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.basaltic_glass_relief_horizontal": "玄武岩質ガラスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.basaltic_glass_relief_i": "玄武岩質ガラスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.basaltic_glass_relief_left": "玄武岩質ガラスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.basaltic_glass_relief_pickaxe": "玄武岩質ガラスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.basaltic_glass_relief_plus": "玄武岩質ガラスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.basaltic_glass_relief_right": "玄武岩質ガラスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.basaltic_glass_relief_sword": "玄武岩質ガラスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.basaltic_glass_relief_vertical": "玄武岩質ガラスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.scoria_relief_axe": "スコリアã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.scoria_relief_blank": "スコリアã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.scoria_relief_cross": "スコリアã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.scoria_relief_hammer": "スコリアã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.scoria_relief_hoe": "スコリアã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.scoria_relief_horizontal": "スコリアã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.scoria_relief_i": "スコリアã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.scoria_relief_left": "スコリアã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.scoria_relief_pickaxe": "スコリアã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.scoria_relief_plus": "スコリアã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.scoria_relief_right": "スコリアã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.scoria_relief_sword": "スコリアã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.scoria_relief_vertical": "スコリアã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.tuff_relief_axe": "å‡ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.tuff_relief_blank": "å‡ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.tuff_relief_cross": "å‡ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.tuff_relief_hammer": "å‡ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.tuff_relief_hoe": "å‡ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.tuff_relief_horizontal": "å‡ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.tuff_relief_i": "å‡ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.tuff_relief_left": "å‡ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.tuff_relief_pickaxe": "å‡ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.tuff_relief_plus": "å‡ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.tuff_relief_right": "å‡ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.tuff_relief_sword": "å‡ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.tuff_relief_vertical": "å‡ç°å²©ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.siltstone_relief_axe": "シルト岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.siltstone_relief_blank": "シルト岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.siltstone_relief_cross": "シルト岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.siltstone_relief_hammer": "シルト岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.siltstone_relief_hoe": "シルト岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.siltstone_relief_horizontal": "シルト岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.siltstone_relief_i": "シルト岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.siltstone_relief_left": "シルト岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.siltstone_relief_pickaxe": "シルト岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.siltstone_relief_plus": "シルト岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.siltstone_relief_right": "シルト岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.siltstone_relief_sword": "シルト岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.siltstone_relief_vertical": "シルト岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.rock_salt_relief_axe": "岩塩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.rock_salt_relief_blank": "岩塩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.rock_salt_relief_cross": "岩塩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.rock_salt_relief_hammer": "岩塩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.rock_salt_relief_hoe": "岩塩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.rock_salt_relief_horizontal": "岩塩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.rock_salt_relief_i": "岩塩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.rock_salt_relief_left": "岩塩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.rock_salt_relief_pickaxe": "岩塩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.rock_salt_relief_plus": "岩塩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.rock_salt_relief_right": "岩塩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.rock_salt_relief_sword": "岩塩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.rock_salt_relief_vertical": "岩塩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.hornfels_relief_axe": "ホルンフェルスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.hornfels_relief_blank": "ホルンフェルスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.hornfels_relief_cross": "ホルンフェルスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.hornfels_relief_hammer": "ホルンフェルスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.hornfels_relief_hoe": "ホルンフェルスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.hornfels_relief_horizontal": "ホルンフェルスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.hornfels_relief_i": "ホルンフェルスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.hornfels_relief_left": "ホルンフェルスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.hornfels_relief_pickaxe": "ホルンフェルスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.hornfels_relief_plus": "ホルンフェルスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.hornfels_relief_right": "ホルンフェルスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.hornfels_relief_sword": "ホルンフェルスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.hornfels_relief_vertical": "ホルンフェルスã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.quartzite_relief_axe": "石英岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.quartzite_relief_blank": "石英岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.quartzite_relief_cross": "石英岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.quartzite_relief_hammer": "石英岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.quartzite_relief_hoe": "石英岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.quartzite_relief_horizontal": "石英岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.quartzite_relief_i": "石英岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.quartzite_relief_left": "石英岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.quartzite_relief_pickaxe": "石英岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.quartzite_relief_plus": "石英岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.quartzite_relief_right": "石英岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.quartzite_relief_sword": "石英岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.quartzite_relief_vertical": "石英岩ã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "block.mineralogy.novaculite_relief_axe": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ–§ï¼‰", + "block.mineralogy.novaculite_relief_blank": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç„¡åœ°ï¼‰", + "block.mineralogy.novaculite_relief_cross": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå字）", + "block.mineralogy.novaculite_relief_hammer": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒãƒ³ãƒžãƒ¼ï¼‰", + "block.mineralogy.novaculite_relief_hoe": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆã‚¯ãƒ¯ï¼‰", + "block.mineralogy.novaculite_relief_horizontal": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆæ¨ªï¼‰", + "block.mineralogy.novaculite_relief_i": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆI）", + "block.mineralogy.novaculite_relief_left": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå·¦ï¼‰", + "block.mineralogy.novaculite_relief_pickaxe": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ„ルãƒã‚·ï¼‰", + "block.mineralogy.novaculite_relief_plus": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆãƒ—ラス記å·ï¼‰", + "block.mineralogy.novaculite_relief_right": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå³ï¼‰", + "block.mineralogy.novaculite_relief_sword": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆå‰£ï¼‰", + "block.mineralogy.novaculite_relief_vertical": "ノãƒã‚­ãƒ¥ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒªãƒ¼ãƒ•ï¼ˆç¸¦ï¼‰", + "itemGroup.mineralogy.mineralogy": "鉱物学", + "itemGroup.mineralogy.rock": "鉱物学ã®å²©çŸ³", + "itemGroup.mineralogy.stair": "鉱物学ã®éšŽæ®µ", + "itemGroup.mineralogy.slab": "鉱物学ã®ãƒãƒ¼ãƒ•ãƒ–ロック", + "itemGroup.mineralogy.wall": "鉱物学ã®å¡€", + "itemGroup.mineralogy.item": "鉱物学ã®ã‚¢ã‚¤ãƒ†ãƒ ", + "block.mineralogy.crude_oil": "原油", + "item.mineralogy.crude_oil_bucket": "原油入りãƒã‚±ãƒ„", + "fluid.mineralogy.crude_oil": "原油", + "advancements.mineralogy.all_the_rocks.title": "ã™ã¹ã¦ã®å²©çŸ³", + "advancements.mineralogy.all_the_rocks.description": "鉱物学ã®æ¨™æº–çš„ãªå²©çŸ³ã‚’ã™ã¹ã¦è¦‹ã¤ã‘ã¾ã—ãŸï¼" +} diff --git a/src/main/resources/assets/mineralogy/lang/ko_kr.json b/src/main/resources/assets/mineralogy/lang/ko_kr.json new file mode 100644 index 000000000..5dfecde9c --- /dev/null +++ b/src/main/resources/assets/mineralogy/lang/ko_kr.json @@ -0,0 +1,940 @@ +{ + "block.mineralogy.andesite": "안산암", + "block.mineralogy.andesite_stairs": "안산암 계단", + "block.mineralogy.andesite_slab": "안산암 ë°˜ 블ë¡", + "block.mineralogy.andesite_brick": "안산암 ë²½ëŒ", + "block.mineralogy.andesite_brick_stairs": "안산암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.andesite_brick_slab": "안산암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.andesite_smooth": "윤나는 안산암", + "block.mineralogy.andesite_smooth_stairs": "윤나는 안산암 계단", + "block.mineralogy.andesite_smooth_slab": "윤나는 안산암 ë°˜ 블ë¡", + "block.mineralogy.andesite_smooth_brick": "윤나는 안산암 ë²½ëŒ", + "block.mineralogy.andesite_smooth_brick_stairs": "윤나는 안산암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.andesite_smooth_brick_slab": "윤나는 안산암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.basalt": "현무암", + "block.mineralogy.basalt_stairs": "현무암 계단", + "block.mineralogy.basalt_slab": "현무암 ë°˜ 블ë¡", + "block.mineralogy.basalt_brick": "현무암 ë²½ëŒ", + "block.mineralogy.basalt_brick_stairs": "현무암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.basalt_brick_slab": "현무암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.basalt_smooth": "윤나는 현무암", + "block.mineralogy.basalt_smooth_stairs": "윤나는 현무암 계단", + "block.mineralogy.basalt_smooth_slab": "윤나는 현무암 ë°˜ 블ë¡", + "block.mineralogy.basalt_smooth_brick": "윤나는 현무암 ë²½ëŒ", + "block.mineralogy.basalt_smooth_brick_stairs": "윤나는 현무암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.basalt_smooth_brick_slab": "윤나는 현무암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.diorite": "섬ë¡ì•”", + "block.mineralogy.diorite_stairs": "섬ë¡ì•” 계단", + "block.mineralogy.diorite_slab": "섬ë¡ì•” ë°˜ 블ë¡", + "block.mineralogy.diorite_brick": "섬ë¡ì•” ë²½ëŒ", + "block.mineralogy.diorite_brick_stairs": "섬ë¡ì•” ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.diorite_brick_slab": "섬ë¡ì•” ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.diorite_smooth": "윤나는 섬ë¡ì•”", + "block.mineralogy.diorite_smooth_stairs": "윤나는 섬ë¡ì•” 계단", + "block.mineralogy.diorite_smooth_slab": "윤나는 섬ë¡ì•” ë°˜ 블ë¡", + "block.mineralogy.diorite_smooth_brick": "윤나는 섬ë¡ì•” ë²½ëŒ", + "block.mineralogy.diorite_smooth_brick_stairs": "윤나는 섬ë¡ì•” ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.diorite_smooth_brick_slab": "윤나는 섬ë¡ì•” ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.granite": "화강암", + "block.mineralogy.granite_stairs": "화강암 계단", + "block.mineralogy.granite_slab": "화강암 ë°˜ 블ë¡", + "block.mineralogy.granite_brick": "화강암 ë²½ëŒ", + "block.mineralogy.granite_brick_stairs": "화강암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.granite_brick_slab": "화강암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.granite_smooth": "윤나는 화강암", + "block.mineralogy.granite_smooth_stairs": "윤나는 화강암 계단", + "block.mineralogy.granite_smooth_slab": "윤나는 화강암 ë°˜ 블ë¡", + "block.mineralogy.granite_smooth_brick": "윤나는 화강암 ë²½ëŒ", + "block.mineralogy.granite_smooth_brick_stairs": "윤나는 화강암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.granite_smooth_brick_slab": "윤나는 화강암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.rhyolite": "유문암", + "block.mineralogy.rhyolite_stairs": "유문암 계단", + "block.mineralogy.rhyolite_slab": "유문암 ë°˜ 블ë¡", + "block.mineralogy.rhyolite_brick": "유문암 ë²½ëŒ", + "block.mineralogy.rhyolite_brick_stairs": "유문암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.rhyolite_brick_slab": "유문암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.rhyolite_smooth": "윤나는 유문암", + "block.mineralogy.rhyolite_smooth_stairs": "윤나는 유문암 계단", + "block.mineralogy.rhyolite_smooth_slab": "윤나는 유문암 ë°˜ 블ë¡", + "block.mineralogy.rhyolite_smooth_brick": "윤나는 유문암 ë²½ëŒ", + "block.mineralogy.rhyolite_smooth_brick_stairs": "윤나는 유문암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.rhyolite_smooth_brick_slab": "윤나는 유문암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.pegmatite": "페그마타ì´íŠ¸", + "block.mineralogy.pegmatite_stairs": "페그마타ì´íŠ¸ 계단", + "block.mineralogy.pegmatite_slab": "페그마타ì´íŠ¸ ë°˜ 블ë¡", + "block.mineralogy.pegmatite_brick": "페그마타ì´íŠ¸ ë²½ëŒ", + "block.mineralogy.pegmatite_brick_stairs": "페그마타ì´íŠ¸ ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.pegmatite_brick_slab": "페그마타ì´íŠ¸ ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.pegmatite_smooth": "윤나는 페그마타ì´íŠ¸", + "block.mineralogy.pegmatite_smooth_stairs": "윤나는 페그마타ì´íŠ¸ 계단", + "block.mineralogy.pegmatite_smooth_slab": "윤나는 페그마타ì´íŠ¸ ë°˜ 블ë¡", + "block.mineralogy.pegmatite_smooth_brick": "윤나는 페그마타ì´íŠ¸ ë²½ëŒ", + "block.mineralogy.pegmatite_smooth_brick_stairs": "윤나는 페그마타ì´íŠ¸ ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.pegmatite_smooth_brick_slab": "윤나는 페그마타ì´íŠ¸ ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.shale": "ì…°ì¼", + "block.mineralogy.shale_stairs": "ì…°ì¼ ê³„ë‹¨", + "block.mineralogy.shale_slab": "ì…°ì¼ ë°˜ 블ë¡", + "block.mineralogy.shale_brick": "ì…°ì¼ ë²½ëŒ", + "block.mineralogy.shale_brick_stairs": "ì…°ì¼ ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.shale_brick_slab": "ì…°ì¼ ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.shale_smooth": "윤나는 ì…°ì¼", + "block.mineralogy.shale_smooth_stairs": "윤나는 ì…°ì¼ ê³„ë‹¨", + "block.mineralogy.shale_smooth_slab": "윤나는 ì…°ì¼ ë°˜ 블ë¡", + "block.mineralogy.shale_smooth_brick": "윤나는 ì…°ì¼ ë²½ëŒ", + "block.mineralogy.shale_smooth_brick_stairs": "윤나는 ì…°ì¼ ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.shale_smooth_brick_slab": "윤나는 ì…°ì¼ ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.conglomerate": "ì—­ì•”", + "block.mineralogy.conglomerate_stairs": "ì—­ì•” 계단", + "block.mineralogy.conglomerate_slab": "ì—­ì•” ë°˜ 블ë¡", + "block.mineralogy.conglomerate_brick": "ì—­ì•” ë²½ëŒ", + "block.mineralogy.conglomerate_brick_stairs": "ì—­ì•” ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.conglomerate_brick_slab": "ì—­ì•” ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.conglomerate_smooth": "윤나는 ì—­ì•”", + "block.mineralogy.conglomerate_smooth_stairs": "윤나는 ì—­ì•” 계단", + "block.mineralogy.conglomerate_smooth_slab": "윤나는 ì—­ì•” ë°˜ 블ë¡", + "block.mineralogy.conglomerate_smooth_brick": "윤나는 ì—­ì•” ë²½ëŒ", + "block.mineralogy.conglomerate_smooth_brick_stairs": "윤나는 ì—­ì•” ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.conglomerate_smooth_brick_slab": "윤나는 ì—­ì•” ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.dolomite": "백운암", + "block.mineralogy.dolomite_stairs": "백운암 계단", + "block.mineralogy.dolomite_slab": "백운암 ë°˜ 블ë¡", + "block.mineralogy.dolomite_brick": "백운암 ë²½ëŒ", + "block.mineralogy.dolomite_brick_stairs": "백운암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.dolomite_brick_slab": "백운암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.dolomite_smooth": "윤나는 백운암", + "block.mineralogy.dolomite_smooth_stairs": "윤나는 백운암 계단", + "block.mineralogy.dolomite_smooth_slab": "윤나는 백운암 ë°˜ 블ë¡", + "block.mineralogy.dolomite_smooth_brick": "윤나는 백운암 ë²½ëŒ", + "block.mineralogy.dolomite_smooth_brick_stairs": "윤나는 백운암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.dolomite_smooth_brick_slab": "윤나는 백운암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.limestone": "ì„회암", + "block.mineralogy.limestone_stairs": "ì„회암 계단", + "block.mineralogy.limestone_slab": "ì„회암 ë°˜ 블ë¡", + "block.mineralogy.limestone_brick": "ì„회암 ë²½ëŒ", + "block.mineralogy.limestone_brick_stairs": "ì„회암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.limestone_brick_slab": "ì„회암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.limestone_smooth": "윤나는 ì„회암", + "block.mineralogy.limestone_smooth_stairs": "윤나는 ì„회암 계단", + "block.mineralogy.limestone_smooth_slab": "윤나는 ì„회암 ë°˜ 블ë¡", + "block.mineralogy.limestone_smooth_brick": "윤나는 ì„회암 ë²½ëŒ", + "block.mineralogy.limestone_smooth_brick_stairs": "윤나는 ì„회암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.limestone_smooth_brick_slab": "윤나는 ì„회암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.slate": "ì íŒì•”", + "block.mineralogy.slate_stairs": "ì íŒì•” 계단", + "block.mineralogy.slate_slab": "ì íŒì•” ë°˜ 블ë¡", + "block.mineralogy.slate_brick": "ì íŒì•” ë²½ëŒ", + "block.mineralogy.slate_brick_stairs": "ì íŒì•” ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.slate_brick_slab": "ì íŒì•” ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.slate_smooth": "윤나는 ì íŒì•”", + "block.mineralogy.slate_smooth_stairs": "윤나는 ì íŒì•” 계단", + "block.mineralogy.slate_smooth_slab": "윤나는 ì íŒì•” ë°˜ 블ë¡", + "block.mineralogy.slate_smooth_brick": "윤나는 ì íŒì•” ë²½ëŒ", + "block.mineralogy.slate_smooth_brick_stairs": "윤나는 ì íŒì•” ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.slate_smooth_brick_slab": "윤나는 ì íŒì•” ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.schist": "편암", + "block.mineralogy.schist_stairs": "편암 계단", + "block.mineralogy.schist_slab": "편암 ë°˜ 블ë¡", + "block.mineralogy.schist_brick": "편암 ë²½ëŒ", + "block.mineralogy.schist_brick_stairs": "편암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.schist_brick_slab": "편암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.schist_smooth": "윤나는 편암", + "block.mineralogy.schist_smooth_stairs": "윤나는 편암 계단", + "block.mineralogy.schist_smooth_slab": "윤나는 편암 ë°˜ 블ë¡", + "block.mineralogy.schist_smooth_brick": "윤나는 편암 ë²½ëŒ", + "block.mineralogy.schist_smooth_brick_stairs": "윤나는 편암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.schist_smooth_brick_slab": "윤나는 편암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.gneiss": "편마암", + "block.mineralogy.gneiss_stairs": "편마암 계단", + "block.mineralogy.gneiss_slab": "편마암 ë°˜ 블ë¡", + "block.mineralogy.gneiss_brick": "편마암 ë²½ëŒ", + "block.mineralogy.gneiss_brick_stairs": "편마암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.gneiss_brick_slab": "편마암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.gneiss_smooth": "윤나는 편마암", + "block.mineralogy.gneiss_smooth_stairs": "윤나는 편마암 계단", + "block.mineralogy.gneiss_smooth_slab": "윤나는 편마암 ë°˜ 블ë¡", + "block.mineralogy.gneiss_smooth_brick": "윤나는 편마암 ë²½ëŒ", + "block.mineralogy.gneiss_smooth_brick_stairs": "윤나는 편마암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.gneiss_smooth_brick_slab": "윤나는 편마암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.marble": "대리ì„", + "block.mineralogy.marble_stairs": "ëŒ€ë¦¬ì„ ê³„ë‹¨", + "block.mineralogy.marble_slab": "ëŒ€ë¦¬ì„ ë°˜ 블ë¡", + "block.mineralogy.marble_brick": "ëŒ€ë¦¬ì„ ë²½ëŒ", + "block.mineralogy.marble_brick_stairs": "ëŒ€ë¦¬ì„ ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.marble_brick_slab": "ëŒ€ë¦¬ì„ ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.marble_smooth": "윤나는 대리ì„", + "block.mineralogy.marble_smooth_stairs": "윤나는 ëŒ€ë¦¬ì„ ê³„ë‹¨", + "block.mineralogy.marble_smooth_slab": "윤나는 ëŒ€ë¦¬ì„ ë°˜ 블ë¡", + "block.mineralogy.marble_smooth_brick": "윤나는 ëŒ€ë¦¬ì„ ë²½ëŒ", + "block.mineralogy.marble_smooth_brick_stairs": "윤나는 ëŒ€ë¦¬ì„ ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.marble_smooth_brick_slab": "윤나는 ëŒ€ë¦¬ì„ ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.phyllite": "천매암", + "block.mineralogy.phyllite_stairs": "천매암 계단", + "block.mineralogy.phyllite_slab": "천매암 ë°˜ 블ë¡", + "block.mineralogy.phyllite_brick": "천매암 ë²½ëŒ", + "block.mineralogy.phyllite_brick_stairs": "천매암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.phyllite_brick_slab": "천매암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.phyllite_smooth": "윤나는 천매암", + "block.mineralogy.phyllite_smooth_stairs": "윤나는 천매암 계단", + "block.mineralogy.phyllite_smooth_slab": "윤나는 천매암 ë°˜ 블ë¡", + "block.mineralogy.phyllite_smooth_brick": "윤나는 천매암 ë²½ëŒ", + "block.mineralogy.phyllite_smooth_brick_stairs": "윤나는 천매암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.phyllite_smooth_brick_slab": "윤나는 천매암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.amphibolite": "ê°ì„¬ì•”", + "block.mineralogy.amphibolite_stairs": "ê°ì„¬ì•” 계단", + "block.mineralogy.amphibolite_slab": "ê°ì„¬ì•” ë°˜ 블ë¡", + "block.mineralogy.amphibolite_brick": "ê°ì„¬ì•” ë²½ëŒ", + "block.mineralogy.amphibolite_brick_stairs": "ê°ì„¬ì•” ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.amphibolite_brick_slab": "ê°ì„¬ì•” ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.amphibolite_smooth": "윤나는 ê°ì„¬ì•”", + "block.mineralogy.amphibolite_smooth_stairs": "윤나는 ê°ì„¬ì•” 계단", + "block.mineralogy.amphibolite_smooth_slab": "윤나는 ê°ì„¬ì•” ë°˜ 블ë¡", + "block.mineralogy.amphibolite_smooth_brick": "윤나는 ê°ì„¬ì•” ë²½ëŒ", + "block.mineralogy.amphibolite_smooth_brick_stairs": "윤나는 ê°ì„¬ì•” ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.amphibolite_smooth_brick_slab": "윤나는 ê°ì„¬ì•” ë²½ëŒ ë°˜ 블ë¡", + "item.mineralogy.gypsum_dust": "ì„ê³  가루", + "item.mineralogy.sulfur_dust": "유황 가루", + "item.mineralogy.phosphorous_dust": "ì¸ ê°€ë£¨", + "item.mineralogy.nitrate_dust": "질산염 가루", + "item.mineralogy.mineral_fertilizer": "광물 비료", + "block.mineralogy.chert": "처트", + "block.mineralogy.gypsum": "ì„ê³ ", + "block.mineralogy.pumice": "부ì„", + "block.mineralogy.sulfur_block": "유황", + "block.mineralogy.sulfur_ore": "유황 ê´‘ì„", + "block.mineralogy.phosphorous_block": "ì¸", + "block.mineralogy.phosphorous_ore": "ì¸ ê´‘ì„", + "block.mineralogy.nitrate_block": "질산염", + "block.mineralogy.nitrate_ore": "질산염 ê´‘ì„", + "block.mineralogy.drywall_black": "ê²€ì€ìƒ‰ ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_red": "빨간색 ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_green": "ì´ˆë¡ìƒ‰ ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_brown": "갈색 ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_blue": "파란색 ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_purple": "ë³´ë¼ìƒ‰ ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_cyan": "ì²­ë¡ìƒ‰ ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_silver": "ë°ì€ 회색 ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_gray": "회색 ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_pink": "분í™ìƒ‰ ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_lime": "ì—°ë‘색 ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_yellow": "노란색 ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_light_blue": "하늘색 ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_magenta": "ìží™ìƒ‰ ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_orange": "주황색 ì„ê³ ë³´ë“œ", + "block.mineralogy.drywall_white": "í°ìƒ‰ ì„ê³ ë³´ë“œ", + "block.mineralogy.andesite_wall": "안산암 담장", + "block.mineralogy.andesite_brick_wall": "안산암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.andesite_smooth_wall": "윤나는 안산암 담장", + "block.mineralogy.andesite_smooth_brick_wall": "윤나는 안산암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.basalt_wall": "현무암 담장", + "block.mineralogy.basalt_brick_wall": "현무암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.basalt_smooth_wall": "윤나는 현무암 담장", + "block.mineralogy.basalt_smooth_brick_wall": "윤나는 현무암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.diorite_wall": "섬ë¡ì•” 담장", + "block.mineralogy.diorite_brick_wall": "섬ë¡ì•” ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.diorite_smooth_wall": "윤나는 섬ë¡ì•” 담장", + "block.mineralogy.diorite_smooth_brick_wall": "윤나는 섬ë¡ì•” ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.granite_wall": "화강암 담장", + "block.mineralogy.granite_brick_wall": "화강암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.granite_smooth_wall": "윤나는 화강암 담장", + "block.mineralogy.granite_smooth_brick_wall": "윤나는 화강암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.rhyolite_wall": "유문암 담장", + "block.mineralogy.rhyolite_brick_wall": "유문암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.rhyolite_smooth_wall": "윤나는 유문암 담장", + "block.mineralogy.rhyolite_smooth_brick_wall": "윤나는 유문암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.pegmatite_wall": "페그마타ì´íŠ¸ 담장", + "block.mineralogy.pegmatite_brick_wall": "페그마타ì´íŠ¸ ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.pegmatite_smooth_wall": "윤나는 페그마타ì´íŠ¸ 담장", + "block.mineralogy.pegmatite_smooth_brick_wall": "윤나는 페그마타ì´íŠ¸ ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.shale_wall": "ì…°ì¼ ë‹´ìž¥", + "block.mineralogy.shale_brick_wall": "ì…°ì¼ ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.shale_smooth_wall": "윤나는 ì…°ì¼ ë‹´ìž¥", + "block.mineralogy.shale_smooth_brick_wall": "윤나는 ì…°ì¼ ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.conglomerate_wall": "ì—­ì•” 담장", + "block.mineralogy.conglomerate_brick_wall": "ì—­ì•” ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.conglomerate_smooth_wall": "윤나는 ì—­ì•” 담장", + "block.mineralogy.conglomerate_smooth_brick_wall": "윤나는 ì—­ì•” ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.dolomite_wall": "백운암 담장", + "block.mineralogy.dolomite_brick_wall": "백운암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.dolomite_smooth_wall": "윤나는 백운암 담장", + "block.mineralogy.dolomite_smooth_brick_wall": "윤나는 백운암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.limestone_wall": "ì„회암 담장", + "block.mineralogy.limestone_brick_wall": "ì„회암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.limestone_smooth_wall": "윤나는 ì„회암 담장", + "block.mineralogy.limestone_smooth_brick_wall": "윤나는 ì„회암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.marble_wall": "ëŒ€ë¦¬ì„ ë‹´ìž¥", + "block.mineralogy.marble_brick_wall": "ëŒ€ë¦¬ì„ ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.marble_smooth_wall": "윤나는 ëŒ€ë¦¬ì„ ë‹´ìž¥", + "block.mineralogy.marble_smooth_brick_wall": "윤나는 ëŒ€ë¦¬ì„ ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.slate_wall": "ì íŒì•” 담장", + "block.mineralogy.slate_brick_wall": "ì íŒì•” ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.slate_smooth_wall": "윤나는 ì íŒì•” 담장", + "block.mineralogy.slate_smooth_brick_wall": "윤나는 ì íŒì•” ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.schist_wall": "편암 담장", + "block.mineralogy.schist_brick_wall": "편암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.schist_smooth_wall": "윤나는 편암 담장", + "block.mineralogy.schist_smooth_brick_wall": "윤나는 편암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.gneiss_wall": "편마암 담장", + "block.mineralogy.gneiss_brick_wall": "편마암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.gneiss_smooth_wall": "윤나는 편마암 담장", + "block.mineralogy.gneiss_smooth_brick_wall": "윤나는 편마암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.phyllite_wall": "천매암 담장", + "block.mineralogy.phyllite_brick_wall": "천매암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.phyllite_smooth_wall": "윤나는 천매암 담장", + "block.mineralogy.phyllite_smooth_brick_wall": "윤나는 천매암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.amphibolite_wall": "ê°ì„¬ì•” 담장", + "block.mineralogy.amphibolite_brick_wall": "ê°ì„¬ì•” ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.amphibolite_smooth_wall": "윤나는 ê°ì„¬ì•” 담장", + "block.mineralogy.amphibolite_smooth_brick_wall": "윤나는 ê°ì„¬ì•” ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.andesite_furnace": "안산암 화로", + "block.mineralogy.andesite_brick_furnace": "안산암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.andesite_smooth_furnace": "윤나는 안산암 화로", + "block.mineralogy.andesite_smooth_brick_furnace": "윤나는 안산암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.basalt_furnace": "현무암 화로", + "block.mineralogy.basalt_brick_furnace": "현무암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.basalt_smooth_furnace": "윤나는 현무암 화로", + "block.mineralogy.basalt_smooth_brick_furnace": "윤나는 현무암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.diorite_furnace": "섬ë¡ì•” 화로", + "block.mineralogy.diorite_brick_furnace": "섬ë¡ì•” ë²½ëŒ í™”ë¡œ", + "block.mineralogy.diorite_smooth_furnace": "윤나는 섬ë¡ì•” 화로", + "block.mineralogy.diorite_smooth_brick_furnace": "윤나는 섬ë¡ì•” ë²½ëŒ í™”ë¡œ", + "block.mineralogy.granite_furnace": "화강암 화로", + "block.mineralogy.granite_brick_furnace": "화강암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.granite_smooth_furnace": "윤나는 화강암 화로", + "block.mineralogy.granite_smooth_brick_furnace": "윤나는 화강암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.rhyolite_furnace": "유문암 화로", + "block.mineralogy.rhyolite_brick_furnace": "유문암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.rhyolite_smooth_furnace": "윤나는 유문암 화로", + "block.mineralogy.rhyolite_smooth_brick_furnace": "윤나는 유문암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.pegmatite_furnace": "페그마타ì´íŠ¸ 화로", + "block.mineralogy.pegmatite_brick_furnace": "페그마타ì´íŠ¸ ë²½ëŒ í™”ë¡œ", + "block.mineralogy.pegmatite_smooth_furnace": "윤나는 페그마타ì´íŠ¸ 화로", + "block.mineralogy.pegmatite_smooth_brick_furnace": "윤나는 페그마타ì´íŠ¸ ë²½ëŒ í™”ë¡œ", + "block.mineralogy.shale_furnace": "ì…°ì¼ í™”ë¡œ", + "block.mineralogy.shale_brick_furnace": "ì…°ì¼ ë²½ëŒ í™”ë¡œ", + "block.mineralogy.shale_smooth_furnace": "윤나는 ì…°ì¼ í™”ë¡œ", + "block.mineralogy.shale_smooth_brick_furnace": "윤나는 ì…°ì¼ ë²½ëŒ í™”ë¡œ", + "block.mineralogy.conglomerate_furnace": "ì—­ì•” 화로", + "block.mineralogy.conglomerate_brick_furnace": "ì—­ì•” ë²½ëŒ í™”ë¡œ", + "block.mineralogy.conglomerate_smooth_furnace": "윤나는 ì—­ì•” 화로", + "block.mineralogy.conglomerate_smooth_brick_furnace": "윤나는 ì—­ì•” ë²½ëŒ í™”ë¡œ", + "block.mineralogy.dolomite_furnace": "백운암 화로", + "block.mineralogy.dolomite_brick_furnace": "백운암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.dolomite_smooth_furnace": "윤나는 백운암 화로", + "block.mineralogy.dolomite_smooth_brick_furnace": "윤나는 백운암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.limestone_furnace": "ì„회암 화로", + "block.mineralogy.limestone_brick_furnace": "ì„회암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.limestone_smooth_furnace": "윤나는 ì„회암 화로", + "block.mineralogy.limestone_smooth_brick_furnace": "윤나는 ì„회암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.marble_furnace": "ëŒ€ë¦¬ì„ í™”ë¡œ", + "block.mineralogy.marble_brick_furnace": "ëŒ€ë¦¬ì„ ë²½ëŒ í™”ë¡œ", + "block.mineralogy.marble_smooth_furnace": "윤나는 ëŒ€ë¦¬ì„ í™”ë¡œ", + "block.mineralogy.marble_smooth_brick_furnace": "윤나는 ëŒ€ë¦¬ì„ ë²½ëŒ í™”ë¡œ", + "block.mineralogy.slate_furnace": "ì íŒì•” 화로", + "block.mineralogy.slate_brick_furnace": "ì íŒì•” ë²½ëŒ í™”ë¡œ", + "block.mineralogy.slate_smooth_furnace": "윤나는 ì íŒì•” 화로", + "block.mineralogy.slate_smooth_brick_furnace": "윤나는 ì íŒì•” ë²½ëŒ í™”ë¡œ", + "block.mineralogy.schist_furnace": "편암 화로", + "block.mineralogy.schist_brick_furnace": "편암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.schist_smooth_furnace": "윤나는 편암 화로", + "block.mineralogy.schist_smooth_brick_furnace": "윤나는 편암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.gneiss_furnace": "편마암 화로", + "block.mineralogy.gneiss_brick_furnace": "편마암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.gneiss_smooth_furnace": "윤나는 편마암 화로", + "block.mineralogy.gneiss_smooth_brick_furnace": "윤나는 편마암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.phyllite_furnace": "천매암 화로", + "block.mineralogy.phyllite_brick_furnace": "천매암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.phyllite_smooth_furnace": "윤나는 천매암 화로", + "block.mineralogy.phyllite_smooth_brick_furnace": "윤나는 천매암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.amphibolite_furnace": "ê°ì„¬ì•” 화로", + "block.mineralogy.amphibolite_brick_furnace": "ê°ì„¬ì•” ë²½ëŒ í™”ë¡œ", + "block.mineralogy.amphibolite_smooth_furnace": "윤나는 ê°ì„¬ì•” 화로", + "block.mineralogy.amphibolite_smooth_brick_furnace": "윤나는 ê°ì„¬ì•” ë²½ëŒ í™”ë¡œ", + "block.mineralogy.diabase": "휘ë¡ì•”", + "block.mineralogy.diabase_stairs": "휘ë¡ì•” 계단", + "block.mineralogy.diabase_slab": "휘ë¡ì•” ë°˜ 블ë¡", + "block.mineralogy.diabase_brick": "휘ë¡ì•” ë²½ëŒ", + "block.mineralogy.diabase_brick_stairs": "휘ë¡ì•” ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.diabase_brick_slab": "휘ë¡ì•” ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.diabase_smooth": "윤나는 휘ë¡ì•”", + "block.mineralogy.diabase_smooth_stairs": "윤나는 휘ë¡ì•” 계단", + "block.mineralogy.diabase_smooth_slab": "윤나는 휘ë¡ì•” ë°˜ 블ë¡", + "block.mineralogy.diabase_smooth_brick": "윤나는 휘ë¡ì•” ë²½ëŒ", + "block.mineralogy.diabase_smooth_brick_stairs": "윤나는 휘ë¡ì•” ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.diabase_smooth_brick_slab": "윤나는 휘ë¡ì•” ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.diabase_wall": "휘ë¡ì•” 담장", + "block.mineralogy.diabase_brick_wall": "휘ë¡ì•” ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.diabase_smooth_wall": "윤나는 휘ë¡ì•” 담장", + "block.mineralogy.diabase_smooth_brick_wall": "윤나는 휘ë¡ì•” ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.diabase_furnace": "휘ë¡ì•” 화로", + "block.mineralogy.diabase_brick_furnace": "휘ë¡ì•” ë²½ëŒ í™”ë¡œ", + "block.mineralogy.diabase_smooth_furnace": "윤나는 휘ë¡ì•” 화로", + "block.mineralogy.diabase_smooth_brick_furnace": "윤나는 휘ë¡ì•” ë²½ëŒ í™”ë¡œ", + "block.mineralogy.gabbro": "반려암", + "block.mineralogy.gabbro_stairs": "반려암 계단", + "block.mineralogy.gabbro_slab": "반려암 ë°˜ 블ë¡", + "block.mineralogy.gabbro_brick": "반려암 ë²½ëŒ", + "block.mineralogy.gabbro_brick_stairs": "반려암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.gabbro_brick_slab": "반려암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.gabbro_smooth": "윤나는 반려암", + "block.mineralogy.gabbro_smooth_stairs": "윤나는 반려암 계단", + "block.mineralogy.gabbro_smooth_slab": "윤나는 반려암 ë°˜ 블ë¡", + "block.mineralogy.gabbro_smooth_brick": "윤나는 반려암 ë²½ëŒ", + "block.mineralogy.gabbro_smooth_brick_stairs": "윤나는 반려암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.gabbro_smooth_brick_slab": "윤나는 반려암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.gabbro_wall": "반려암 담장", + "block.mineralogy.gabbro_brick_wall": "반려암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.gabbro_smooth_wall": "윤나는 반려암 담장", + "block.mineralogy.gabbro_smooth_brick_wall": "윤나는 반려암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.gabbro_furnace": "반려암 화로", + "block.mineralogy.gabbro_brick_furnace": "반려암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.gabbro_smooth_furnace": "윤나는 반려암 화로", + "block.mineralogy.gabbro_smooth_brick_furnace": "윤나는 반려암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.peridotite": "ê°ëžŒì•”", + "block.mineralogy.peridotite_stairs": "ê°ëžŒì•” 계단", + "block.mineralogy.peridotite_slab": "ê°ëžŒì•” ë°˜ 블ë¡", + "block.mineralogy.peridotite_brick": "ê°ëžŒì•” ë²½ëŒ", + "block.mineralogy.peridotite_brick_stairs": "ê°ëžŒì•” ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.peridotite_brick_slab": "ê°ëžŒì•” ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.peridotite_smooth": "윤나는 ê°ëžŒì•”", + "block.mineralogy.peridotite_smooth_stairs": "윤나는 ê°ëžŒì•” 계단", + "block.mineralogy.peridotite_smooth_slab": "윤나는 ê°ëžŒì•” ë°˜ 블ë¡", + "block.mineralogy.peridotite_smooth_brick": "윤나는 ê°ëžŒì•” ë²½ëŒ", + "block.mineralogy.peridotite_smooth_brick_stairs": "윤나는 ê°ëžŒì•” ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.peridotite_smooth_brick_slab": "윤나는 ê°ëžŒì•” ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.peridotite_wall": "ê°ëžŒì•” 담장", + "block.mineralogy.peridotite_brick_wall": "ê°ëžŒì•” ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.peridotite_smooth_wall": "윤나는 ê°ëžŒì•” 담장", + "block.mineralogy.peridotite_smooth_brick_wall": "윤나는 ê°ëžŒì•” ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.peridotite_furnace": "ê°ëžŒì•” 화로", + "block.mineralogy.peridotite_brick_furnace": "ê°ëžŒì•” ë²½ëŒ í™”ë¡œ", + "block.mineralogy.peridotite_smooth_furnace": "윤나는 ê°ëžŒì•” 화로", + "block.mineralogy.peridotite_smooth_brick_furnace": "윤나는 ê°ëžŒì•” ë²½ëŒ í™”ë¡œ", + "block.mineralogy.basaltic_glass": "현무암질 유리", + "block.mineralogy.basaltic_glass_stairs": "현무암질 유리 계단", + "block.mineralogy.basaltic_glass_slab": "현무암질 유리 ë°˜ 블ë¡", + "block.mineralogy.basaltic_glass_brick": "현무암질 유리 ë²½ëŒ", + "block.mineralogy.basaltic_glass_brick_stairs": "현무암질 유리 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.basaltic_glass_brick_slab": "현무암질 유리 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.basaltic_glass_smooth": "윤나는 현무암질 유리", + "block.mineralogy.basaltic_glass_smooth_stairs": "윤나는 현무암질 유리 계단", + "block.mineralogy.basaltic_glass_smooth_slab": "윤나는 현무암질 유리 ë°˜ 블ë¡", + "block.mineralogy.basaltic_glass_smooth_brick": "윤나는 현무암질 유리 ë²½ëŒ", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "윤나는 현무암질 유리 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "윤나는 현무암질 유리 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.basaltic_glass_wall": "현무암질 유리 담장", + "block.mineralogy.basaltic_glass_brick_wall": "현무암질 유리 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.basaltic_glass_smooth_wall": "윤나는 현무암질 유리 담장", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "윤나는 현무암질 유리 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.basaltic_glass_furnace": "현무암질 유리 화로", + "block.mineralogy.basaltic_glass_brick_furnace": "현무암질 유리 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.basaltic_glass_smooth_furnace": "윤나는 현무암질 유리 화로", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "윤나는 현무암질 유리 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.scoria": "스코리아", + "block.mineralogy.scoria_stairs": "스코리아 계단", + "block.mineralogy.scoria_slab": "스코리아 ë°˜ 블ë¡", + "block.mineralogy.scoria_brick": "스코리아 ë²½ëŒ", + "block.mineralogy.scoria_brick_stairs": "스코리아 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.scoria_brick_slab": "스코리아 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.scoria_smooth": "윤나는 스코리아", + "block.mineralogy.scoria_smooth_stairs": "윤나는 스코리아 계단", + "block.mineralogy.scoria_smooth_slab": "윤나는 스코리아 ë°˜ 블ë¡", + "block.mineralogy.scoria_smooth_brick": "윤나는 스코리아 ë²½ëŒ", + "block.mineralogy.scoria_smooth_brick_stairs": "윤나는 스코리아 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.scoria_smooth_brick_slab": "윤나는 스코리아 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.scoria_wall": "스코리아 담장", + "block.mineralogy.scoria_brick_wall": "스코리아 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.scoria_smooth_wall": "윤나는 스코리아 담장", + "block.mineralogy.scoria_smooth_brick_wall": "윤나는 스코리아 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.scoria_furnace": "스코리아 화로", + "block.mineralogy.scoria_brick_furnace": "스코리아 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.scoria_smooth_furnace": "윤나는 스코리아 화로", + "block.mineralogy.scoria_smooth_brick_furnace": "윤나는 스코리아 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.tuff": "ì‘회암", + "block.mineralogy.tuff_stairs": "ì‘회암 계단", + "block.mineralogy.tuff_slab": "ì‘회암 ë°˜ 블ë¡", + "block.mineralogy.tuff_brick": "ì‘회암 ë²½ëŒ", + "block.mineralogy.tuff_brick_stairs": "ì‘회암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.tuff_brick_slab": "ì‘회암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.tuff_smooth": "윤나는 ì‘회암", + "block.mineralogy.tuff_smooth_stairs": "윤나는 ì‘회암 계단", + "block.mineralogy.tuff_smooth_slab": "윤나는 ì‘회암 ë°˜ 블ë¡", + "block.mineralogy.tuff_smooth_brick": "윤나는 ì‘회암 ë²½ëŒ", + "block.mineralogy.tuff_smooth_brick_stairs": "윤나는 ì‘회암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.tuff_smooth_brick_slab": "윤나는 ì‘회암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.tuff_wall": "ì‘회암 담장", + "block.mineralogy.tuff_brick_wall": "ì‘회암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.tuff_smooth_wall": "윤나는 ì‘회암 담장", + "block.mineralogy.tuff_smooth_brick_wall": "윤나는 ì‘회암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.tuff_furnace": "ì‘회암 화로", + "block.mineralogy.tuff_brick_furnace": "ì‘회암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.tuff_smooth_furnace": "윤나는 ì‘회암 화로", + "block.mineralogy.tuff_smooth_brick_furnace": "윤나는 ì‘회암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.siltstone": "미사암", + "block.mineralogy.siltstone_stairs": "미사암 계단", + "block.mineralogy.siltstone_slab": "미사암 ë°˜ 블ë¡", + "block.mineralogy.siltstone_brick": "미사암 ë²½ëŒ", + "block.mineralogy.siltstone_brick_stairs": "미사암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.siltstone_brick_slab": "미사암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.siltstone_smooth": "윤나는 미사암", + "block.mineralogy.siltstone_smooth_stairs": "윤나는 미사암 계단", + "block.mineralogy.siltstone_smooth_slab": "윤나는 미사암 ë°˜ 블ë¡", + "block.mineralogy.siltstone_smooth_brick": "윤나는 미사암 ë²½ëŒ", + "block.mineralogy.siltstone_smooth_brick_stairs": "윤나는 미사암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.siltstone_smooth_brick_slab": "윤나는 미사암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.siltstone_wall": "미사암 담장", + "block.mineralogy.siltstone_brick_wall": "미사암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.siltstone_smooth_wall": "윤나는 미사암 담장", + "block.mineralogy.siltstone_smooth_brick_wall": "윤나는 미사암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.siltstone_furnace": "미사암 화로", + "block.mineralogy.siltstone_brick_furnace": "미사암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.siltstone_smooth_furnace": "윤나는 미사암 화로", + "block.mineralogy.siltstone_smooth_brick_furnace": "윤나는 미사암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.rock_salt": "암염", + "block.mineralogy.rock_salt_stairs": "암염 계단", + "block.mineralogy.rock_salt_slab": "암염 ë°˜ 블ë¡", + "block.mineralogy.rock_salt_brick": "암염 ë²½ëŒ", + "block.mineralogy.rock_salt_brick_stairs": "암염 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.rock_salt_brick_slab": "암염 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.rock_salt_smooth": "윤나는 암염", + "block.mineralogy.rock_salt_smooth_stairs": "윤나는 암염 계단", + "block.mineralogy.rock_salt_smooth_slab": "윤나는 암염 ë°˜ 블ë¡", + "block.mineralogy.rock_salt_smooth_brick": "윤나는 암염 ë²½ëŒ", + "block.mineralogy.rock_salt_smooth_brick_stairs": "윤나는 암염 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.rock_salt_smooth_brick_slab": "윤나는 암염 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.rock_salt_wall": "암염 담장", + "block.mineralogy.rock_salt_brick_wall": "암염 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.rock_salt_smooth_wall": "윤나는 암염 담장", + "block.mineralogy.rock_salt_smooth_brick_wall": "윤나는 암염 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.rock_salt_furnace": "암염 화로", + "block.mineralogy.rock_salt_brick_furnace": "암염 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.rock_salt_smooth_furnace": "윤나는 암염 화로", + "block.mineralogy.rock_salt_smooth_brick_furnace": "윤나는 암염 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.hornfels": "혼펠스", + "block.mineralogy.hornfels_stairs": "혼펠스 계단", + "block.mineralogy.hornfels_slab": "혼펠스 ë°˜ 블ë¡", + "block.mineralogy.hornfels_brick": "혼펠스 ë²½ëŒ", + "block.mineralogy.hornfels_brick_stairs": "혼펠스 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.hornfels_brick_slab": "혼펠스 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.hornfels_smooth": "윤나는 혼펠스", + "block.mineralogy.hornfels_smooth_stairs": "윤나는 혼펠스 계단", + "block.mineralogy.hornfels_smooth_slab": "윤나는 혼펠스 ë°˜ 블ë¡", + "block.mineralogy.hornfels_smooth_brick": "윤나는 혼펠스 ë²½ëŒ", + "block.mineralogy.hornfels_smooth_brick_stairs": "윤나는 혼펠스 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.hornfels_smooth_brick_slab": "윤나는 혼펠스 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.hornfels_wall": "혼펠스 담장", + "block.mineralogy.hornfels_brick_wall": "혼펠스 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.hornfels_smooth_wall": "윤나는 혼펠스 담장", + "block.mineralogy.hornfels_smooth_brick_wall": "윤나는 혼펠스 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.hornfels_furnace": "혼펠스 화로", + "block.mineralogy.hornfels_brick_furnace": "혼펠스 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.hornfels_smooth_furnace": "윤나는 혼펠스 화로", + "block.mineralogy.hornfels_smooth_brick_furnace": "윤나는 혼펠스 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.quartzite": "규암", + "block.mineralogy.quartzite_stairs": "규암 계단", + "block.mineralogy.quartzite_slab": "규암 ë°˜ 블ë¡", + "block.mineralogy.quartzite_brick": "규암 ë²½ëŒ", + "block.mineralogy.quartzite_brick_stairs": "규암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.quartzite_brick_slab": "규암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.quartzite_smooth": "윤나는 규암", + "block.mineralogy.quartzite_smooth_stairs": "윤나는 규암 계단", + "block.mineralogy.quartzite_smooth_slab": "윤나는 규암 ë°˜ 블ë¡", + "block.mineralogy.quartzite_smooth_brick": "윤나는 규암 ë²½ëŒ", + "block.mineralogy.quartzite_smooth_brick_stairs": "윤나는 규암 ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.quartzite_smooth_brick_slab": "윤나는 규암 ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.quartzite_wall": "규암 담장", + "block.mineralogy.quartzite_brick_wall": "규암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.quartzite_smooth_wall": "윤나는 규암 담장", + "block.mineralogy.quartzite_smooth_brick_wall": "윤나는 규암 ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.quartzite_furnace": "규암 화로", + "block.mineralogy.quartzite_brick_furnace": "규암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.quartzite_smooth_furnace": "윤나는 규암 화로", + "block.mineralogy.quartzite_smooth_brick_furnace": "윤나는 규암 ë²½ëŒ í™”ë¡œ", + "block.mineralogy.novaculite": "노바í˜ë¼ì´íŠ¸", + "block.mineralogy.novaculite_stairs": "노바í˜ë¼ì´íŠ¸ 계단", + "block.mineralogy.novaculite_slab": "노바í˜ë¼ì´íŠ¸ ë°˜ 블ë¡", + "block.mineralogy.novaculite_brick": "노바í˜ë¼ì´íŠ¸ ë²½ëŒ", + "block.mineralogy.novaculite_brick_stairs": "노바í˜ë¼ì´íŠ¸ ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.novaculite_brick_slab": "노바í˜ë¼ì´íŠ¸ ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.novaculite_smooth": "윤나는 노바í˜ë¼ì´íŠ¸", + "block.mineralogy.novaculite_smooth_stairs": "윤나는 노바í˜ë¼ì´íŠ¸ 계단", + "block.mineralogy.novaculite_smooth_slab": "윤나는 노바í˜ë¼ì´íŠ¸ ë°˜ 블ë¡", + "block.mineralogy.novaculite_smooth_brick": "윤나는 노바í˜ë¼ì´íŠ¸ ë²½ëŒ", + "block.mineralogy.novaculite_smooth_brick_stairs": "윤나는 노바í˜ë¼ì´íŠ¸ ë²½ëŒ ê³„ë‹¨", + "block.mineralogy.novaculite_smooth_brick_slab": "윤나는 노바í˜ë¼ì´íŠ¸ ë²½ëŒ ë°˜ 블ë¡", + "block.mineralogy.novaculite_wall": "노바í˜ë¼ì´íŠ¸ 담장", + "block.mineralogy.novaculite_brick_wall": "노바í˜ë¼ì´íŠ¸ ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.novaculite_smooth_wall": "윤나는 노바í˜ë¼ì´íŠ¸ 담장", + "block.mineralogy.novaculite_smooth_brick_wall": "윤나는 노바í˜ë¼ì´íŠ¸ ë²½ëŒ ë‹´ìž¥", + "block.mineralogy.novaculite_furnace": "노바í˜ë¼ì´íŠ¸ 화로", + "block.mineralogy.novaculite_brick_furnace": "노바í˜ë¼ì´íŠ¸ ë²½ëŒ í™”ë¡œ", + "block.mineralogy.novaculite_smooth_furnace": "윤나는 노바í˜ë¼ì´íŠ¸ 화로", + "block.mineralogy.novaculite_smooth_brick_furnace": "윤나는 노바í˜ë¼ì´íŠ¸ ë²½ëŒ í™”ë¡œ", + "block.mineralogy.chalk": "분필", + "item.mineralogy.chalk_dust": "분필 가루", + "item.mineralogy.salt_dust": "소금", + "item.mineralogy.rock_salt_dust": "암염 ê²°ì •", + "block.mineralogy.rocksaltlamp": "암염 램프", + "block.mineralogy.rocksaltstreetlamp": "암염 가로등", + "block.mineralogy.andesite_relief_axe": "안산암 부조 (ë„ë¼)", + "block.mineralogy.andesite_relief_blank": "안산암 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.andesite_relief_cross": "안산암 부조 (ì‹­ìž)", + "block.mineralogy.andesite_relief_hammer": "안산암 부조 (ë§ì¹˜)", + "block.mineralogy.andesite_relief_hoe": "안산암 부조 (ê´­ì´)", + "block.mineralogy.andesite_relief_horizontal": "안산암 부조 (가로)", + "block.mineralogy.andesite_relief_i": "안산암 부조 (I)", + "block.mineralogy.andesite_relief_left": "안산암 부조 (왼쪽)", + "block.mineralogy.andesite_relief_pickaxe": "안산암 부조 (곡괭ì´)", + "block.mineralogy.andesite_relief_plus": "안산암 부조 (ë”하기 기호)", + "block.mineralogy.andesite_relief_right": "안산암 부조 (오른쪽)", + "block.mineralogy.andesite_relief_sword": "안산암 부조 (ê²€)", + "block.mineralogy.andesite_relief_vertical": "안산암 부조 (세로)", + "block.mineralogy.basalt_relief_axe": "현무암 부조 (ë„ë¼)", + "block.mineralogy.basalt_relief_blank": "현무암 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.basalt_relief_cross": "현무암 부조 (ì‹­ìž)", + "block.mineralogy.basalt_relief_hammer": "현무암 부조 (ë§ì¹˜)", + "block.mineralogy.basalt_relief_hoe": "현무암 부조 (ê´­ì´)", + "block.mineralogy.basalt_relief_horizontal": "현무암 부조 (가로)", + "block.mineralogy.basalt_relief_i": "현무암 부조 (I)", + "block.mineralogy.basalt_relief_left": "현무암 부조 (왼쪽)", + "block.mineralogy.basalt_relief_pickaxe": "현무암 부조 (곡괭ì´)", + "block.mineralogy.basalt_relief_plus": "현무암 부조 (ë”하기 기호)", + "block.mineralogy.basalt_relief_right": "현무암 부조 (오른쪽)", + "block.mineralogy.basalt_relief_sword": "현무암 부조 (ê²€)", + "block.mineralogy.basalt_relief_vertical": "현무암 부조 (세로)", + "block.mineralogy.diorite_relief_axe": "섬ë¡ì•” 부조 (ë„ë¼)", + "block.mineralogy.diorite_relief_blank": "섬ë¡ì•” 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.diorite_relief_cross": "섬ë¡ì•” 부조 (ì‹­ìž)", + "block.mineralogy.diorite_relief_hammer": "섬ë¡ì•” 부조 (ë§ì¹˜)", + "block.mineralogy.diorite_relief_hoe": "섬ë¡ì•” 부조 (ê´­ì´)", + "block.mineralogy.diorite_relief_horizontal": "섬ë¡ì•” 부조 (가로)", + "block.mineralogy.diorite_relief_i": "섬ë¡ì•” 부조 (I)", + "block.mineralogy.diorite_relief_left": "섬ë¡ì•” 부조 (왼쪽)", + "block.mineralogy.diorite_relief_pickaxe": "섬ë¡ì•” 부조 (곡괭ì´)", + "block.mineralogy.diorite_relief_plus": "섬ë¡ì•” 부조 (ë”하기 기호)", + "block.mineralogy.diorite_relief_right": "섬ë¡ì•” 부조 (오른쪽)", + "block.mineralogy.diorite_relief_sword": "섬ë¡ì•” 부조 (ê²€)", + "block.mineralogy.diorite_relief_vertical": "섬ë¡ì•” 부조 (세로)", + "block.mineralogy.granite_relief_axe": "화강암 부조 (ë„ë¼)", + "block.mineralogy.granite_relief_blank": "화강암 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.granite_relief_cross": "화강암 부조 (ì‹­ìž)", + "block.mineralogy.granite_relief_hammer": "화강암 부조 (ë§ì¹˜)", + "block.mineralogy.granite_relief_hoe": "화강암 부조 (ê´­ì´)", + "block.mineralogy.granite_relief_horizontal": "화강암 부조 (가로)", + "block.mineralogy.granite_relief_i": "화강암 부조 (I)", + "block.mineralogy.granite_relief_left": "화강암 부조 (왼쪽)", + "block.mineralogy.granite_relief_pickaxe": "화강암 부조 (곡괭ì´)", + "block.mineralogy.granite_relief_plus": "화강암 부조 (ë”하기 기호)", + "block.mineralogy.granite_relief_right": "화강암 부조 (오른쪽)", + "block.mineralogy.granite_relief_sword": "화강암 부조 (ê²€)", + "block.mineralogy.granite_relief_vertical": "화강암 부조 (세로)", + "block.mineralogy.rhyolite_relief_axe": "유문암 부조 (ë„ë¼)", + "block.mineralogy.rhyolite_relief_blank": "유문암 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.rhyolite_relief_cross": "유문암 부조 (ì‹­ìž)", + "block.mineralogy.rhyolite_relief_hammer": "유문암 부조 (ë§ì¹˜)", + "block.mineralogy.rhyolite_relief_hoe": "유문암 부조 (ê´­ì´)", + "block.mineralogy.rhyolite_relief_horizontal": "유문암 부조 (가로)", + "block.mineralogy.rhyolite_relief_i": "유문암 부조 (I)", + "block.mineralogy.rhyolite_relief_left": "유문암 부조 (왼쪽)", + "block.mineralogy.rhyolite_relief_pickaxe": "유문암 부조 (곡괭ì´)", + "block.mineralogy.rhyolite_relief_plus": "유문암 부조 (ë”하기 기호)", + "block.mineralogy.rhyolite_relief_right": "유문암 부조 (오른쪽)", + "block.mineralogy.rhyolite_relief_sword": "유문암 부조 (ê²€)", + "block.mineralogy.rhyolite_relief_vertical": "유문암 부조 (세로)", + "block.mineralogy.pegmatite_relief_axe": "페그마타ì´íŠ¸ 부조 (ë„ë¼)", + "block.mineralogy.pegmatite_relief_blank": "페그마타ì´íŠ¸ 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.pegmatite_relief_cross": "페그마타ì´íŠ¸ 부조 (ì‹­ìž)", + "block.mineralogy.pegmatite_relief_hammer": "페그마타ì´íŠ¸ 부조 (ë§ì¹˜)", + "block.mineralogy.pegmatite_relief_hoe": "페그마타ì´íŠ¸ 부조 (ê´­ì´)", + "block.mineralogy.pegmatite_relief_horizontal": "페그마타ì´íŠ¸ 부조 (가로)", + "block.mineralogy.pegmatite_relief_i": "페그마타ì´íŠ¸ 부조 (I)", + "block.mineralogy.pegmatite_relief_left": "페그마타ì´íŠ¸ 부조 (왼쪽)", + "block.mineralogy.pegmatite_relief_pickaxe": "페그마타ì´íŠ¸ 부조 (곡괭ì´)", + "block.mineralogy.pegmatite_relief_plus": "페그마타ì´íŠ¸ 부조 (ë”하기 기호)", + "block.mineralogy.pegmatite_relief_right": "페그마타ì´íŠ¸ 부조 (오른쪽)", + "block.mineralogy.pegmatite_relief_sword": "페그마타ì´íŠ¸ 부조 (ê²€)", + "block.mineralogy.pegmatite_relief_vertical": "페그마타ì´íŠ¸ 부조 (세로)", + "block.mineralogy.shale_relief_axe": "ì…°ì¼ ë¶€ì¡° (ë„ë¼)", + "block.mineralogy.shale_relief_blank": "ì…°ì¼ ë¶€ì¡° (무늬 ì—†ìŒ)", + "block.mineralogy.shale_relief_cross": "ì…°ì¼ ë¶€ì¡° (ì‹­ìž)", + "block.mineralogy.shale_relief_hammer": "ì…°ì¼ ë¶€ì¡° (ë§ì¹˜)", + "block.mineralogy.shale_relief_hoe": "ì…°ì¼ ë¶€ì¡° (ê´­ì´)", + "block.mineralogy.shale_relief_horizontal": "ì…°ì¼ ë¶€ì¡° (가로)", + "block.mineralogy.shale_relief_i": "ì…°ì¼ ë¶€ì¡° (I)", + "block.mineralogy.shale_relief_left": "ì…°ì¼ ë¶€ì¡° (왼쪽)", + "block.mineralogy.shale_relief_pickaxe": "ì…°ì¼ ë¶€ì¡° (곡괭ì´)", + "block.mineralogy.shale_relief_plus": "ì…°ì¼ ë¶€ì¡° (ë”하기 기호)", + "block.mineralogy.shale_relief_right": "ì…°ì¼ ë¶€ì¡° (오른쪽)", + "block.mineralogy.shale_relief_sword": "ì…°ì¼ ë¶€ì¡° (ê²€)", + "block.mineralogy.shale_relief_vertical": "ì…°ì¼ ë¶€ì¡° (세로)", + "block.mineralogy.conglomerate_relief_axe": "ì—­ì•” 부조 (ë„ë¼)", + "block.mineralogy.conglomerate_relief_blank": "ì—­ì•” 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.conglomerate_relief_cross": "ì—­ì•” 부조 (ì‹­ìž)", + "block.mineralogy.conglomerate_relief_hammer": "ì—­ì•” 부조 (ë§ì¹˜)", + "block.mineralogy.conglomerate_relief_hoe": "ì—­ì•” 부조 (ê´­ì´)", + "block.mineralogy.conglomerate_relief_horizontal": "ì—­ì•” 부조 (가로)", + "block.mineralogy.conglomerate_relief_i": "ì—­ì•” 부조 (I)", + "block.mineralogy.conglomerate_relief_left": "ì—­ì•” 부조 (왼쪽)", + "block.mineralogy.conglomerate_relief_pickaxe": "ì—­ì•” 부조 (곡괭ì´)", + "block.mineralogy.conglomerate_relief_plus": "ì—­ì•” 부조 (ë”하기 기호)", + "block.mineralogy.conglomerate_relief_right": "ì—­ì•” 부조 (오른쪽)", + "block.mineralogy.conglomerate_relief_sword": "ì—­ì•” 부조 (ê²€)", + "block.mineralogy.conglomerate_relief_vertical": "ì—­ì•” 부조 (세로)", + "block.mineralogy.dolomite_relief_axe": "백운암 부조 (ë„ë¼)", + "block.mineralogy.dolomite_relief_blank": "백운암 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.dolomite_relief_cross": "백운암 부조 (ì‹­ìž)", + "block.mineralogy.dolomite_relief_hammer": "백운암 부조 (ë§ì¹˜)", + "block.mineralogy.dolomite_relief_hoe": "백운암 부조 (ê´­ì´)", + "block.mineralogy.dolomite_relief_horizontal": "백운암 부조 (가로)", + "block.mineralogy.dolomite_relief_i": "백운암 부조 (I)", + "block.mineralogy.dolomite_relief_left": "백운암 부조 (왼쪽)", + "block.mineralogy.dolomite_relief_pickaxe": "백운암 부조 (곡괭ì´)", + "block.mineralogy.dolomite_relief_plus": "백운암 부조 (ë”하기 기호)", + "block.mineralogy.dolomite_relief_right": "백운암 부조 (오른쪽)", + "block.mineralogy.dolomite_relief_sword": "백운암 부조 (ê²€)", + "block.mineralogy.dolomite_relief_vertical": "백운암 부조 (세로)", + "block.mineralogy.limestone_relief_axe": "ì„회암 부조 (ë„ë¼)", + "block.mineralogy.limestone_relief_blank": "ì„회암 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.limestone_relief_cross": "ì„회암 부조 (ì‹­ìž)", + "block.mineralogy.limestone_relief_hammer": "ì„회암 부조 (ë§ì¹˜)", + "block.mineralogy.limestone_relief_hoe": "ì„회암 부조 (ê´­ì´)", + "block.mineralogy.limestone_relief_horizontal": "ì„회암 부조 (가로)", + "block.mineralogy.limestone_relief_i": "ì„회암 부조 (I)", + "block.mineralogy.limestone_relief_left": "ì„회암 부조 (왼쪽)", + "block.mineralogy.limestone_relief_pickaxe": "ì„회암 부조 (곡괭ì´)", + "block.mineralogy.limestone_relief_plus": "ì„회암 부조 (ë”하기 기호)", + "block.mineralogy.limestone_relief_right": "ì„회암 부조 (오른쪽)", + "block.mineralogy.limestone_relief_sword": "ì„회암 부조 (ê²€)", + "block.mineralogy.limestone_relief_vertical": "ì„회암 부조 (세로)", + "block.mineralogy.marble_relief_axe": "ëŒ€ë¦¬ì„ ë¶€ì¡° (ë„ë¼)", + "block.mineralogy.marble_relief_blank": "ëŒ€ë¦¬ì„ ë¶€ì¡° (무늬 ì—†ìŒ)", + "block.mineralogy.marble_relief_cross": "ëŒ€ë¦¬ì„ ë¶€ì¡° (ì‹­ìž)", + "block.mineralogy.marble_relief_hammer": "ëŒ€ë¦¬ì„ ë¶€ì¡° (ë§ì¹˜)", + "block.mineralogy.marble_relief_hoe": "ëŒ€ë¦¬ì„ ë¶€ì¡° (ê´­ì´)", + "block.mineralogy.marble_relief_horizontal": "ëŒ€ë¦¬ì„ ë¶€ì¡° (가로)", + "block.mineralogy.marble_relief_i": "ëŒ€ë¦¬ì„ ë¶€ì¡° (I)", + "block.mineralogy.marble_relief_left": "ëŒ€ë¦¬ì„ ë¶€ì¡° (왼쪽)", + "block.mineralogy.marble_relief_pickaxe": "ëŒ€ë¦¬ì„ ë¶€ì¡° (곡괭ì´)", + "block.mineralogy.marble_relief_plus": "ëŒ€ë¦¬ì„ ë¶€ì¡° (ë”하기 기호)", + "block.mineralogy.marble_relief_right": "ëŒ€ë¦¬ì„ ë¶€ì¡° (오른쪽)", + "block.mineralogy.marble_relief_sword": "ëŒ€ë¦¬ì„ ë¶€ì¡° (ê²€)", + "block.mineralogy.marble_relief_vertical": "ëŒ€ë¦¬ì„ ë¶€ì¡° (세로)", + "block.mineralogy.slate_relief_axe": "ì íŒì•” 부조 (ë„ë¼)", + "block.mineralogy.slate_relief_blank": "ì íŒì•” 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.slate_relief_cross": "ì íŒì•” 부조 (ì‹­ìž)", + "block.mineralogy.slate_relief_hammer": "ì íŒì•” 부조 (ë§ì¹˜)", + "block.mineralogy.slate_relief_hoe": "ì íŒì•” 부조 (ê´­ì´)", + "block.mineralogy.slate_relief_horizontal": "ì íŒì•” 부조 (가로)", + "block.mineralogy.slate_relief_i": "ì íŒì•” 부조 (I)", + "block.mineralogy.slate_relief_left": "ì íŒì•” 부조 (왼쪽)", + "block.mineralogy.slate_relief_pickaxe": "ì íŒì•” 부조 (곡괭ì´)", + "block.mineralogy.slate_relief_plus": "ì íŒì•” 부조 (ë”하기 기호)", + "block.mineralogy.slate_relief_right": "ì íŒì•” 부조 (오른쪽)", + "block.mineralogy.slate_relief_sword": "ì íŒì•” 부조 (ê²€)", + "block.mineralogy.slate_relief_vertical": "ì íŒì•” 부조 (세로)", + "block.mineralogy.schist_relief_axe": "편암 부조 (ë„ë¼)", + "block.mineralogy.schist_relief_blank": "편암 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.schist_relief_cross": "편암 부조 (ì‹­ìž)", + "block.mineralogy.schist_relief_hammer": "편암 부조 (ë§ì¹˜)", + "block.mineralogy.schist_relief_hoe": "편암 부조 (ê´­ì´)", + "block.mineralogy.schist_relief_horizontal": "편암 부조 (가로)", + "block.mineralogy.schist_relief_i": "편암 부조 (I)", + "block.mineralogy.schist_relief_left": "편암 부조 (왼쪽)", + "block.mineralogy.schist_relief_pickaxe": "편암 부조 (곡괭ì´)", + "block.mineralogy.schist_relief_plus": "편암 부조 (ë”하기 기호)", + "block.mineralogy.schist_relief_right": "편암 부조 (오른쪽)", + "block.mineralogy.schist_relief_sword": "편암 부조 (ê²€)", + "block.mineralogy.schist_relief_vertical": "편암 부조 (세로)", + "block.mineralogy.gneiss_relief_axe": "편마암 부조 (ë„ë¼)", + "block.mineralogy.gneiss_relief_blank": "편마암 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.gneiss_relief_cross": "편마암 부조 (ì‹­ìž)", + "block.mineralogy.gneiss_relief_hammer": "편마암 부조 (ë§ì¹˜)", + "block.mineralogy.gneiss_relief_hoe": "편마암 부조 (ê´­ì´)", + "block.mineralogy.gneiss_relief_horizontal": "편마암 부조 (가로)", + "block.mineralogy.gneiss_relief_i": "편마암 부조 (I)", + "block.mineralogy.gneiss_relief_left": "편마암 부조 (왼쪽)", + "block.mineralogy.gneiss_relief_pickaxe": "편마암 부조 (곡괭ì´)", + "block.mineralogy.gneiss_relief_plus": "편마암 부조 (ë”하기 기호)", + "block.mineralogy.gneiss_relief_right": "편마암 부조 (오른쪽)", + "block.mineralogy.gneiss_relief_sword": "편마암 부조 (ê²€)", + "block.mineralogy.gneiss_relief_vertical": "편마암 부조 (세로)", + "block.mineralogy.phyllite_relief_axe": "천매암 부조 (ë„ë¼)", + "block.mineralogy.phyllite_relief_blank": "천매암 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.phyllite_relief_cross": "천매암 부조 (ì‹­ìž)", + "block.mineralogy.phyllite_relief_hammer": "천매암 부조 (ë§ì¹˜)", + "block.mineralogy.phyllite_relief_hoe": "천매암 부조 (ê´­ì´)", + "block.mineralogy.phyllite_relief_horizontal": "천매암 부조 (가로)", + "block.mineralogy.phyllite_relief_i": "천매암 부조 (I)", + "block.mineralogy.phyllite_relief_left": "천매암 부조 (왼쪽)", + "block.mineralogy.phyllite_relief_pickaxe": "천매암 부조 (곡괭ì´)", + "block.mineralogy.phyllite_relief_plus": "천매암 부조 (ë”하기 기호)", + "block.mineralogy.phyllite_relief_right": "천매암 부조 (오른쪽)", + "block.mineralogy.phyllite_relief_sword": "천매암 부조 (ê²€)", + "block.mineralogy.phyllite_relief_vertical": "천매암 부조 (세로)", + "block.mineralogy.amphibolite_relief_axe": "ê°ì„¬ì•” 부조 (ë„ë¼)", + "block.mineralogy.amphibolite_relief_blank": "ê°ì„¬ì•” 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.amphibolite_relief_cross": "ê°ì„¬ì•” 부조 (ì‹­ìž)", + "block.mineralogy.amphibolite_relief_hammer": "ê°ì„¬ì•” 부조 (ë§ì¹˜)", + "block.mineralogy.amphibolite_relief_hoe": "ê°ì„¬ì•” 부조 (ê´­ì´)", + "block.mineralogy.amphibolite_relief_horizontal": "ê°ì„¬ì•” 부조 (가로)", + "block.mineralogy.amphibolite_relief_i": "ê°ì„¬ì•” 부조 (I)", + "block.mineralogy.amphibolite_relief_left": "ê°ì„¬ì•” 부조 (왼쪽)", + "block.mineralogy.amphibolite_relief_pickaxe": "ê°ì„¬ì•” 부조 (곡괭ì´)", + "block.mineralogy.amphibolite_relief_plus": "ê°ì„¬ì•” 부조 (ë”하기 기호)", + "block.mineralogy.amphibolite_relief_right": "ê°ì„¬ì•” 부조 (오른쪽)", + "block.mineralogy.amphibolite_relief_sword": "ê°ì„¬ì•” 부조 (ê²€)", + "block.mineralogy.amphibolite_relief_vertical": "ê°ì„¬ì•” 부조 (세로)", + "block.mineralogy.diabase_relief_axe": "휘ë¡ì•” 부조 (ë„ë¼)", + "block.mineralogy.diabase_relief_blank": "휘ë¡ì•” 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.diabase_relief_cross": "휘ë¡ì•” 부조 (ì‹­ìž)", + "block.mineralogy.diabase_relief_hammer": "휘ë¡ì•” 부조 (ë§ì¹˜)", + "block.mineralogy.diabase_relief_hoe": "휘ë¡ì•” 부조 (ê´­ì´)", + "block.mineralogy.diabase_relief_horizontal": "휘ë¡ì•” 부조 (가로)", + "block.mineralogy.diabase_relief_i": "휘ë¡ì•” 부조 (I)", + "block.mineralogy.diabase_relief_left": "휘ë¡ì•” 부조 (왼쪽)", + "block.mineralogy.diabase_relief_pickaxe": "휘ë¡ì•” 부조 (곡괭ì´)", + "block.mineralogy.diabase_relief_plus": "휘ë¡ì•” 부조 (ë”하기 기호)", + "block.mineralogy.diabase_relief_right": "휘ë¡ì•” 부조 (오른쪽)", + "block.mineralogy.diabase_relief_sword": "휘ë¡ì•” 부조 (ê²€)", + "block.mineralogy.diabase_relief_vertical": "휘ë¡ì•” 부조 (세로)", + "block.mineralogy.gabbro_relief_axe": "반려암 부조 (ë„ë¼)", + "block.mineralogy.gabbro_relief_blank": "반려암 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.gabbro_relief_cross": "반려암 부조 (ì‹­ìž)", + "block.mineralogy.gabbro_relief_hammer": "반려암 부조 (ë§ì¹˜)", + "block.mineralogy.gabbro_relief_hoe": "반려암 부조 (ê´­ì´)", + "block.mineralogy.gabbro_relief_horizontal": "반려암 부조 (가로)", + "block.mineralogy.gabbro_relief_i": "반려암 부조 (I)", + "block.mineralogy.gabbro_relief_left": "반려암 부조 (왼쪽)", + "block.mineralogy.gabbro_relief_pickaxe": "반려암 부조 (곡괭ì´)", + "block.mineralogy.gabbro_relief_plus": "반려암 부조 (ë”하기 기호)", + "block.mineralogy.gabbro_relief_right": "반려암 부조 (오른쪽)", + "block.mineralogy.gabbro_relief_sword": "반려암 부조 (ê²€)", + "block.mineralogy.gabbro_relief_vertical": "반려암 부조 (세로)", + "block.mineralogy.peridotite_relief_axe": "ê°ëžŒì•” 부조 (ë„ë¼)", + "block.mineralogy.peridotite_relief_blank": "ê°ëžŒì•” 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.peridotite_relief_cross": "ê°ëžŒì•” 부조 (ì‹­ìž)", + "block.mineralogy.peridotite_relief_hammer": "ê°ëžŒì•” 부조 (ë§ì¹˜)", + "block.mineralogy.peridotite_relief_hoe": "ê°ëžŒì•” 부조 (ê´­ì´)", + "block.mineralogy.peridotite_relief_horizontal": "ê°ëžŒì•” 부조 (가로)", + "block.mineralogy.peridotite_relief_i": "ê°ëžŒì•” 부조 (I)", + "block.mineralogy.peridotite_relief_left": "ê°ëžŒì•” 부조 (왼쪽)", + "block.mineralogy.peridotite_relief_pickaxe": "ê°ëžŒì•” 부조 (곡괭ì´)", + "block.mineralogy.peridotite_relief_plus": "ê°ëžŒì•” 부조 (ë”하기 기호)", + "block.mineralogy.peridotite_relief_right": "ê°ëžŒì•” 부조 (오른쪽)", + "block.mineralogy.peridotite_relief_sword": "ê°ëžŒì•” 부조 (ê²€)", + "block.mineralogy.peridotite_relief_vertical": "ê°ëžŒì•” 부조 (세로)", + "block.mineralogy.basaltic_glass_relief_axe": "현무암질 유리 부조 (ë„ë¼)", + "block.mineralogy.basaltic_glass_relief_blank": "현무암질 유리 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.basaltic_glass_relief_cross": "현무암질 유리 부조 (ì‹­ìž)", + "block.mineralogy.basaltic_glass_relief_hammer": "현무암질 유리 부조 (ë§ì¹˜)", + "block.mineralogy.basaltic_glass_relief_hoe": "현무암질 유리 부조 (ê´­ì´)", + "block.mineralogy.basaltic_glass_relief_horizontal": "현무암질 유리 부조 (가로)", + "block.mineralogy.basaltic_glass_relief_i": "현무암질 유리 부조 (I)", + "block.mineralogy.basaltic_glass_relief_left": "현무암질 유리 부조 (왼쪽)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "현무암질 유리 부조 (곡괭ì´)", + "block.mineralogy.basaltic_glass_relief_plus": "현무암질 유리 부조 (ë”하기 기호)", + "block.mineralogy.basaltic_glass_relief_right": "현무암질 유리 부조 (오른쪽)", + "block.mineralogy.basaltic_glass_relief_sword": "현무암질 유리 부조 (ê²€)", + "block.mineralogy.basaltic_glass_relief_vertical": "현무암질 유리 부조 (세로)", + "block.mineralogy.scoria_relief_axe": "스코리아 부조 (ë„ë¼)", + "block.mineralogy.scoria_relief_blank": "스코리아 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.scoria_relief_cross": "스코리아 부조 (ì‹­ìž)", + "block.mineralogy.scoria_relief_hammer": "스코리아 부조 (ë§ì¹˜)", + "block.mineralogy.scoria_relief_hoe": "스코리아 부조 (ê´­ì´)", + "block.mineralogy.scoria_relief_horizontal": "스코리아 부조 (가로)", + "block.mineralogy.scoria_relief_i": "스코리아 부조 (I)", + "block.mineralogy.scoria_relief_left": "스코리아 부조 (왼쪽)", + "block.mineralogy.scoria_relief_pickaxe": "스코리아 부조 (곡괭ì´)", + "block.mineralogy.scoria_relief_plus": "스코리아 부조 (ë”하기 기호)", + "block.mineralogy.scoria_relief_right": "스코리아 부조 (오른쪽)", + "block.mineralogy.scoria_relief_sword": "스코리아 부조 (ê²€)", + "block.mineralogy.scoria_relief_vertical": "스코리아 부조 (세로)", + "block.mineralogy.tuff_relief_axe": "ì‘회암 부조 (ë„ë¼)", + "block.mineralogy.tuff_relief_blank": "ì‘회암 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.tuff_relief_cross": "ì‘회암 부조 (ì‹­ìž)", + "block.mineralogy.tuff_relief_hammer": "ì‘회암 부조 (ë§ì¹˜)", + "block.mineralogy.tuff_relief_hoe": "ì‘회암 부조 (ê´­ì´)", + "block.mineralogy.tuff_relief_horizontal": "ì‘회암 부조 (가로)", + "block.mineralogy.tuff_relief_i": "ì‘회암 부조 (I)", + "block.mineralogy.tuff_relief_left": "ì‘회암 부조 (왼쪽)", + "block.mineralogy.tuff_relief_pickaxe": "ì‘회암 부조 (곡괭ì´)", + "block.mineralogy.tuff_relief_plus": "ì‘회암 부조 (ë”하기 기호)", + "block.mineralogy.tuff_relief_right": "ì‘회암 부조 (오른쪽)", + "block.mineralogy.tuff_relief_sword": "ì‘회암 부조 (ê²€)", + "block.mineralogy.tuff_relief_vertical": "ì‘회암 부조 (세로)", + "block.mineralogy.siltstone_relief_axe": "미사암 부조 (ë„ë¼)", + "block.mineralogy.siltstone_relief_blank": "미사암 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.siltstone_relief_cross": "미사암 부조 (ì‹­ìž)", + "block.mineralogy.siltstone_relief_hammer": "미사암 부조 (ë§ì¹˜)", + "block.mineralogy.siltstone_relief_hoe": "미사암 부조 (ê´­ì´)", + "block.mineralogy.siltstone_relief_horizontal": "미사암 부조 (가로)", + "block.mineralogy.siltstone_relief_i": "미사암 부조 (I)", + "block.mineralogy.siltstone_relief_left": "미사암 부조 (왼쪽)", + "block.mineralogy.siltstone_relief_pickaxe": "미사암 부조 (곡괭ì´)", + "block.mineralogy.siltstone_relief_plus": "미사암 부조 (ë”하기 기호)", + "block.mineralogy.siltstone_relief_right": "미사암 부조 (오른쪽)", + "block.mineralogy.siltstone_relief_sword": "미사암 부조 (ê²€)", + "block.mineralogy.siltstone_relief_vertical": "미사암 부조 (세로)", + "block.mineralogy.rock_salt_relief_axe": "암염 부조 (ë„ë¼)", + "block.mineralogy.rock_salt_relief_blank": "암염 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.rock_salt_relief_cross": "암염 부조 (ì‹­ìž)", + "block.mineralogy.rock_salt_relief_hammer": "암염 부조 (ë§ì¹˜)", + "block.mineralogy.rock_salt_relief_hoe": "암염 부조 (ê´­ì´)", + "block.mineralogy.rock_salt_relief_horizontal": "암염 부조 (가로)", + "block.mineralogy.rock_salt_relief_i": "암염 부조 (I)", + "block.mineralogy.rock_salt_relief_left": "암염 부조 (왼쪽)", + "block.mineralogy.rock_salt_relief_pickaxe": "암염 부조 (곡괭ì´)", + "block.mineralogy.rock_salt_relief_plus": "암염 부조 (ë”하기 기호)", + "block.mineralogy.rock_salt_relief_right": "암염 부조 (오른쪽)", + "block.mineralogy.rock_salt_relief_sword": "암염 부조 (ê²€)", + "block.mineralogy.rock_salt_relief_vertical": "암염 부조 (세로)", + "block.mineralogy.hornfels_relief_axe": "혼펠스 부조 (ë„ë¼)", + "block.mineralogy.hornfels_relief_blank": "혼펠스 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.hornfels_relief_cross": "혼펠스 부조 (ì‹­ìž)", + "block.mineralogy.hornfels_relief_hammer": "혼펠스 부조 (ë§ì¹˜)", + "block.mineralogy.hornfels_relief_hoe": "혼펠스 부조 (ê´­ì´)", + "block.mineralogy.hornfels_relief_horizontal": "혼펠스 부조 (가로)", + "block.mineralogy.hornfels_relief_i": "혼펠스 부조 (I)", + "block.mineralogy.hornfels_relief_left": "혼펠스 부조 (왼쪽)", + "block.mineralogy.hornfels_relief_pickaxe": "혼펠스 부조 (곡괭ì´)", + "block.mineralogy.hornfels_relief_plus": "혼펠스 부조 (ë”하기 기호)", + "block.mineralogy.hornfels_relief_right": "혼펠스 부조 (오른쪽)", + "block.mineralogy.hornfels_relief_sword": "혼펠스 부조 (ê²€)", + "block.mineralogy.hornfels_relief_vertical": "혼펠스 부조 (세로)", + "block.mineralogy.quartzite_relief_axe": "규암 부조 (ë„ë¼)", + "block.mineralogy.quartzite_relief_blank": "규암 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.quartzite_relief_cross": "규암 부조 (ì‹­ìž)", + "block.mineralogy.quartzite_relief_hammer": "규암 부조 (ë§ì¹˜)", + "block.mineralogy.quartzite_relief_hoe": "규암 부조 (ê´­ì´)", + "block.mineralogy.quartzite_relief_horizontal": "규암 부조 (가로)", + "block.mineralogy.quartzite_relief_i": "규암 부조 (I)", + "block.mineralogy.quartzite_relief_left": "규암 부조 (왼쪽)", + "block.mineralogy.quartzite_relief_pickaxe": "규암 부조 (곡괭ì´)", + "block.mineralogy.quartzite_relief_plus": "규암 부조 (ë”하기 기호)", + "block.mineralogy.quartzite_relief_right": "규암 부조 (오른쪽)", + "block.mineralogy.quartzite_relief_sword": "규암 부조 (ê²€)", + "block.mineralogy.quartzite_relief_vertical": "규암 부조 (세로)", + "block.mineralogy.novaculite_relief_axe": "노바í˜ë¼ì´íŠ¸ 부조 (ë„ë¼)", + "block.mineralogy.novaculite_relief_blank": "노바í˜ë¼ì´íŠ¸ 부조 (무늬 ì—†ìŒ)", + "block.mineralogy.novaculite_relief_cross": "노바í˜ë¼ì´íŠ¸ 부조 (ì‹­ìž)", + "block.mineralogy.novaculite_relief_hammer": "노바í˜ë¼ì´íŠ¸ 부조 (ë§ì¹˜)", + "block.mineralogy.novaculite_relief_hoe": "노바í˜ë¼ì´íŠ¸ 부조 (ê´­ì´)", + "block.mineralogy.novaculite_relief_horizontal": "노바í˜ë¼ì´íŠ¸ 부조 (가로)", + "block.mineralogy.novaculite_relief_i": "노바í˜ë¼ì´íŠ¸ 부조 (I)", + "block.mineralogy.novaculite_relief_left": "노바í˜ë¼ì´íŠ¸ 부조 (왼쪽)", + "block.mineralogy.novaculite_relief_pickaxe": "노바í˜ë¼ì´íŠ¸ 부조 (곡괭ì´)", + "block.mineralogy.novaculite_relief_plus": "노바í˜ë¼ì´íŠ¸ 부조 (ë”하기 기호)", + "block.mineralogy.novaculite_relief_right": "노바í˜ë¼ì´íŠ¸ 부조 (오른쪽)", + "block.mineralogy.novaculite_relief_sword": "노바í˜ë¼ì´íŠ¸ 부조 (ê²€)", + "block.mineralogy.novaculite_relief_vertical": "노바í˜ë¼ì´íŠ¸ 부조 (세로)", + "itemGroup.mineralogy.mineralogy": "광물학", + "itemGroup.mineralogy.rock": "광물학 ì•”ì„", + "itemGroup.mineralogy.stair": "광물학 계단", + "itemGroup.mineralogy.slab": "광물학 ë°˜ 블ë¡", + "itemGroup.mineralogy.wall": "광물학 담장", + "itemGroup.mineralogy.item": "광물학 ì•„ì´í…œ", + "block.mineralogy.crude_oil": "ì›ìœ ", + "item.mineralogy.crude_oil_bucket": "ì›ìœ  ì–‘ë™ì´", + "fluid.mineralogy.crude_oil": "ì›ìœ ", + "advancements.mineralogy.all_the_rocks.title": "모든 ì•”ì„", + "advancements.mineralogy.all_the_rocks.description": "ê´‘ë¬¼í•™ì˜ ëª¨ë“  표준 ì•”ì„ì„ ì°¾ì•˜ìŠµë‹ˆë‹¤!" +} diff --git a/src/main/resources/assets/mineralogy/lang/pt_br.json b/src/main/resources/assets/mineralogy/lang/pt_br.json new file mode 100644 index 000000000..867e9ac0d --- /dev/null +++ b/src/main/resources/assets/mineralogy/lang/pt_br.json @@ -0,0 +1,940 @@ +{ + "block.mineralogy.andesite": "Andesito", + "block.mineralogy.andesite_stairs": "Escadas de Andesito", + "block.mineralogy.andesite_slab": "Laje de Andesito", + "block.mineralogy.andesite_brick": "Tijolos de Andesito", + "block.mineralogy.andesite_brick_stairs": "Escadas de tijolos de Andesito", + "block.mineralogy.andesite_brick_slab": "Laje de tijolos de Andesito", + "block.mineralogy.andesite_smooth": "Bloco polido de Andesito", + "block.mineralogy.andesite_smooth_stairs": "Escadas polidas de Andesito", + "block.mineralogy.andesite_smooth_slab": "Laje polida de Andesito", + "block.mineralogy.andesite_smooth_brick": "Tijolos polidos de Andesito", + "block.mineralogy.andesite_smooth_brick_stairs": "Escadas de tijolos polidos de Andesito", + "block.mineralogy.andesite_smooth_brick_slab": "Laje de tijolos polidos de Andesito", + "block.mineralogy.basalt": "Basalto", + "block.mineralogy.basalt_stairs": "Escadas de Basalto", + "block.mineralogy.basalt_slab": "Laje de Basalto", + "block.mineralogy.basalt_brick": "Tijolos de Basalto", + "block.mineralogy.basalt_brick_stairs": "Escadas de tijolos de Basalto", + "block.mineralogy.basalt_brick_slab": "Laje de tijolos de Basalto", + "block.mineralogy.basalt_smooth": "Bloco polido de Basalto", + "block.mineralogy.basalt_smooth_stairs": "Escadas polidas de Basalto", + "block.mineralogy.basalt_smooth_slab": "Laje polida de Basalto", + "block.mineralogy.basalt_smooth_brick": "Tijolos polidos de Basalto", + "block.mineralogy.basalt_smooth_brick_stairs": "Escadas de tijolos polidos de Basalto", + "block.mineralogy.basalt_smooth_brick_slab": "Laje de tijolos polidos de Basalto", + "block.mineralogy.diorite": "Diorito", + "block.mineralogy.diorite_stairs": "Escadas de Diorito", + "block.mineralogy.diorite_slab": "Laje de Diorito", + "block.mineralogy.diorite_brick": "Tijolos de Diorito", + "block.mineralogy.diorite_brick_stairs": "Escadas de tijolos de Diorito", + "block.mineralogy.diorite_brick_slab": "Laje de tijolos de Diorito", + "block.mineralogy.diorite_smooth": "Bloco polido de Diorito", + "block.mineralogy.diorite_smooth_stairs": "Escadas polidas de Diorito", + "block.mineralogy.diorite_smooth_slab": "Laje polida de Diorito", + "block.mineralogy.diorite_smooth_brick": "Tijolos polidos de Diorito", + "block.mineralogy.diorite_smooth_brick_stairs": "Escadas de tijolos polidos de Diorito", + "block.mineralogy.diorite_smooth_brick_slab": "Laje de tijolos polidos de Diorito", + "block.mineralogy.granite": "Granito", + "block.mineralogy.granite_stairs": "Escadas de Granito", + "block.mineralogy.granite_slab": "Laje de Granito", + "block.mineralogy.granite_brick": "Tijolos de Granito", + "block.mineralogy.granite_brick_stairs": "Escadas de tijolos de Granito", + "block.mineralogy.granite_brick_slab": "Laje de tijolos de Granito", + "block.mineralogy.granite_smooth": "Bloco polido de Granito", + "block.mineralogy.granite_smooth_stairs": "Escadas polidas de Granito", + "block.mineralogy.granite_smooth_slab": "Laje polida de Granito", + "block.mineralogy.granite_smooth_brick": "Tijolos polidos de Granito", + "block.mineralogy.granite_smooth_brick_stairs": "Escadas de tijolos polidos de Granito", + "block.mineralogy.granite_smooth_brick_slab": "Laje de tijolos polidos de Granito", + "block.mineralogy.rhyolite": "Riolito", + "block.mineralogy.rhyolite_stairs": "Escadas de Riolito", + "block.mineralogy.rhyolite_slab": "Laje de Riolito", + "block.mineralogy.rhyolite_brick": "Tijolos de Riolito", + "block.mineralogy.rhyolite_brick_stairs": "Escadas de tijolos de Riolito", + "block.mineralogy.rhyolite_brick_slab": "Laje de tijolos de Riolito", + "block.mineralogy.rhyolite_smooth": "Bloco polido de Riolito", + "block.mineralogy.rhyolite_smooth_stairs": "Escadas polidas de Riolito", + "block.mineralogy.rhyolite_smooth_slab": "Laje polida de Riolito", + "block.mineralogy.rhyolite_smooth_brick": "Tijolos polidos de Riolito", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Escadas de tijolos polidos de Riolito", + "block.mineralogy.rhyolite_smooth_brick_slab": "Laje de tijolos polidos de Riolito", + "block.mineralogy.pegmatite": "Pegmatito", + "block.mineralogy.pegmatite_stairs": "Escadas de Pegmatito", + "block.mineralogy.pegmatite_slab": "Laje de Pegmatito", + "block.mineralogy.pegmatite_brick": "Tijolos de Pegmatito", + "block.mineralogy.pegmatite_brick_stairs": "Escadas de tijolos de Pegmatito", + "block.mineralogy.pegmatite_brick_slab": "Laje de tijolos de Pegmatito", + "block.mineralogy.pegmatite_smooth": "Bloco polido de Pegmatito", + "block.mineralogy.pegmatite_smooth_stairs": "Escadas polidas de Pegmatito", + "block.mineralogy.pegmatite_smooth_slab": "Laje polida de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick": "Tijolos polidos de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Escadas de tijolos polidos de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_slab": "Laje de tijolos polidos de Pegmatito", + "block.mineralogy.shale": "Folhelho", + "block.mineralogy.shale_stairs": "Escadas de Folhelho", + "block.mineralogy.shale_slab": "Laje de Folhelho", + "block.mineralogy.shale_brick": "Tijolos de Folhelho", + "block.mineralogy.shale_brick_stairs": "Escadas de tijolos de Folhelho", + "block.mineralogy.shale_brick_slab": "Laje de tijolos de Folhelho", + "block.mineralogy.shale_smooth": "Bloco polido de Folhelho", + "block.mineralogy.shale_smooth_stairs": "Escadas polidas de Folhelho", + "block.mineralogy.shale_smooth_slab": "Laje polida de Folhelho", + "block.mineralogy.shale_smooth_brick": "Tijolos polidos de Folhelho", + "block.mineralogy.shale_smooth_brick_stairs": "Escadas de tijolos polidos de Folhelho", + "block.mineralogy.shale_smooth_brick_slab": "Laje de tijolos polidos de Folhelho", + "block.mineralogy.conglomerate": "Conglomerado", + "block.mineralogy.conglomerate_stairs": "Escadas de Conglomerado", + "block.mineralogy.conglomerate_slab": "Laje de Conglomerado", + "block.mineralogy.conglomerate_brick": "Tijolos de Conglomerado", + "block.mineralogy.conglomerate_brick_stairs": "Escadas de tijolos de Conglomerado", + "block.mineralogy.conglomerate_brick_slab": "Laje de tijolos de Conglomerado", + "block.mineralogy.conglomerate_smooth": "Bloco polido de Conglomerado", + "block.mineralogy.conglomerate_smooth_stairs": "Escadas polidas de Conglomerado", + "block.mineralogy.conglomerate_smooth_slab": "Laje polida de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick": "Tijolos polidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Escadas de tijolos polidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_slab": "Laje de tijolos polidos de Conglomerado", + "block.mineralogy.dolomite": "Dolomita", + "block.mineralogy.dolomite_stairs": "Escadas de Dolomita", + "block.mineralogy.dolomite_slab": "Laje de Dolomita", + "block.mineralogy.dolomite_brick": "Tijolos de Dolomita", + "block.mineralogy.dolomite_brick_stairs": "Escadas de tijolos de Dolomita", + "block.mineralogy.dolomite_brick_slab": "Laje de tijolos de Dolomita", + "block.mineralogy.dolomite_smooth": "Bloco polido de Dolomita", + "block.mineralogy.dolomite_smooth_stairs": "Escadas polidas de Dolomita", + "block.mineralogy.dolomite_smooth_slab": "Laje polida de Dolomita", + "block.mineralogy.dolomite_smooth_brick": "Tijolos polidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_stairs": "Escadas de tijolos polidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_slab": "Laje de tijolos polidos de Dolomita", + "block.mineralogy.limestone": "Calcário", + "block.mineralogy.limestone_stairs": "Escadas de Calcário", + "block.mineralogy.limestone_slab": "Laje de Calcário", + "block.mineralogy.limestone_brick": "Tijolos de Calcário", + "block.mineralogy.limestone_brick_stairs": "Escadas de tijolos de Calcário", + "block.mineralogy.limestone_brick_slab": "Laje de tijolos de Calcário", + "block.mineralogy.limestone_smooth": "Bloco polido de Calcário", + "block.mineralogy.limestone_smooth_stairs": "Escadas polidas de Calcário", + "block.mineralogy.limestone_smooth_slab": "Laje polida de Calcário", + "block.mineralogy.limestone_smooth_brick": "Tijolos polidos de Calcário", + "block.mineralogy.limestone_smooth_brick_stairs": "Escadas de tijolos polidos de Calcário", + "block.mineralogy.limestone_smooth_brick_slab": "Laje de tijolos polidos de Calcário", + "block.mineralogy.slate": "Ardósia", + "block.mineralogy.slate_stairs": "Escadas de Ardósia", + "block.mineralogy.slate_slab": "Laje de Ardósia", + "block.mineralogy.slate_brick": "Tijolos de Ardósia", + "block.mineralogy.slate_brick_stairs": "Escadas de tijolos de Ardósia", + "block.mineralogy.slate_brick_slab": "Laje de tijolos de Ardósia", + "block.mineralogy.slate_smooth": "Bloco polido de Ardósia", + "block.mineralogy.slate_smooth_stairs": "Escadas polidas de Ardósia", + "block.mineralogy.slate_smooth_slab": "Laje polida de Ardósia", + "block.mineralogy.slate_smooth_brick": "Tijolos polidos de Ardósia", + "block.mineralogy.slate_smooth_brick_stairs": "Escadas de tijolos polidos de Ardósia", + "block.mineralogy.slate_smooth_brick_slab": "Laje de tijolos polidos de Ardósia", + "block.mineralogy.schist": "Xisto", + "block.mineralogy.schist_stairs": "Escadas de Xisto", + "block.mineralogy.schist_slab": "Laje de Xisto", + "block.mineralogy.schist_brick": "Tijolos de Xisto", + "block.mineralogy.schist_brick_stairs": "Escadas de tijolos de Xisto", + "block.mineralogy.schist_brick_slab": "Laje de tijolos de Xisto", + "block.mineralogy.schist_smooth": "Bloco polido de Xisto", + "block.mineralogy.schist_smooth_stairs": "Escadas polidas de Xisto", + "block.mineralogy.schist_smooth_slab": "Laje polida de Xisto", + "block.mineralogy.schist_smooth_brick": "Tijolos polidos de Xisto", + "block.mineralogy.schist_smooth_brick_stairs": "Escadas de tijolos polidos de Xisto", + "block.mineralogy.schist_smooth_brick_slab": "Laje de tijolos polidos de Xisto", + "block.mineralogy.gneiss": "Gnaisse", + "block.mineralogy.gneiss_stairs": "Escadas de Gnaisse", + "block.mineralogy.gneiss_slab": "Laje de Gnaisse", + "block.mineralogy.gneiss_brick": "Tijolos de Gnaisse", + "block.mineralogy.gneiss_brick_stairs": "Escadas de tijolos de Gnaisse", + "block.mineralogy.gneiss_brick_slab": "Laje de tijolos de Gnaisse", + "block.mineralogy.gneiss_smooth": "Bloco polido de Gnaisse", + "block.mineralogy.gneiss_smooth_stairs": "Escadas polidas de Gnaisse", + "block.mineralogy.gneiss_smooth_slab": "Laje polida de Gnaisse", + "block.mineralogy.gneiss_smooth_brick": "Tijolos polidos de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_stairs": "Escadas de tijolos polidos de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_slab": "Laje de tijolos polidos de Gnaisse", + "block.mineralogy.marble": "Mármore", + "block.mineralogy.marble_stairs": "Escadas de Mármore", + "block.mineralogy.marble_slab": "Laje de Mármore", + "block.mineralogy.marble_brick": "Tijolos de Mármore", + "block.mineralogy.marble_brick_stairs": "Escadas de tijolos de Mármore", + "block.mineralogy.marble_brick_slab": "Laje de tijolos de Mármore", + "block.mineralogy.marble_smooth": "Bloco polido de Mármore", + "block.mineralogy.marble_smooth_stairs": "Escadas polidas de Mármore", + "block.mineralogy.marble_smooth_slab": "Laje polida de Mármore", + "block.mineralogy.marble_smooth_brick": "Tijolos polidos de Mármore", + "block.mineralogy.marble_smooth_brick_stairs": "Escadas de tijolos polidos de Mármore", + "block.mineralogy.marble_smooth_brick_slab": "Laje de tijolos polidos de Mármore", + "block.mineralogy.phyllite": "Filito", + "block.mineralogy.phyllite_stairs": "Escadas de Filito", + "block.mineralogy.phyllite_slab": "Laje de Filito", + "block.mineralogy.phyllite_brick": "Tijolos de Filito", + "block.mineralogy.phyllite_brick_stairs": "Escadas de tijolos de Filito", + "block.mineralogy.phyllite_brick_slab": "Laje de tijolos de Filito", + "block.mineralogy.phyllite_smooth": "Bloco polido de Filito", + "block.mineralogy.phyllite_smooth_stairs": "Escadas polidas de Filito", + "block.mineralogy.phyllite_smooth_slab": "Laje polida de Filito", + "block.mineralogy.phyllite_smooth_brick": "Tijolos polidos de Filito", + "block.mineralogy.phyllite_smooth_brick_stairs": "Escadas de tijolos polidos de Filito", + "block.mineralogy.phyllite_smooth_brick_slab": "Laje de tijolos polidos de Filito", + "block.mineralogy.amphibolite": "Anfibolito", + "block.mineralogy.amphibolite_stairs": "Escadas de Anfibolito", + "block.mineralogy.amphibolite_slab": "Laje de Anfibolito", + "block.mineralogy.amphibolite_brick": "Tijolos de Anfibolito", + "block.mineralogy.amphibolite_brick_stairs": "Escadas de tijolos de Anfibolito", + "block.mineralogy.amphibolite_brick_slab": "Laje de tijolos de Anfibolito", + "block.mineralogy.amphibolite_smooth": "Bloco polido de Anfibolito", + "block.mineralogy.amphibolite_smooth_stairs": "Escadas polidas de Anfibolito", + "block.mineralogy.amphibolite_smooth_slab": "Laje polida de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick": "Tijolos polidos de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Escadas de tijolos polidos de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_slab": "Laje de tijolos polidos de Anfibolito", + "item.mineralogy.gypsum_dust": "Pó de gesso", + "item.mineralogy.sulfur_dust": "Pó de enxofre", + "item.mineralogy.phosphorous_dust": "Pó de fósforo", + "item.mineralogy.nitrate_dust": "Pó de nitrato", + "item.mineralogy.mineral_fertilizer": "Fertilizante mineral", + "block.mineralogy.chert": "Sílex", + "block.mineralogy.gypsum": "Gesso", + "block.mineralogy.pumice": "Pedra-pomes", + "block.mineralogy.sulfur_block": "Enxofre", + "block.mineralogy.sulfur_ore": "Minério de enxofre", + "block.mineralogy.phosphorous_block": "Fósforo", + "block.mineralogy.phosphorous_ore": "Minério de fósforo", + "block.mineralogy.nitrate_block": "Nitrato", + "block.mineralogy.nitrate_ore": "Minério de nitrato", + "block.mineralogy.drywall_black": "Placa de gesso preta", + "block.mineralogy.drywall_red": "Placa de gesso vermelha", + "block.mineralogy.drywall_green": "Placa de gesso verde", + "block.mineralogy.drywall_brown": "Placa de gesso marrom", + "block.mineralogy.drywall_blue": "Placa de gesso azul", + "block.mineralogy.drywall_purple": "Placa de gesso roxa", + "block.mineralogy.drywall_cyan": "Placa de gesso ciana", + "block.mineralogy.drywall_silver": "Placa de gesso cinza-clara", + "block.mineralogy.drywall_gray": "Placa de gesso cinza", + "block.mineralogy.drywall_pink": "Placa de gesso rosa", + "block.mineralogy.drywall_lime": "Placa de gesso verde-limão", + "block.mineralogy.drywall_yellow": "Placa de gesso amarela", + "block.mineralogy.drywall_light_blue": "Placa de gesso azul-clara", + "block.mineralogy.drywall_magenta": "Placa de gesso magenta", + "block.mineralogy.drywall_orange": "Placa de gesso laranja", + "block.mineralogy.drywall_white": "Placa de gesso branca", + "block.mineralogy.andesite_wall": "Muro de Andesito", + "block.mineralogy.andesite_brick_wall": "Muro de tijolos de Andesito", + "block.mineralogy.andesite_smooth_wall": "Muro polido de Andesito", + "block.mineralogy.andesite_smooth_brick_wall": "Muro de tijolos polidos de Andesito", + "block.mineralogy.basalt_wall": "Muro de Basalto", + "block.mineralogy.basalt_brick_wall": "Muro de tijolos de Basalto", + "block.mineralogy.basalt_smooth_wall": "Muro polido de Basalto", + "block.mineralogy.basalt_smooth_brick_wall": "Muro de tijolos polidos de Basalto", + "block.mineralogy.diorite_wall": "Muro de Diorito", + "block.mineralogy.diorite_brick_wall": "Muro de tijolos de Diorito", + "block.mineralogy.diorite_smooth_wall": "Muro polido de Diorito", + "block.mineralogy.diorite_smooth_brick_wall": "Muro de tijolos polidos de Diorito", + "block.mineralogy.granite_wall": "Muro de Granito", + "block.mineralogy.granite_brick_wall": "Muro de tijolos de Granito", + "block.mineralogy.granite_smooth_wall": "Muro polido de Granito", + "block.mineralogy.granite_smooth_brick_wall": "Muro de tijolos polidos de Granito", + "block.mineralogy.rhyolite_wall": "Muro de Riolito", + "block.mineralogy.rhyolite_brick_wall": "Muro de tijolos de Riolito", + "block.mineralogy.rhyolite_smooth_wall": "Muro polido de Riolito", + "block.mineralogy.rhyolite_smooth_brick_wall": "Muro de tijolos polidos de Riolito", + "block.mineralogy.pegmatite_wall": "Muro de Pegmatito", + "block.mineralogy.pegmatite_brick_wall": "Muro de tijolos de Pegmatito", + "block.mineralogy.pegmatite_smooth_wall": "Muro polido de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_wall": "Muro de tijolos polidos de Pegmatito", + "block.mineralogy.shale_wall": "Muro de Folhelho", + "block.mineralogy.shale_brick_wall": "Muro de tijolos de Folhelho", + "block.mineralogy.shale_smooth_wall": "Muro polido de Folhelho", + "block.mineralogy.shale_smooth_brick_wall": "Muro de tijolos polidos de Folhelho", + "block.mineralogy.conglomerate_wall": "Muro de Conglomerado", + "block.mineralogy.conglomerate_brick_wall": "Muro de tijolos de Conglomerado", + "block.mineralogy.conglomerate_smooth_wall": "Muro polido de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_wall": "Muro de tijolos polidos de Conglomerado", + "block.mineralogy.dolomite_wall": "Muro de Dolomita", + "block.mineralogy.dolomite_brick_wall": "Muro de tijolos de Dolomita", + "block.mineralogy.dolomite_smooth_wall": "Muro polido de Dolomita", + "block.mineralogy.dolomite_smooth_brick_wall": "Muro de tijolos polidos de Dolomita", + "block.mineralogy.limestone_wall": "Muro de Calcário", + "block.mineralogy.limestone_brick_wall": "Muro de tijolos de Calcário", + "block.mineralogy.limestone_smooth_wall": "Muro polido de Calcário", + "block.mineralogy.limestone_smooth_brick_wall": "Muro de tijolos polidos de Calcário", + "block.mineralogy.marble_wall": "Muro de Mármore", + "block.mineralogy.marble_brick_wall": "Muro de tijolos de Mármore", + "block.mineralogy.marble_smooth_wall": "Muro polido de Mármore", + "block.mineralogy.marble_smooth_brick_wall": "Muro de tijolos polidos de Mármore", + "block.mineralogy.slate_wall": "Muro de Ardósia", + "block.mineralogy.slate_brick_wall": "Muro de tijolos de Ardósia", + "block.mineralogy.slate_smooth_wall": "Muro polido de Ardósia", + "block.mineralogy.slate_smooth_brick_wall": "Muro de tijolos polidos de Ardósia", + "block.mineralogy.schist_wall": "Muro de Xisto", + "block.mineralogy.schist_brick_wall": "Muro de tijolos de Xisto", + "block.mineralogy.schist_smooth_wall": "Muro polido de Xisto", + "block.mineralogy.schist_smooth_brick_wall": "Muro de tijolos polidos de Xisto", + "block.mineralogy.gneiss_wall": "Muro de Gnaisse", + "block.mineralogy.gneiss_brick_wall": "Muro de tijolos de Gnaisse", + "block.mineralogy.gneiss_smooth_wall": "Muro polido de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_wall": "Muro de tijolos polidos de Gnaisse", + "block.mineralogy.phyllite_wall": "Muro de Filito", + "block.mineralogy.phyllite_brick_wall": "Muro de tijolos de Filito", + "block.mineralogy.phyllite_smooth_wall": "Muro polido de Filito", + "block.mineralogy.phyllite_smooth_brick_wall": "Muro de tijolos polidos de Filito", + "block.mineralogy.amphibolite_wall": "Muro de Anfibolito", + "block.mineralogy.amphibolite_brick_wall": "Muro de tijolos de Anfibolito", + "block.mineralogy.amphibolite_smooth_wall": "Muro polido de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_wall": "Muro de tijolos polidos de Anfibolito", + "block.mineralogy.andesite_furnace": "Fornalha de Andesito", + "block.mineralogy.andesite_brick_furnace": "Fornalha de tijolos de Andesito", + "block.mineralogy.andesite_smooth_furnace": "Fornalha polida de Andesito", + "block.mineralogy.andesite_smooth_brick_furnace": "Fornalha de tijolos polidos de Andesito", + "block.mineralogy.basalt_furnace": "Fornalha de Basalto", + "block.mineralogy.basalt_brick_furnace": "Fornalha de tijolos de Basalto", + "block.mineralogy.basalt_smooth_furnace": "Fornalha polida de Basalto", + "block.mineralogy.basalt_smooth_brick_furnace": "Fornalha de tijolos polidos de Basalto", + "block.mineralogy.diorite_furnace": "Fornalha de Diorito", + "block.mineralogy.diorite_brick_furnace": "Fornalha de tijolos de Diorito", + "block.mineralogy.diorite_smooth_furnace": "Fornalha polida de Diorito", + "block.mineralogy.diorite_smooth_brick_furnace": "Fornalha de tijolos polidos de Diorito", + "block.mineralogy.granite_furnace": "Fornalha de Granito", + "block.mineralogy.granite_brick_furnace": "Fornalha de tijolos de Granito", + "block.mineralogy.granite_smooth_furnace": "Fornalha polida de Granito", + "block.mineralogy.granite_smooth_brick_furnace": "Fornalha de tijolos polidos de Granito", + "block.mineralogy.rhyolite_furnace": "Fornalha de Riolito", + "block.mineralogy.rhyolite_brick_furnace": "Fornalha de tijolos de Riolito", + "block.mineralogy.rhyolite_smooth_furnace": "Fornalha polida de Riolito", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Fornalha de tijolos polidos de Riolito", + "block.mineralogy.pegmatite_furnace": "Fornalha de Pegmatito", + "block.mineralogy.pegmatite_brick_furnace": "Fornalha de tijolos de Pegmatito", + "block.mineralogy.pegmatite_smooth_furnace": "Fornalha polida de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Fornalha de tijolos polidos de Pegmatito", + "block.mineralogy.shale_furnace": "Fornalha de Folhelho", + "block.mineralogy.shale_brick_furnace": "Fornalha de tijolos de Folhelho", + "block.mineralogy.shale_smooth_furnace": "Fornalha polida de Folhelho", + "block.mineralogy.shale_smooth_brick_furnace": "Fornalha de tijolos polidos de Folhelho", + "block.mineralogy.conglomerate_furnace": "Fornalha de Conglomerado", + "block.mineralogy.conglomerate_brick_furnace": "Fornalha de tijolos de Conglomerado", + "block.mineralogy.conglomerate_smooth_furnace": "Fornalha polida de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Fornalha de tijolos polidos de Conglomerado", + "block.mineralogy.dolomite_furnace": "Fornalha de Dolomita", + "block.mineralogy.dolomite_brick_furnace": "Fornalha de tijolos de Dolomita", + "block.mineralogy.dolomite_smooth_furnace": "Fornalha polida de Dolomita", + "block.mineralogy.dolomite_smooth_brick_furnace": "Fornalha de tijolos polidos de Dolomita", + "block.mineralogy.limestone_furnace": "Fornalha de Calcário", + "block.mineralogy.limestone_brick_furnace": "Fornalha de tijolos de Calcário", + "block.mineralogy.limestone_smooth_furnace": "Fornalha polida de Calcário", + "block.mineralogy.limestone_smooth_brick_furnace": "Fornalha de tijolos polidos de Calcário", + "block.mineralogy.marble_furnace": "Fornalha de Mármore", + "block.mineralogy.marble_brick_furnace": "Fornalha de tijolos de Mármore", + "block.mineralogy.marble_smooth_furnace": "Fornalha polida de Mármore", + "block.mineralogy.marble_smooth_brick_furnace": "Fornalha de tijolos polidos de Mármore", + "block.mineralogy.slate_furnace": "Fornalha de Ardósia", + "block.mineralogy.slate_brick_furnace": "Fornalha de tijolos de Ardósia", + "block.mineralogy.slate_smooth_furnace": "Fornalha polida de Ardósia", + "block.mineralogy.slate_smooth_brick_furnace": "Fornalha de tijolos polidos de Ardósia", + "block.mineralogy.schist_furnace": "Fornalha de Xisto", + "block.mineralogy.schist_brick_furnace": "Fornalha de tijolos de Xisto", + "block.mineralogy.schist_smooth_furnace": "Fornalha polida de Xisto", + "block.mineralogy.schist_smooth_brick_furnace": "Fornalha de tijolos polidos de Xisto", + "block.mineralogy.gneiss_furnace": "Fornalha de Gnaisse", + "block.mineralogy.gneiss_brick_furnace": "Fornalha de tijolos de Gnaisse", + "block.mineralogy.gneiss_smooth_furnace": "Fornalha polida de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_furnace": "Fornalha de tijolos polidos de Gnaisse", + "block.mineralogy.phyllite_furnace": "Fornalha de Filito", + "block.mineralogy.phyllite_brick_furnace": "Fornalha de tijolos de Filito", + "block.mineralogy.phyllite_smooth_furnace": "Fornalha polida de Filito", + "block.mineralogy.phyllite_smooth_brick_furnace": "Fornalha de tijolos polidos de Filito", + "block.mineralogy.amphibolite_furnace": "Fornalha de Anfibolito", + "block.mineralogy.amphibolite_brick_furnace": "Fornalha de tijolos de Anfibolito", + "block.mineralogy.amphibolite_smooth_furnace": "Fornalha polida de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Fornalha de tijolos polidos de Anfibolito", + "block.mineralogy.diabase": "Diabásio", + "block.mineralogy.diabase_stairs": "Escadas de Diabásio", + "block.mineralogy.diabase_slab": "Laje de Diabásio", + "block.mineralogy.diabase_brick": "Tijolos de Diabásio", + "block.mineralogy.diabase_brick_stairs": "Escadas de tijolos de Diabásio", + "block.mineralogy.diabase_brick_slab": "Laje de tijolos de Diabásio", + "block.mineralogy.diabase_smooth": "Bloco polido de Diabásio", + "block.mineralogy.diabase_smooth_stairs": "Escadas polidas de Diabásio", + "block.mineralogy.diabase_smooth_slab": "Laje polida de Diabásio", + "block.mineralogy.diabase_smooth_brick": "Tijolos polidos de Diabásio", + "block.mineralogy.diabase_smooth_brick_stairs": "Escadas de tijolos polidos de Diabásio", + "block.mineralogy.diabase_smooth_brick_slab": "Laje de tijolos polidos de Diabásio", + "block.mineralogy.diabase_wall": "Muro de Diabásio", + "block.mineralogy.diabase_brick_wall": "Muro de tijolos de Diabásio", + "block.mineralogy.diabase_smooth_wall": "Muro polido de Diabásio", + "block.mineralogy.diabase_smooth_brick_wall": "Muro de tijolos polidos de Diabásio", + "block.mineralogy.diabase_furnace": "Fornalha de Diabásio", + "block.mineralogy.diabase_brick_furnace": "Fornalha de tijolos de Diabásio", + "block.mineralogy.diabase_smooth_furnace": "Fornalha polida de Diabásio", + "block.mineralogy.diabase_smooth_brick_furnace": "Fornalha de tijolos polidos de Diabásio", + "block.mineralogy.gabbro": "Gabro", + "block.mineralogy.gabbro_stairs": "Escadas de Gabro", + "block.mineralogy.gabbro_slab": "Laje de Gabro", + "block.mineralogy.gabbro_brick": "Tijolos de Gabro", + "block.mineralogy.gabbro_brick_stairs": "Escadas de tijolos de Gabro", + "block.mineralogy.gabbro_brick_slab": "Laje de tijolos de Gabro", + "block.mineralogy.gabbro_smooth": "Bloco polido de Gabro", + "block.mineralogy.gabbro_smooth_stairs": "Escadas polidas de Gabro", + "block.mineralogy.gabbro_smooth_slab": "Laje polida de Gabro", + "block.mineralogy.gabbro_smooth_brick": "Tijolos polidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Escadas de tijolos polidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_slab": "Laje de tijolos polidos de Gabro", + "block.mineralogy.gabbro_wall": "Muro de Gabro", + "block.mineralogy.gabbro_brick_wall": "Muro de tijolos de Gabro", + "block.mineralogy.gabbro_smooth_wall": "Muro polido de Gabro", + "block.mineralogy.gabbro_smooth_brick_wall": "Muro de tijolos polidos de Gabro", + "block.mineralogy.gabbro_furnace": "Fornalha de Gabro", + "block.mineralogy.gabbro_brick_furnace": "Fornalha de tijolos de Gabro", + "block.mineralogy.gabbro_smooth_furnace": "Fornalha polida de Gabro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Fornalha de tijolos polidos de Gabro", + "block.mineralogy.peridotite": "Peridotito", + "block.mineralogy.peridotite_stairs": "Escadas de Peridotito", + "block.mineralogy.peridotite_slab": "Laje de Peridotito", + "block.mineralogy.peridotite_brick": "Tijolos de Peridotito", + "block.mineralogy.peridotite_brick_stairs": "Escadas de tijolos de Peridotito", + "block.mineralogy.peridotite_brick_slab": "Laje de tijolos de Peridotito", + "block.mineralogy.peridotite_smooth": "Bloco polido de Peridotito", + "block.mineralogy.peridotite_smooth_stairs": "Escadas polidas de Peridotito", + "block.mineralogy.peridotite_smooth_slab": "Laje polida de Peridotito", + "block.mineralogy.peridotite_smooth_brick": "Tijolos polidos de Peridotito", + "block.mineralogy.peridotite_smooth_brick_stairs": "Escadas de tijolos polidos de Peridotito", + "block.mineralogy.peridotite_smooth_brick_slab": "Laje de tijolos polidos de Peridotito", + "block.mineralogy.peridotite_wall": "Muro de Peridotito", + "block.mineralogy.peridotite_brick_wall": "Muro de tijolos de Peridotito", + "block.mineralogy.peridotite_smooth_wall": "Muro polido de Peridotito", + "block.mineralogy.peridotite_smooth_brick_wall": "Muro de tijolos polidos de Peridotito", + "block.mineralogy.peridotite_furnace": "Fornalha de Peridotito", + "block.mineralogy.peridotite_brick_furnace": "Fornalha de tijolos de Peridotito", + "block.mineralogy.peridotite_smooth_furnace": "Fornalha polida de Peridotito", + "block.mineralogy.peridotite_smooth_brick_furnace": "Fornalha de tijolos polidos de Peridotito", + "block.mineralogy.basaltic_glass": "Vidro basáltico", + "block.mineralogy.basaltic_glass_stairs": "Escadas de Vidro basáltico", + "block.mineralogy.basaltic_glass_slab": "Laje de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick": "Tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_stairs": "Escadas de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_slab": "Laje de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth": "Bloco polido de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_stairs": "Escadas polidas de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_slab": "Laje polida de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick": "Tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Escadas de tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Laje de tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_wall": "Muro de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_wall": "Muro de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_wall": "Muro polido de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Muro de tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_furnace": "Fornalha de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_furnace": "Fornalha de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_furnace": "Fornalha polida de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Fornalha de tijolos polidos de Vidro basáltico", + "block.mineralogy.scoria": "Escória", + "block.mineralogy.scoria_stairs": "Escadas de Escória", + "block.mineralogy.scoria_slab": "Laje de Escória", + "block.mineralogy.scoria_brick": "Tijolos de Escória", + "block.mineralogy.scoria_brick_stairs": "Escadas de tijolos de Escória", + "block.mineralogy.scoria_brick_slab": "Laje de tijolos de Escória", + "block.mineralogy.scoria_smooth": "Bloco polido de Escória", + "block.mineralogy.scoria_smooth_stairs": "Escadas polidas de Escória", + "block.mineralogy.scoria_smooth_slab": "Laje polida de Escória", + "block.mineralogy.scoria_smooth_brick": "Tijolos polidos de Escória", + "block.mineralogy.scoria_smooth_brick_stairs": "Escadas de tijolos polidos de Escória", + "block.mineralogy.scoria_smooth_brick_slab": "Laje de tijolos polidos de Escória", + "block.mineralogy.scoria_wall": "Muro de Escória", + "block.mineralogy.scoria_brick_wall": "Muro de tijolos de Escória", + "block.mineralogy.scoria_smooth_wall": "Muro polido de Escória", + "block.mineralogy.scoria_smooth_brick_wall": "Muro de tijolos polidos de Escória", + "block.mineralogy.scoria_furnace": "Fornalha de Escória", + "block.mineralogy.scoria_brick_furnace": "Fornalha de tijolos de Escória", + "block.mineralogy.scoria_smooth_furnace": "Fornalha polida de Escória", + "block.mineralogy.scoria_smooth_brick_furnace": "Fornalha de tijolos polidos de Escória", + "block.mineralogy.tuff": "Tufo", + "block.mineralogy.tuff_stairs": "Escadas de Tufo", + "block.mineralogy.tuff_slab": "Laje de Tufo", + "block.mineralogy.tuff_brick": "Tijolos de Tufo", + "block.mineralogy.tuff_brick_stairs": "Escadas de tijolos de Tufo", + "block.mineralogy.tuff_brick_slab": "Laje de tijolos de Tufo", + "block.mineralogy.tuff_smooth": "Bloco polido de Tufo", + "block.mineralogy.tuff_smooth_stairs": "Escadas polidas de Tufo", + "block.mineralogy.tuff_smooth_slab": "Laje polida de Tufo", + "block.mineralogy.tuff_smooth_brick": "Tijolos polidos de Tufo", + "block.mineralogy.tuff_smooth_brick_stairs": "Escadas de tijolos polidos de Tufo", + "block.mineralogy.tuff_smooth_brick_slab": "Laje de tijolos polidos de Tufo", + "block.mineralogy.tuff_wall": "Muro de Tufo", + "block.mineralogy.tuff_brick_wall": "Muro de tijolos de Tufo", + "block.mineralogy.tuff_smooth_wall": "Muro polido de Tufo", + "block.mineralogy.tuff_smooth_brick_wall": "Muro de tijolos polidos de Tufo", + "block.mineralogy.tuff_furnace": "Fornalha de Tufo", + "block.mineralogy.tuff_brick_furnace": "Fornalha de tijolos de Tufo", + "block.mineralogy.tuff_smooth_furnace": "Fornalha polida de Tufo", + "block.mineralogy.tuff_smooth_brick_furnace": "Fornalha de tijolos polidos de Tufo", + "block.mineralogy.siltstone": "Siltito", + "block.mineralogy.siltstone_stairs": "Escadas de Siltito", + "block.mineralogy.siltstone_slab": "Laje de Siltito", + "block.mineralogy.siltstone_brick": "Tijolos de Siltito", + "block.mineralogy.siltstone_brick_stairs": "Escadas de tijolos de Siltito", + "block.mineralogy.siltstone_brick_slab": "Laje de tijolos de Siltito", + "block.mineralogy.siltstone_smooth": "Bloco polido de Siltito", + "block.mineralogy.siltstone_smooth_stairs": "Escadas polidas de Siltito", + "block.mineralogy.siltstone_smooth_slab": "Laje polida de Siltito", + "block.mineralogy.siltstone_smooth_brick": "Tijolos polidos de Siltito", + "block.mineralogy.siltstone_smooth_brick_stairs": "Escadas de tijolos polidos de Siltito", + "block.mineralogy.siltstone_smooth_brick_slab": "Laje de tijolos polidos de Siltito", + "block.mineralogy.siltstone_wall": "Muro de Siltito", + "block.mineralogy.siltstone_brick_wall": "Muro de tijolos de Siltito", + "block.mineralogy.siltstone_smooth_wall": "Muro polido de Siltito", + "block.mineralogy.siltstone_smooth_brick_wall": "Muro de tijolos polidos de Siltito", + "block.mineralogy.siltstone_furnace": "Fornalha de Siltito", + "block.mineralogy.siltstone_brick_furnace": "Fornalha de tijolos de Siltito", + "block.mineralogy.siltstone_smooth_furnace": "Fornalha polida de Siltito", + "block.mineralogy.siltstone_smooth_brick_furnace": "Fornalha de tijolos polidos de Siltito", + "block.mineralogy.rock_salt": "Sal-gema", + "block.mineralogy.rock_salt_stairs": "Escadas de Sal-gema", + "block.mineralogy.rock_salt_slab": "Laje de Sal-gema", + "block.mineralogy.rock_salt_brick": "Tijolos de Sal-gema", + "block.mineralogy.rock_salt_brick_stairs": "Escadas de tijolos de Sal-gema", + "block.mineralogy.rock_salt_brick_slab": "Laje de tijolos de Sal-gema", + "block.mineralogy.rock_salt_smooth": "Bloco polido de Sal-gema", + "block.mineralogy.rock_salt_smooth_stairs": "Escadas polidas de Sal-gema", + "block.mineralogy.rock_salt_smooth_slab": "Laje polida de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick": "Tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Escadas de tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_slab": "Laje de tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_wall": "Muro de Sal-gema", + "block.mineralogy.rock_salt_brick_wall": "Muro de tijolos de Sal-gema", + "block.mineralogy.rock_salt_smooth_wall": "Muro polido de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_wall": "Muro de tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_furnace": "Fornalha de Sal-gema", + "block.mineralogy.rock_salt_brick_furnace": "Fornalha de tijolos de Sal-gema", + "block.mineralogy.rock_salt_smooth_furnace": "Fornalha polida de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Fornalha de tijolos polidos de Sal-gema", + "block.mineralogy.hornfels": "Cornubianito", + "block.mineralogy.hornfels_stairs": "Escadas de Cornubianito", + "block.mineralogy.hornfels_slab": "Laje de Cornubianito", + "block.mineralogy.hornfels_brick": "Tijolos de Cornubianito", + "block.mineralogy.hornfels_brick_stairs": "Escadas de tijolos de Cornubianito", + "block.mineralogy.hornfels_brick_slab": "Laje de tijolos de Cornubianito", + "block.mineralogy.hornfels_smooth": "Bloco polido de Cornubianito", + "block.mineralogy.hornfels_smooth_stairs": "Escadas polidas de Cornubianito", + "block.mineralogy.hornfels_smooth_slab": "Laje polida de Cornubianito", + "block.mineralogy.hornfels_smooth_brick": "Tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_stairs": "Escadas de tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_slab": "Laje de tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_wall": "Muro de Cornubianito", + "block.mineralogy.hornfels_brick_wall": "Muro de tijolos de Cornubianito", + "block.mineralogy.hornfels_smooth_wall": "Muro polido de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_wall": "Muro de tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_furnace": "Fornalha de Cornubianito", + "block.mineralogy.hornfels_brick_furnace": "Fornalha de tijolos de Cornubianito", + "block.mineralogy.hornfels_smooth_furnace": "Fornalha polida de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_furnace": "Fornalha de tijolos polidos de Cornubianito", + "block.mineralogy.quartzite": "Quartzito", + "block.mineralogy.quartzite_stairs": "Escadas de Quartzito", + "block.mineralogy.quartzite_slab": "Laje de Quartzito", + "block.mineralogy.quartzite_brick": "Tijolos de Quartzito", + "block.mineralogy.quartzite_brick_stairs": "Escadas de tijolos de Quartzito", + "block.mineralogy.quartzite_brick_slab": "Laje de tijolos de Quartzito", + "block.mineralogy.quartzite_smooth": "Bloco polido de Quartzito", + "block.mineralogy.quartzite_smooth_stairs": "Escadas polidas de Quartzito", + "block.mineralogy.quartzite_smooth_slab": "Laje polida de Quartzito", + "block.mineralogy.quartzite_smooth_brick": "Tijolos polidos de Quartzito", + "block.mineralogy.quartzite_smooth_brick_stairs": "Escadas de tijolos polidos de Quartzito", + "block.mineralogy.quartzite_smooth_brick_slab": "Laje de tijolos polidos de Quartzito", + "block.mineralogy.quartzite_wall": "Muro de Quartzito", + "block.mineralogy.quartzite_brick_wall": "Muro de tijolos de Quartzito", + "block.mineralogy.quartzite_smooth_wall": "Muro polido de Quartzito", + "block.mineralogy.quartzite_smooth_brick_wall": "Muro de tijolos polidos de Quartzito", + "block.mineralogy.quartzite_furnace": "Fornalha de Quartzito", + "block.mineralogy.quartzite_brick_furnace": "Fornalha de tijolos de Quartzito", + "block.mineralogy.quartzite_smooth_furnace": "Fornalha polida de Quartzito", + "block.mineralogy.quartzite_smooth_brick_furnace": "Fornalha de tijolos polidos de Quartzito", + "block.mineralogy.novaculite": "Novaculita", + "block.mineralogy.novaculite_stairs": "Escadas de Novaculita", + "block.mineralogy.novaculite_slab": "Laje de Novaculita", + "block.mineralogy.novaculite_brick": "Tijolos de Novaculita", + "block.mineralogy.novaculite_brick_stairs": "Escadas de tijolos de Novaculita", + "block.mineralogy.novaculite_brick_slab": "Laje de tijolos de Novaculita", + "block.mineralogy.novaculite_smooth": "Bloco polido de Novaculita", + "block.mineralogy.novaculite_smooth_stairs": "Escadas polidas de Novaculita", + "block.mineralogy.novaculite_smooth_slab": "Laje polida de Novaculita", + "block.mineralogy.novaculite_smooth_brick": "Tijolos polidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_stairs": "Escadas de tijolos polidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_slab": "Laje de tijolos polidos de Novaculita", + "block.mineralogy.novaculite_wall": "Muro de Novaculita", + "block.mineralogy.novaculite_brick_wall": "Muro de tijolos de Novaculita", + "block.mineralogy.novaculite_smooth_wall": "Muro polido de Novaculita", + "block.mineralogy.novaculite_smooth_brick_wall": "Muro de tijolos polidos de Novaculita", + "block.mineralogy.novaculite_furnace": "Fornalha de Novaculita", + "block.mineralogy.novaculite_brick_furnace": "Fornalha de tijolos de Novaculita", + "block.mineralogy.novaculite_smooth_furnace": "Fornalha polida de Novaculita", + "block.mineralogy.novaculite_smooth_brick_furnace": "Fornalha de tijolos polidos de Novaculita", + "block.mineralogy.chalk": "Giz", + "item.mineralogy.chalk_dust": "Pó de giz", + "item.mineralogy.salt_dust": "Sal", + "item.mineralogy.rock_salt_dust": "Cristais de sal-gema", + "block.mineralogy.rocksaltlamp": "Luminária de sal-gema", + "block.mineralogy.rocksaltstreetlamp": "Poste de luz de sal-gema", + "block.mineralogy.andesite_relief_axe": "Baixo-relevo de Andesito (machado)", + "block.mineralogy.andesite_relief_blank": "Baixo-relevo de Andesito (sem motivo)", + "block.mineralogy.andesite_relief_cross": "Baixo-relevo de Andesito (cruz)", + "block.mineralogy.andesite_relief_hammer": "Baixo-relevo de Andesito (martelo)", + "block.mineralogy.andesite_relief_hoe": "Baixo-relevo de Andesito (enxada)", + "block.mineralogy.andesite_relief_horizontal": "Baixo-relevo de Andesito (horizontal)", + "block.mineralogy.andesite_relief_i": "Baixo-relevo de Andesito (I)", + "block.mineralogy.andesite_relief_left": "Baixo-relevo de Andesito (esquerda)", + "block.mineralogy.andesite_relief_pickaxe": "Baixo-relevo de Andesito (picareta)", + "block.mineralogy.andesite_relief_plus": "Baixo-relevo de Andesito (sinal de mais)", + "block.mineralogy.andesite_relief_right": "Baixo-relevo de Andesito (direita)", + "block.mineralogy.andesite_relief_sword": "Baixo-relevo de Andesito (espada)", + "block.mineralogy.andesite_relief_vertical": "Baixo-relevo de Andesito (vertical)", + "block.mineralogy.basalt_relief_axe": "Baixo-relevo de Basalto (machado)", + "block.mineralogy.basalt_relief_blank": "Baixo-relevo de Basalto (sem motivo)", + "block.mineralogy.basalt_relief_cross": "Baixo-relevo de Basalto (cruz)", + "block.mineralogy.basalt_relief_hammer": "Baixo-relevo de Basalto (martelo)", + "block.mineralogy.basalt_relief_hoe": "Baixo-relevo de Basalto (enxada)", + "block.mineralogy.basalt_relief_horizontal": "Baixo-relevo de Basalto (horizontal)", + "block.mineralogy.basalt_relief_i": "Baixo-relevo de Basalto (I)", + "block.mineralogy.basalt_relief_left": "Baixo-relevo de Basalto (esquerda)", + "block.mineralogy.basalt_relief_pickaxe": "Baixo-relevo de Basalto (picareta)", + "block.mineralogy.basalt_relief_plus": "Baixo-relevo de Basalto (sinal de mais)", + "block.mineralogy.basalt_relief_right": "Baixo-relevo de Basalto (direita)", + "block.mineralogy.basalt_relief_sword": "Baixo-relevo de Basalto (espada)", + "block.mineralogy.basalt_relief_vertical": "Baixo-relevo de Basalto (vertical)", + "block.mineralogy.diorite_relief_axe": "Baixo-relevo de Diorito (machado)", + "block.mineralogy.diorite_relief_blank": "Baixo-relevo de Diorito (sem motivo)", + "block.mineralogy.diorite_relief_cross": "Baixo-relevo de Diorito (cruz)", + "block.mineralogy.diorite_relief_hammer": "Baixo-relevo de Diorito (martelo)", + "block.mineralogy.diorite_relief_hoe": "Baixo-relevo de Diorito (enxada)", + "block.mineralogy.diorite_relief_horizontal": "Baixo-relevo de Diorito (horizontal)", + "block.mineralogy.diorite_relief_i": "Baixo-relevo de Diorito (I)", + "block.mineralogy.diorite_relief_left": "Baixo-relevo de Diorito (esquerda)", + "block.mineralogy.diorite_relief_pickaxe": "Baixo-relevo de Diorito (picareta)", + "block.mineralogy.diorite_relief_plus": "Baixo-relevo de Diorito (sinal de mais)", + "block.mineralogy.diorite_relief_right": "Baixo-relevo de Diorito (direita)", + "block.mineralogy.diorite_relief_sword": "Baixo-relevo de Diorito (espada)", + "block.mineralogy.diorite_relief_vertical": "Baixo-relevo de Diorito (vertical)", + "block.mineralogy.granite_relief_axe": "Baixo-relevo de Granito (machado)", + "block.mineralogy.granite_relief_blank": "Baixo-relevo de Granito (sem motivo)", + "block.mineralogy.granite_relief_cross": "Baixo-relevo de Granito (cruz)", + "block.mineralogy.granite_relief_hammer": "Baixo-relevo de Granito (martelo)", + "block.mineralogy.granite_relief_hoe": "Baixo-relevo de Granito (enxada)", + "block.mineralogy.granite_relief_horizontal": "Baixo-relevo de Granito (horizontal)", + "block.mineralogy.granite_relief_i": "Baixo-relevo de Granito (I)", + "block.mineralogy.granite_relief_left": "Baixo-relevo de Granito (esquerda)", + "block.mineralogy.granite_relief_pickaxe": "Baixo-relevo de Granito (picareta)", + "block.mineralogy.granite_relief_plus": "Baixo-relevo de Granito (sinal de mais)", + "block.mineralogy.granite_relief_right": "Baixo-relevo de Granito (direita)", + "block.mineralogy.granite_relief_sword": "Baixo-relevo de Granito (espada)", + "block.mineralogy.granite_relief_vertical": "Baixo-relevo de Granito (vertical)", + "block.mineralogy.rhyolite_relief_axe": "Baixo-relevo de Riolito (machado)", + "block.mineralogy.rhyolite_relief_blank": "Baixo-relevo de Riolito (sem motivo)", + "block.mineralogy.rhyolite_relief_cross": "Baixo-relevo de Riolito (cruz)", + "block.mineralogy.rhyolite_relief_hammer": "Baixo-relevo de Riolito (martelo)", + "block.mineralogy.rhyolite_relief_hoe": "Baixo-relevo de Riolito (enxada)", + "block.mineralogy.rhyolite_relief_horizontal": "Baixo-relevo de Riolito (horizontal)", + "block.mineralogy.rhyolite_relief_i": "Baixo-relevo de Riolito (I)", + "block.mineralogy.rhyolite_relief_left": "Baixo-relevo de Riolito (esquerda)", + "block.mineralogy.rhyolite_relief_pickaxe": "Baixo-relevo de Riolito (picareta)", + "block.mineralogy.rhyolite_relief_plus": "Baixo-relevo de Riolito (sinal de mais)", + "block.mineralogy.rhyolite_relief_right": "Baixo-relevo de Riolito (direita)", + "block.mineralogy.rhyolite_relief_sword": "Baixo-relevo de Riolito (espada)", + "block.mineralogy.rhyolite_relief_vertical": "Baixo-relevo de Riolito (vertical)", + "block.mineralogy.pegmatite_relief_axe": "Baixo-relevo de Pegmatito (machado)", + "block.mineralogy.pegmatite_relief_blank": "Baixo-relevo de Pegmatito (sem motivo)", + "block.mineralogy.pegmatite_relief_cross": "Baixo-relevo de Pegmatito (cruz)", + "block.mineralogy.pegmatite_relief_hammer": "Baixo-relevo de Pegmatito (martelo)", + "block.mineralogy.pegmatite_relief_hoe": "Baixo-relevo de Pegmatito (enxada)", + "block.mineralogy.pegmatite_relief_horizontal": "Baixo-relevo de Pegmatito (horizontal)", + "block.mineralogy.pegmatite_relief_i": "Baixo-relevo de Pegmatito (I)", + "block.mineralogy.pegmatite_relief_left": "Baixo-relevo de Pegmatito (esquerda)", + "block.mineralogy.pegmatite_relief_pickaxe": "Baixo-relevo de Pegmatito (picareta)", + "block.mineralogy.pegmatite_relief_plus": "Baixo-relevo de Pegmatito (sinal de mais)", + "block.mineralogy.pegmatite_relief_right": "Baixo-relevo de Pegmatito (direita)", + "block.mineralogy.pegmatite_relief_sword": "Baixo-relevo de Pegmatito (espada)", + "block.mineralogy.pegmatite_relief_vertical": "Baixo-relevo de Pegmatito (vertical)", + "block.mineralogy.shale_relief_axe": "Baixo-relevo de Folhelho (machado)", + "block.mineralogy.shale_relief_blank": "Baixo-relevo de Folhelho (sem motivo)", + "block.mineralogy.shale_relief_cross": "Baixo-relevo de Folhelho (cruz)", + "block.mineralogy.shale_relief_hammer": "Baixo-relevo de Folhelho (martelo)", + "block.mineralogy.shale_relief_hoe": "Baixo-relevo de Folhelho (enxada)", + "block.mineralogy.shale_relief_horizontal": "Baixo-relevo de Folhelho (horizontal)", + "block.mineralogy.shale_relief_i": "Baixo-relevo de Folhelho (I)", + "block.mineralogy.shale_relief_left": "Baixo-relevo de Folhelho (esquerda)", + "block.mineralogy.shale_relief_pickaxe": "Baixo-relevo de Folhelho (picareta)", + "block.mineralogy.shale_relief_plus": "Baixo-relevo de Folhelho (sinal de mais)", + "block.mineralogy.shale_relief_right": "Baixo-relevo de Folhelho (direita)", + "block.mineralogy.shale_relief_sword": "Baixo-relevo de Folhelho (espada)", + "block.mineralogy.shale_relief_vertical": "Baixo-relevo de Folhelho (vertical)", + "block.mineralogy.conglomerate_relief_axe": "Baixo-relevo de Conglomerado (machado)", + "block.mineralogy.conglomerate_relief_blank": "Baixo-relevo de Conglomerado (sem motivo)", + "block.mineralogy.conglomerate_relief_cross": "Baixo-relevo de Conglomerado (cruz)", + "block.mineralogy.conglomerate_relief_hammer": "Baixo-relevo de Conglomerado (martelo)", + "block.mineralogy.conglomerate_relief_hoe": "Baixo-relevo de Conglomerado (enxada)", + "block.mineralogy.conglomerate_relief_horizontal": "Baixo-relevo de Conglomerado (horizontal)", + "block.mineralogy.conglomerate_relief_i": "Baixo-relevo de Conglomerado (I)", + "block.mineralogy.conglomerate_relief_left": "Baixo-relevo de Conglomerado (esquerda)", + "block.mineralogy.conglomerate_relief_pickaxe": "Baixo-relevo de Conglomerado (picareta)", + "block.mineralogy.conglomerate_relief_plus": "Baixo-relevo de Conglomerado (sinal de mais)", + "block.mineralogy.conglomerate_relief_right": "Baixo-relevo de Conglomerado (direita)", + "block.mineralogy.conglomerate_relief_sword": "Baixo-relevo de Conglomerado (espada)", + "block.mineralogy.conglomerate_relief_vertical": "Baixo-relevo de Conglomerado (vertical)", + "block.mineralogy.dolomite_relief_axe": "Baixo-relevo de Dolomita (machado)", + "block.mineralogy.dolomite_relief_blank": "Baixo-relevo de Dolomita (sem motivo)", + "block.mineralogy.dolomite_relief_cross": "Baixo-relevo de Dolomita (cruz)", + "block.mineralogy.dolomite_relief_hammer": "Baixo-relevo de Dolomita (martelo)", + "block.mineralogy.dolomite_relief_hoe": "Baixo-relevo de Dolomita (enxada)", + "block.mineralogy.dolomite_relief_horizontal": "Baixo-relevo de Dolomita (horizontal)", + "block.mineralogy.dolomite_relief_i": "Baixo-relevo de Dolomita (I)", + "block.mineralogy.dolomite_relief_left": "Baixo-relevo de Dolomita (esquerda)", + "block.mineralogy.dolomite_relief_pickaxe": "Baixo-relevo de Dolomita (picareta)", + "block.mineralogy.dolomite_relief_plus": "Baixo-relevo de Dolomita (sinal de mais)", + "block.mineralogy.dolomite_relief_right": "Baixo-relevo de Dolomita (direita)", + "block.mineralogy.dolomite_relief_sword": "Baixo-relevo de Dolomita (espada)", + "block.mineralogy.dolomite_relief_vertical": "Baixo-relevo de Dolomita (vertical)", + "block.mineralogy.limestone_relief_axe": "Baixo-relevo de Calcário (machado)", + "block.mineralogy.limestone_relief_blank": "Baixo-relevo de Calcário (sem motivo)", + "block.mineralogy.limestone_relief_cross": "Baixo-relevo de Calcário (cruz)", + "block.mineralogy.limestone_relief_hammer": "Baixo-relevo de Calcário (martelo)", + "block.mineralogy.limestone_relief_hoe": "Baixo-relevo de Calcário (enxada)", + "block.mineralogy.limestone_relief_horizontal": "Baixo-relevo de Calcário (horizontal)", + "block.mineralogy.limestone_relief_i": "Baixo-relevo de Calcário (I)", + "block.mineralogy.limestone_relief_left": "Baixo-relevo de Calcário (esquerda)", + "block.mineralogy.limestone_relief_pickaxe": "Baixo-relevo de Calcário (picareta)", + "block.mineralogy.limestone_relief_plus": "Baixo-relevo de Calcário (sinal de mais)", + "block.mineralogy.limestone_relief_right": "Baixo-relevo de Calcário (direita)", + "block.mineralogy.limestone_relief_sword": "Baixo-relevo de Calcário (espada)", + "block.mineralogy.limestone_relief_vertical": "Baixo-relevo de Calcário (vertical)", + "block.mineralogy.marble_relief_axe": "Baixo-relevo de Mármore (machado)", + "block.mineralogy.marble_relief_blank": "Baixo-relevo de Mármore (sem motivo)", + "block.mineralogy.marble_relief_cross": "Baixo-relevo de Mármore (cruz)", + "block.mineralogy.marble_relief_hammer": "Baixo-relevo de Mármore (martelo)", + "block.mineralogy.marble_relief_hoe": "Baixo-relevo de Mármore (enxada)", + "block.mineralogy.marble_relief_horizontal": "Baixo-relevo de Mármore (horizontal)", + "block.mineralogy.marble_relief_i": "Baixo-relevo de Mármore (I)", + "block.mineralogy.marble_relief_left": "Baixo-relevo de Mármore (esquerda)", + "block.mineralogy.marble_relief_pickaxe": "Baixo-relevo de Mármore (picareta)", + "block.mineralogy.marble_relief_plus": "Baixo-relevo de Mármore (sinal de mais)", + "block.mineralogy.marble_relief_right": "Baixo-relevo de Mármore (direita)", + "block.mineralogy.marble_relief_sword": "Baixo-relevo de Mármore (espada)", + "block.mineralogy.marble_relief_vertical": "Baixo-relevo de Mármore (vertical)", + "block.mineralogy.slate_relief_axe": "Baixo-relevo de Ardósia (machado)", + "block.mineralogy.slate_relief_blank": "Baixo-relevo de Ardósia (sem motivo)", + "block.mineralogy.slate_relief_cross": "Baixo-relevo de Ardósia (cruz)", + "block.mineralogy.slate_relief_hammer": "Baixo-relevo de Ardósia (martelo)", + "block.mineralogy.slate_relief_hoe": "Baixo-relevo de Ardósia (enxada)", + "block.mineralogy.slate_relief_horizontal": "Baixo-relevo de Ardósia (horizontal)", + "block.mineralogy.slate_relief_i": "Baixo-relevo de Ardósia (I)", + "block.mineralogy.slate_relief_left": "Baixo-relevo de Ardósia (esquerda)", + "block.mineralogy.slate_relief_pickaxe": "Baixo-relevo de Ardósia (picareta)", + "block.mineralogy.slate_relief_plus": "Baixo-relevo de Ardósia (sinal de mais)", + "block.mineralogy.slate_relief_right": "Baixo-relevo de Ardósia (direita)", + "block.mineralogy.slate_relief_sword": "Baixo-relevo de Ardósia (espada)", + "block.mineralogy.slate_relief_vertical": "Baixo-relevo de Ardósia (vertical)", + "block.mineralogy.schist_relief_axe": "Baixo-relevo de Xisto (machado)", + "block.mineralogy.schist_relief_blank": "Baixo-relevo de Xisto (sem motivo)", + "block.mineralogy.schist_relief_cross": "Baixo-relevo de Xisto (cruz)", + "block.mineralogy.schist_relief_hammer": "Baixo-relevo de Xisto (martelo)", + "block.mineralogy.schist_relief_hoe": "Baixo-relevo de Xisto (enxada)", + "block.mineralogy.schist_relief_horizontal": "Baixo-relevo de Xisto (horizontal)", + "block.mineralogy.schist_relief_i": "Baixo-relevo de Xisto (I)", + "block.mineralogy.schist_relief_left": "Baixo-relevo de Xisto (esquerda)", + "block.mineralogy.schist_relief_pickaxe": "Baixo-relevo de Xisto (picareta)", + "block.mineralogy.schist_relief_plus": "Baixo-relevo de Xisto (sinal de mais)", + "block.mineralogy.schist_relief_right": "Baixo-relevo de Xisto (direita)", + "block.mineralogy.schist_relief_sword": "Baixo-relevo de Xisto (espada)", + "block.mineralogy.schist_relief_vertical": "Baixo-relevo de Xisto (vertical)", + "block.mineralogy.gneiss_relief_axe": "Baixo-relevo de Gnaisse (machado)", + "block.mineralogy.gneiss_relief_blank": "Baixo-relevo de Gnaisse (sem motivo)", + "block.mineralogy.gneiss_relief_cross": "Baixo-relevo de Gnaisse (cruz)", + "block.mineralogy.gneiss_relief_hammer": "Baixo-relevo de Gnaisse (martelo)", + "block.mineralogy.gneiss_relief_hoe": "Baixo-relevo de Gnaisse (enxada)", + "block.mineralogy.gneiss_relief_horizontal": "Baixo-relevo de Gnaisse (horizontal)", + "block.mineralogy.gneiss_relief_i": "Baixo-relevo de Gnaisse (I)", + "block.mineralogy.gneiss_relief_left": "Baixo-relevo de Gnaisse (esquerda)", + "block.mineralogy.gneiss_relief_pickaxe": "Baixo-relevo de Gnaisse (picareta)", + "block.mineralogy.gneiss_relief_plus": "Baixo-relevo de Gnaisse (sinal de mais)", + "block.mineralogy.gneiss_relief_right": "Baixo-relevo de Gnaisse (direita)", + "block.mineralogy.gneiss_relief_sword": "Baixo-relevo de Gnaisse (espada)", + "block.mineralogy.gneiss_relief_vertical": "Baixo-relevo de Gnaisse (vertical)", + "block.mineralogy.phyllite_relief_axe": "Baixo-relevo de Filito (machado)", + "block.mineralogy.phyllite_relief_blank": "Baixo-relevo de Filito (sem motivo)", + "block.mineralogy.phyllite_relief_cross": "Baixo-relevo de Filito (cruz)", + "block.mineralogy.phyllite_relief_hammer": "Baixo-relevo de Filito (martelo)", + "block.mineralogy.phyllite_relief_hoe": "Baixo-relevo de Filito (enxada)", + "block.mineralogy.phyllite_relief_horizontal": "Baixo-relevo de Filito (horizontal)", + "block.mineralogy.phyllite_relief_i": "Baixo-relevo de Filito (I)", + "block.mineralogy.phyllite_relief_left": "Baixo-relevo de Filito (esquerda)", + "block.mineralogy.phyllite_relief_pickaxe": "Baixo-relevo de Filito (picareta)", + "block.mineralogy.phyllite_relief_plus": "Baixo-relevo de Filito (sinal de mais)", + "block.mineralogy.phyllite_relief_right": "Baixo-relevo de Filito (direita)", + "block.mineralogy.phyllite_relief_sword": "Baixo-relevo de Filito (espada)", + "block.mineralogy.phyllite_relief_vertical": "Baixo-relevo de Filito (vertical)", + "block.mineralogy.amphibolite_relief_axe": "Baixo-relevo de Anfibolito (machado)", + "block.mineralogy.amphibolite_relief_blank": "Baixo-relevo de Anfibolito (sem motivo)", + "block.mineralogy.amphibolite_relief_cross": "Baixo-relevo de Anfibolito (cruz)", + "block.mineralogy.amphibolite_relief_hammer": "Baixo-relevo de Anfibolito (martelo)", + "block.mineralogy.amphibolite_relief_hoe": "Baixo-relevo de Anfibolito (enxada)", + "block.mineralogy.amphibolite_relief_horizontal": "Baixo-relevo de Anfibolito (horizontal)", + "block.mineralogy.amphibolite_relief_i": "Baixo-relevo de Anfibolito (I)", + "block.mineralogy.amphibolite_relief_left": "Baixo-relevo de Anfibolito (esquerda)", + "block.mineralogy.amphibolite_relief_pickaxe": "Baixo-relevo de Anfibolito (picareta)", + "block.mineralogy.amphibolite_relief_plus": "Baixo-relevo de Anfibolito (sinal de mais)", + "block.mineralogy.amphibolite_relief_right": "Baixo-relevo de Anfibolito (direita)", + "block.mineralogy.amphibolite_relief_sword": "Baixo-relevo de Anfibolito (espada)", + "block.mineralogy.amphibolite_relief_vertical": "Baixo-relevo de Anfibolito (vertical)", + "block.mineralogy.diabase_relief_axe": "Baixo-relevo de Diabásio (machado)", + "block.mineralogy.diabase_relief_blank": "Baixo-relevo de Diabásio (sem motivo)", + "block.mineralogy.diabase_relief_cross": "Baixo-relevo de Diabásio (cruz)", + "block.mineralogy.diabase_relief_hammer": "Baixo-relevo de Diabásio (martelo)", + "block.mineralogy.diabase_relief_hoe": "Baixo-relevo de Diabásio (enxada)", + "block.mineralogy.diabase_relief_horizontal": "Baixo-relevo de Diabásio (horizontal)", + "block.mineralogy.diabase_relief_i": "Baixo-relevo de Diabásio (I)", + "block.mineralogy.diabase_relief_left": "Baixo-relevo de Diabásio (esquerda)", + "block.mineralogy.diabase_relief_pickaxe": "Baixo-relevo de Diabásio (picareta)", + "block.mineralogy.diabase_relief_plus": "Baixo-relevo de Diabásio (sinal de mais)", + "block.mineralogy.diabase_relief_right": "Baixo-relevo de Diabásio (direita)", + "block.mineralogy.diabase_relief_sword": "Baixo-relevo de Diabásio (espada)", + "block.mineralogy.diabase_relief_vertical": "Baixo-relevo de Diabásio (vertical)", + "block.mineralogy.gabbro_relief_axe": "Baixo-relevo de Gabro (machado)", + "block.mineralogy.gabbro_relief_blank": "Baixo-relevo de Gabro (sem motivo)", + "block.mineralogy.gabbro_relief_cross": "Baixo-relevo de Gabro (cruz)", + "block.mineralogy.gabbro_relief_hammer": "Baixo-relevo de Gabro (martelo)", + "block.mineralogy.gabbro_relief_hoe": "Baixo-relevo de Gabro (enxada)", + "block.mineralogy.gabbro_relief_horizontal": "Baixo-relevo de Gabro (horizontal)", + "block.mineralogy.gabbro_relief_i": "Baixo-relevo de Gabro (I)", + "block.mineralogy.gabbro_relief_left": "Baixo-relevo de Gabro (esquerda)", + "block.mineralogy.gabbro_relief_pickaxe": "Baixo-relevo de Gabro (picareta)", + "block.mineralogy.gabbro_relief_plus": "Baixo-relevo de Gabro (sinal de mais)", + "block.mineralogy.gabbro_relief_right": "Baixo-relevo de Gabro (direita)", + "block.mineralogy.gabbro_relief_sword": "Baixo-relevo de Gabro (espada)", + "block.mineralogy.gabbro_relief_vertical": "Baixo-relevo de Gabro (vertical)", + "block.mineralogy.peridotite_relief_axe": "Baixo-relevo de Peridotito (machado)", + "block.mineralogy.peridotite_relief_blank": "Baixo-relevo de Peridotito (sem motivo)", + "block.mineralogy.peridotite_relief_cross": "Baixo-relevo de Peridotito (cruz)", + "block.mineralogy.peridotite_relief_hammer": "Baixo-relevo de Peridotito (martelo)", + "block.mineralogy.peridotite_relief_hoe": "Baixo-relevo de Peridotito (enxada)", + "block.mineralogy.peridotite_relief_horizontal": "Baixo-relevo de Peridotito (horizontal)", + "block.mineralogy.peridotite_relief_i": "Baixo-relevo de Peridotito (I)", + "block.mineralogy.peridotite_relief_left": "Baixo-relevo de Peridotito (esquerda)", + "block.mineralogy.peridotite_relief_pickaxe": "Baixo-relevo de Peridotito (picareta)", + "block.mineralogy.peridotite_relief_plus": "Baixo-relevo de Peridotito (sinal de mais)", + "block.mineralogy.peridotite_relief_right": "Baixo-relevo de Peridotito (direita)", + "block.mineralogy.peridotite_relief_sword": "Baixo-relevo de Peridotito (espada)", + "block.mineralogy.peridotite_relief_vertical": "Baixo-relevo de Peridotito (vertical)", + "block.mineralogy.basaltic_glass_relief_axe": "Baixo-relevo de Vidro basáltico (machado)", + "block.mineralogy.basaltic_glass_relief_blank": "Baixo-relevo de Vidro basáltico (sem motivo)", + "block.mineralogy.basaltic_glass_relief_cross": "Baixo-relevo de Vidro basáltico (cruz)", + "block.mineralogy.basaltic_glass_relief_hammer": "Baixo-relevo de Vidro basáltico (martelo)", + "block.mineralogy.basaltic_glass_relief_hoe": "Baixo-relevo de Vidro basáltico (enxada)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Baixo-relevo de Vidro basáltico (horizontal)", + "block.mineralogy.basaltic_glass_relief_i": "Baixo-relevo de Vidro basáltico (I)", + "block.mineralogy.basaltic_glass_relief_left": "Baixo-relevo de Vidro basáltico (esquerda)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Baixo-relevo de Vidro basáltico (picareta)", + "block.mineralogy.basaltic_glass_relief_plus": "Baixo-relevo de Vidro basáltico (sinal de mais)", + "block.mineralogy.basaltic_glass_relief_right": "Baixo-relevo de Vidro basáltico (direita)", + "block.mineralogy.basaltic_glass_relief_sword": "Baixo-relevo de Vidro basáltico (espada)", + "block.mineralogy.basaltic_glass_relief_vertical": "Baixo-relevo de Vidro basáltico (vertical)", + "block.mineralogy.scoria_relief_axe": "Baixo-relevo de Escória (machado)", + "block.mineralogy.scoria_relief_blank": "Baixo-relevo de Escória (sem motivo)", + "block.mineralogy.scoria_relief_cross": "Baixo-relevo de Escória (cruz)", + "block.mineralogy.scoria_relief_hammer": "Baixo-relevo de Escória (martelo)", + "block.mineralogy.scoria_relief_hoe": "Baixo-relevo de Escória (enxada)", + "block.mineralogy.scoria_relief_horizontal": "Baixo-relevo de Escória (horizontal)", + "block.mineralogy.scoria_relief_i": "Baixo-relevo de Escória (I)", + "block.mineralogy.scoria_relief_left": "Baixo-relevo de Escória (esquerda)", + "block.mineralogy.scoria_relief_pickaxe": "Baixo-relevo de Escória (picareta)", + "block.mineralogy.scoria_relief_plus": "Baixo-relevo de Escória (sinal de mais)", + "block.mineralogy.scoria_relief_right": "Baixo-relevo de Escória (direita)", + "block.mineralogy.scoria_relief_sword": "Baixo-relevo de Escória (espada)", + "block.mineralogy.scoria_relief_vertical": "Baixo-relevo de Escória (vertical)", + "block.mineralogy.tuff_relief_axe": "Baixo-relevo de Tufo (machado)", + "block.mineralogy.tuff_relief_blank": "Baixo-relevo de Tufo (sem motivo)", + "block.mineralogy.tuff_relief_cross": "Baixo-relevo de Tufo (cruz)", + "block.mineralogy.tuff_relief_hammer": "Baixo-relevo de Tufo (martelo)", + "block.mineralogy.tuff_relief_hoe": "Baixo-relevo de Tufo (enxada)", + "block.mineralogy.tuff_relief_horizontal": "Baixo-relevo de Tufo (horizontal)", + "block.mineralogy.tuff_relief_i": "Baixo-relevo de Tufo (I)", + "block.mineralogy.tuff_relief_left": "Baixo-relevo de Tufo (esquerda)", + "block.mineralogy.tuff_relief_pickaxe": "Baixo-relevo de Tufo (picareta)", + "block.mineralogy.tuff_relief_plus": "Baixo-relevo de Tufo (sinal de mais)", + "block.mineralogy.tuff_relief_right": "Baixo-relevo de Tufo (direita)", + "block.mineralogy.tuff_relief_sword": "Baixo-relevo de Tufo (espada)", + "block.mineralogy.tuff_relief_vertical": "Baixo-relevo de Tufo (vertical)", + "block.mineralogy.siltstone_relief_axe": "Baixo-relevo de Siltito (machado)", + "block.mineralogy.siltstone_relief_blank": "Baixo-relevo de Siltito (sem motivo)", + "block.mineralogy.siltstone_relief_cross": "Baixo-relevo de Siltito (cruz)", + "block.mineralogy.siltstone_relief_hammer": "Baixo-relevo de Siltito (martelo)", + "block.mineralogy.siltstone_relief_hoe": "Baixo-relevo de Siltito (enxada)", + "block.mineralogy.siltstone_relief_horizontal": "Baixo-relevo de Siltito (horizontal)", + "block.mineralogy.siltstone_relief_i": "Baixo-relevo de Siltito (I)", + "block.mineralogy.siltstone_relief_left": "Baixo-relevo de Siltito (esquerda)", + "block.mineralogy.siltstone_relief_pickaxe": "Baixo-relevo de Siltito (picareta)", + "block.mineralogy.siltstone_relief_plus": "Baixo-relevo de Siltito (sinal de mais)", + "block.mineralogy.siltstone_relief_right": "Baixo-relevo de Siltito (direita)", + "block.mineralogy.siltstone_relief_sword": "Baixo-relevo de Siltito (espada)", + "block.mineralogy.siltstone_relief_vertical": "Baixo-relevo de Siltito (vertical)", + "block.mineralogy.rock_salt_relief_axe": "Baixo-relevo de Sal-gema (machado)", + "block.mineralogy.rock_salt_relief_blank": "Baixo-relevo de Sal-gema (sem motivo)", + "block.mineralogy.rock_salt_relief_cross": "Baixo-relevo de Sal-gema (cruz)", + "block.mineralogy.rock_salt_relief_hammer": "Baixo-relevo de Sal-gema (martelo)", + "block.mineralogy.rock_salt_relief_hoe": "Baixo-relevo de Sal-gema (enxada)", + "block.mineralogy.rock_salt_relief_horizontal": "Baixo-relevo de Sal-gema (horizontal)", + "block.mineralogy.rock_salt_relief_i": "Baixo-relevo de Sal-gema (I)", + "block.mineralogy.rock_salt_relief_left": "Baixo-relevo de Sal-gema (esquerda)", + "block.mineralogy.rock_salt_relief_pickaxe": "Baixo-relevo de Sal-gema (picareta)", + "block.mineralogy.rock_salt_relief_plus": "Baixo-relevo de Sal-gema (sinal de mais)", + "block.mineralogy.rock_salt_relief_right": "Baixo-relevo de Sal-gema (direita)", + "block.mineralogy.rock_salt_relief_sword": "Baixo-relevo de Sal-gema (espada)", + "block.mineralogy.rock_salt_relief_vertical": "Baixo-relevo de Sal-gema (vertical)", + "block.mineralogy.hornfels_relief_axe": "Baixo-relevo de Cornubianito (machado)", + "block.mineralogy.hornfels_relief_blank": "Baixo-relevo de Cornubianito (sem motivo)", + "block.mineralogy.hornfels_relief_cross": "Baixo-relevo de Cornubianito (cruz)", + "block.mineralogy.hornfels_relief_hammer": "Baixo-relevo de Cornubianito (martelo)", + "block.mineralogy.hornfels_relief_hoe": "Baixo-relevo de Cornubianito (enxada)", + "block.mineralogy.hornfels_relief_horizontal": "Baixo-relevo de Cornubianito (horizontal)", + "block.mineralogy.hornfels_relief_i": "Baixo-relevo de Cornubianito (I)", + "block.mineralogy.hornfels_relief_left": "Baixo-relevo de Cornubianito (esquerda)", + "block.mineralogy.hornfels_relief_pickaxe": "Baixo-relevo de Cornubianito (picareta)", + "block.mineralogy.hornfels_relief_plus": "Baixo-relevo de Cornubianito (sinal de mais)", + "block.mineralogy.hornfels_relief_right": "Baixo-relevo de Cornubianito (direita)", + "block.mineralogy.hornfels_relief_sword": "Baixo-relevo de Cornubianito (espada)", + "block.mineralogy.hornfels_relief_vertical": "Baixo-relevo de Cornubianito (vertical)", + "block.mineralogy.quartzite_relief_axe": "Baixo-relevo de Quartzito (machado)", + "block.mineralogy.quartzite_relief_blank": "Baixo-relevo de Quartzito (sem motivo)", + "block.mineralogy.quartzite_relief_cross": "Baixo-relevo de Quartzito (cruz)", + "block.mineralogy.quartzite_relief_hammer": "Baixo-relevo de Quartzito (martelo)", + "block.mineralogy.quartzite_relief_hoe": "Baixo-relevo de Quartzito (enxada)", + "block.mineralogy.quartzite_relief_horizontal": "Baixo-relevo de Quartzito (horizontal)", + "block.mineralogy.quartzite_relief_i": "Baixo-relevo de Quartzito (I)", + "block.mineralogy.quartzite_relief_left": "Baixo-relevo de Quartzito (esquerda)", + "block.mineralogy.quartzite_relief_pickaxe": "Baixo-relevo de Quartzito (picareta)", + "block.mineralogy.quartzite_relief_plus": "Baixo-relevo de Quartzito (sinal de mais)", + "block.mineralogy.quartzite_relief_right": "Baixo-relevo de Quartzito (direita)", + "block.mineralogy.quartzite_relief_sword": "Baixo-relevo de Quartzito (espada)", + "block.mineralogy.quartzite_relief_vertical": "Baixo-relevo de Quartzito (vertical)", + "block.mineralogy.novaculite_relief_axe": "Baixo-relevo de Novaculita (machado)", + "block.mineralogy.novaculite_relief_blank": "Baixo-relevo de Novaculita (sem motivo)", + "block.mineralogy.novaculite_relief_cross": "Baixo-relevo de Novaculita (cruz)", + "block.mineralogy.novaculite_relief_hammer": "Baixo-relevo de Novaculita (martelo)", + "block.mineralogy.novaculite_relief_hoe": "Baixo-relevo de Novaculita (enxada)", + "block.mineralogy.novaculite_relief_horizontal": "Baixo-relevo de Novaculita (horizontal)", + "block.mineralogy.novaculite_relief_i": "Baixo-relevo de Novaculita (I)", + "block.mineralogy.novaculite_relief_left": "Baixo-relevo de Novaculita (esquerda)", + "block.mineralogy.novaculite_relief_pickaxe": "Baixo-relevo de Novaculita (picareta)", + "block.mineralogy.novaculite_relief_plus": "Baixo-relevo de Novaculita (sinal de mais)", + "block.mineralogy.novaculite_relief_right": "Baixo-relevo de Novaculita (direita)", + "block.mineralogy.novaculite_relief_sword": "Baixo-relevo de Novaculita (espada)", + "block.mineralogy.novaculite_relief_vertical": "Baixo-relevo de Novaculita (vertical)", + "itemGroup.mineralogy.mineralogy": "Mineralogia", + "itemGroup.mineralogy.rock": "Rochas da Mineralogia", + "itemGroup.mineralogy.stair": "Escadas da Mineralogia", + "itemGroup.mineralogy.slab": "Lajes da Mineralogia", + "itemGroup.mineralogy.wall": "Muros da Mineralogia", + "itemGroup.mineralogy.item": "Itens da Mineralogia", + "block.mineralogy.crude_oil": "Petróleo bruto", + "item.mineralogy.crude_oil_bucket": "Balde de petróleo bruto", + "fluid.mineralogy.crude_oil": "Petróleo bruto", + "advancements.mineralogy.all_the_rocks.title": "Todas as rochas", + "advancements.mineralogy.all_the_rocks.description": "Você encontrou todos os tipos de rocha padrão do Mineralogy!" +} diff --git a/src/main/resources/assets/mineralogy/lang/pt_pt.json b/src/main/resources/assets/mineralogy/lang/pt_pt.json new file mode 100644 index 000000000..867e9ac0d --- /dev/null +++ b/src/main/resources/assets/mineralogy/lang/pt_pt.json @@ -0,0 +1,940 @@ +{ + "block.mineralogy.andesite": "Andesito", + "block.mineralogy.andesite_stairs": "Escadas de Andesito", + "block.mineralogy.andesite_slab": "Laje de Andesito", + "block.mineralogy.andesite_brick": "Tijolos de Andesito", + "block.mineralogy.andesite_brick_stairs": "Escadas de tijolos de Andesito", + "block.mineralogy.andesite_brick_slab": "Laje de tijolos de Andesito", + "block.mineralogy.andesite_smooth": "Bloco polido de Andesito", + "block.mineralogy.andesite_smooth_stairs": "Escadas polidas de Andesito", + "block.mineralogy.andesite_smooth_slab": "Laje polida de Andesito", + "block.mineralogy.andesite_smooth_brick": "Tijolos polidos de Andesito", + "block.mineralogy.andesite_smooth_brick_stairs": "Escadas de tijolos polidos de Andesito", + "block.mineralogy.andesite_smooth_brick_slab": "Laje de tijolos polidos de Andesito", + "block.mineralogy.basalt": "Basalto", + "block.mineralogy.basalt_stairs": "Escadas de Basalto", + "block.mineralogy.basalt_slab": "Laje de Basalto", + "block.mineralogy.basalt_brick": "Tijolos de Basalto", + "block.mineralogy.basalt_brick_stairs": "Escadas de tijolos de Basalto", + "block.mineralogy.basalt_brick_slab": "Laje de tijolos de Basalto", + "block.mineralogy.basalt_smooth": "Bloco polido de Basalto", + "block.mineralogy.basalt_smooth_stairs": "Escadas polidas de Basalto", + "block.mineralogy.basalt_smooth_slab": "Laje polida de Basalto", + "block.mineralogy.basalt_smooth_brick": "Tijolos polidos de Basalto", + "block.mineralogy.basalt_smooth_brick_stairs": "Escadas de tijolos polidos de Basalto", + "block.mineralogy.basalt_smooth_brick_slab": "Laje de tijolos polidos de Basalto", + "block.mineralogy.diorite": "Diorito", + "block.mineralogy.diorite_stairs": "Escadas de Diorito", + "block.mineralogy.diorite_slab": "Laje de Diorito", + "block.mineralogy.diorite_brick": "Tijolos de Diorito", + "block.mineralogy.diorite_brick_stairs": "Escadas de tijolos de Diorito", + "block.mineralogy.diorite_brick_slab": "Laje de tijolos de Diorito", + "block.mineralogy.diorite_smooth": "Bloco polido de Diorito", + "block.mineralogy.diorite_smooth_stairs": "Escadas polidas de Diorito", + "block.mineralogy.diorite_smooth_slab": "Laje polida de Diorito", + "block.mineralogy.diorite_smooth_brick": "Tijolos polidos de Diorito", + "block.mineralogy.diorite_smooth_brick_stairs": "Escadas de tijolos polidos de Diorito", + "block.mineralogy.diorite_smooth_brick_slab": "Laje de tijolos polidos de Diorito", + "block.mineralogy.granite": "Granito", + "block.mineralogy.granite_stairs": "Escadas de Granito", + "block.mineralogy.granite_slab": "Laje de Granito", + "block.mineralogy.granite_brick": "Tijolos de Granito", + "block.mineralogy.granite_brick_stairs": "Escadas de tijolos de Granito", + "block.mineralogy.granite_brick_slab": "Laje de tijolos de Granito", + "block.mineralogy.granite_smooth": "Bloco polido de Granito", + "block.mineralogy.granite_smooth_stairs": "Escadas polidas de Granito", + "block.mineralogy.granite_smooth_slab": "Laje polida de Granito", + "block.mineralogy.granite_smooth_brick": "Tijolos polidos de Granito", + "block.mineralogy.granite_smooth_brick_stairs": "Escadas de tijolos polidos de Granito", + "block.mineralogy.granite_smooth_brick_slab": "Laje de tijolos polidos de Granito", + "block.mineralogy.rhyolite": "Riolito", + "block.mineralogy.rhyolite_stairs": "Escadas de Riolito", + "block.mineralogy.rhyolite_slab": "Laje de Riolito", + "block.mineralogy.rhyolite_brick": "Tijolos de Riolito", + "block.mineralogy.rhyolite_brick_stairs": "Escadas de tijolos de Riolito", + "block.mineralogy.rhyolite_brick_slab": "Laje de tijolos de Riolito", + "block.mineralogy.rhyolite_smooth": "Bloco polido de Riolito", + "block.mineralogy.rhyolite_smooth_stairs": "Escadas polidas de Riolito", + "block.mineralogy.rhyolite_smooth_slab": "Laje polida de Riolito", + "block.mineralogy.rhyolite_smooth_brick": "Tijolos polidos de Riolito", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Escadas de tijolos polidos de Riolito", + "block.mineralogy.rhyolite_smooth_brick_slab": "Laje de tijolos polidos de Riolito", + "block.mineralogy.pegmatite": "Pegmatito", + "block.mineralogy.pegmatite_stairs": "Escadas de Pegmatito", + "block.mineralogy.pegmatite_slab": "Laje de Pegmatito", + "block.mineralogy.pegmatite_brick": "Tijolos de Pegmatito", + "block.mineralogy.pegmatite_brick_stairs": "Escadas de tijolos de Pegmatito", + "block.mineralogy.pegmatite_brick_slab": "Laje de tijolos de Pegmatito", + "block.mineralogy.pegmatite_smooth": "Bloco polido de Pegmatito", + "block.mineralogy.pegmatite_smooth_stairs": "Escadas polidas de Pegmatito", + "block.mineralogy.pegmatite_smooth_slab": "Laje polida de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick": "Tijolos polidos de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Escadas de tijolos polidos de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_slab": "Laje de tijolos polidos de Pegmatito", + "block.mineralogy.shale": "Folhelho", + "block.mineralogy.shale_stairs": "Escadas de Folhelho", + "block.mineralogy.shale_slab": "Laje de Folhelho", + "block.mineralogy.shale_brick": "Tijolos de Folhelho", + "block.mineralogy.shale_brick_stairs": "Escadas de tijolos de Folhelho", + "block.mineralogy.shale_brick_slab": "Laje de tijolos de Folhelho", + "block.mineralogy.shale_smooth": "Bloco polido de Folhelho", + "block.mineralogy.shale_smooth_stairs": "Escadas polidas de Folhelho", + "block.mineralogy.shale_smooth_slab": "Laje polida de Folhelho", + "block.mineralogy.shale_smooth_brick": "Tijolos polidos de Folhelho", + "block.mineralogy.shale_smooth_brick_stairs": "Escadas de tijolos polidos de Folhelho", + "block.mineralogy.shale_smooth_brick_slab": "Laje de tijolos polidos de Folhelho", + "block.mineralogy.conglomerate": "Conglomerado", + "block.mineralogy.conglomerate_stairs": "Escadas de Conglomerado", + "block.mineralogy.conglomerate_slab": "Laje de Conglomerado", + "block.mineralogy.conglomerate_brick": "Tijolos de Conglomerado", + "block.mineralogy.conglomerate_brick_stairs": "Escadas de tijolos de Conglomerado", + "block.mineralogy.conglomerate_brick_slab": "Laje de tijolos de Conglomerado", + "block.mineralogy.conglomerate_smooth": "Bloco polido de Conglomerado", + "block.mineralogy.conglomerate_smooth_stairs": "Escadas polidas de Conglomerado", + "block.mineralogy.conglomerate_smooth_slab": "Laje polida de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick": "Tijolos polidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Escadas de tijolos polidos de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_slab": "Laje de tijolos polidos de Conglomerado", + "block.mineralogy.dolomite": "Dolomita", + "block.mineralogy.dolomite_stairs": "Escadas de Dolomita", + "block.mineralogy.dolomite_slab": "Laje de Dolomita", + "block.mineralogy.dolomite_brick": "Tijolos de Dolomita", + "block.mineralogy.dolomite_brick_stairs": "Escadas de tijolos de Dolomita", + "block.mineralogy.dolomite_brick_slab": "Laje de tijolos de Dolomita", + "block.mineralogy.dolomite_smooth": "Bloco polido de Dolomita", + "block.mineralogy.dolomite_smooth_stairs": "Escadas polidas de Dolomita", + "block.mineralogy.dolomite_smooth_slab": "Laje polida de Dolomita", + "block.mineralogy.dolomite_smooth_brick": "Tijolos polidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_stairs": "Escadas de tijolos polidos de Dolomita", + "block.mineralogy.dolomite_smooth_brick_slab": "Laje de tijolos polidos de Dolomita", + "block.mineralogy.limestone": "Calcário", + "block.mineralogy.limestone_stairs": "Escadas de Calcário", + "block.mineralogy.limestone_slab": "Laje de Calcário", + "block.mineralogy.limestone_brick": "Tijolos de Calcário", + "block.mineralogy.limestone_brick_stairs": "Escadas de tijolos de Calcário", + "block.mineralogy.limestone_brick_slab": "Laje de tijolos de Calcário", + "block.mineralogy.limestone_smooth": "Bloco polido de Calcário", + "block.mineralogy.limestone_smooth_stairs": "Escadas polidas de Calcário", + "block.mineralogy.limestone_smooth_slab": "Laje polida de Calcário", + "block.mineralogy.limestone_smooth_brick": "Tijolos polidos de Calcário", + "block.mineralogy.limestone_smooth_brick_stairs": "Escadas de tijolos polidos de Calcário", + "block.mineralogy.limestone_smooth_brick_slab": "Laje de tijolos polidos de Calcário", + "block.mineralogy.slate": "Ardósia", + "block.mineralogy.slate_stairs": "Escadas de Ardósia", + "block.mineralogy.slate_slab": "Laje de Ardósia", + "block.mineralogy.slate_brick": "Tijolos de Ardósia", + "block.mineralogy.slate_brick_stairs": "Escadas de tijolos de Ardósia", + "block.mineralogy.slate_brick_slab": "Laje de tijolos de Ardósia", + "block.mineralogy.slate_smooth": "Bloco polido de Ardósia", + "block.mineralogy.slate_smooth_stairs": "Escadas polidas de Ardósia", + "block.mineralogy.slate_smooth_slab": "Laje polida de Ardósia", + "block.mineralogy.slate_smooth_brick": "Tijolos polidos de Ardósia", + "block.mineralogy.slate_smooth_brick_stairs": "Escadas de tijolos polidos de Ardósia", + "block.mineralogy.slate_smooth_brick_slab": "Laje de tijolos polidos de Ardósia", + "block.mineralogy.schist": "Xisto", + "block.mineralogy.schist_stairs": "Escadas de Xisto", + "block.mineralogy.schist_slab": "Laje de Xisto", + "block.mineralogy.schist_brick": "Tijolos de Xisto", + "block.mineralogy.schist_brick_stairs": "Escadas de tijolos de Xisto", + "block.mineralogy.schist_brick_slab": "Laje de tijolos de Xisto", + "block.mineralogy.schist_smooth": "Bloco polido de Xisto", + "block.mineralogy.schist_smooth_stairs": "Escadas polidas de Xisto", + "block.mineralogy.schist_smooth_slab": "Laje polida de Xisto", + "block.mineralogy.schist_smooth_brick": "Tijolos polidos de Xisto", + "block.mineralogy.schist_smooth_brick_stairs": "Escadas de tijolos polidos de Xisto", + "block.mineralogy.schist_smooth_brick_slab": "Laje de tijolos polidos de Xisto", + "block.mineralogy.gneiss": "Gnaisse", + "block.mineralogy.gneiss_stairs": "Escadas de Gnaisse", + "block.mineralogy.gneiss_slab": "Laje de Gnaisse", + "block.mineralogy.gneiss_brick": "Tijolos de Gnaisse", + "block.mineralogy.gneiss_brick_stairs": "Escadas de tijolos de Gnaisse", + "block.mineralogy.gneiss_brick_slab": "Laje de tijolos de Gnaisse", + "block.mineralogy.gneiss_smooth": "Bloco polido de Gnaisse", + "block.mineralogy.gneiss_smooth_stairs": "Escadas polidas de Gnaisse", + "block.mineralogy.gneiss_smooth_slab": "Laje polida de Gnaisse", + "block.mineralogy.gneiss_smooth_brick": "Tijolos polidos de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_stairs": "Escadas de tijolos polidos de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_slab": "Laje de tijolos polidos de Gnaisse", + "block.mineralogy.marble": "Mármore", + "block.mineralogy.marble_stairs": "Escadas de Mármore", + "block.mineralogy.marble_slab": "Laje de Mármore", + "block.mineralogy.marble_brick": "Tijolos de Mármore", + "block.mineralogy.marble_brick_stairs": "Escadas de tijolos de Mármore", + "block.mineralogy.marble_brick_slab": "Laje de tijolos de Mármore", + "block.mineralogy.marble_smooth": "Bloco polido de Mármore", + "block.mineralogy.marble_smooth_stairs": "Escadas polidas de Mármore", + "block.mineralogy.marble_smooth_slab": "Laje polida de Mármore", + "block.mineralogy.marble_smooth_brick": "Tijolos polidos de Mármore", + "block.mineralogy.marble_smooth_brick_stairs": "Escadas de tijolos polidos de Mármore", + "block.mineralogy.marble_smooth_brick_slab": "Laje de tijolos polidos de Mármore", + "block.mineralogy.phyllite": "Filito", + "block.mineralogy.phyllite_stairs": "Escadas de Filito", + "block.mineralogy.phyllite_slab": "Laje de Filito", + "block.mineralogy.phyllite_brick": "Tijolos de Filito", + "block.mineralogy.phyllite_brick_stairs": "Escadas de tijolos de Filito", + "block.mineralogy.phyllite_brick_slab": "Laje de tijolos de Filito", + "block.mineralogy.phyllite_smooth": "Bloco polido de Filito", + "block.mineralogy.phyllite_smooth_stairs": "Escadas polidas de Filito", + "block.mineralogy.phyllite_smooth_slab": "Laje polida de Filito", + "block.mineralogy.phyllite_smooth_brick": "Tijolos polidos de Filito", + "block.mineralogy.phyllite_smooth_brick_stairs": "Escadas de tijolos polidos de Filito", + "block.mineralogy.phyllite_smooth_brick_slab": "Laje de tijolos polidos de Filito", + "block.mineralogy.amphibolite": "Anfibolito", + "block.mineralogy.amphibolite_stairs": "Escadas de Anfibolito", + "block.mineralogy.amphibolite_slab": "Laje de Anfibolito", + "block.mineralogy.amphibolite_brick": "Tijolos de Anfibolito", + "block.mineralogy.amphibolite_brick_stairs": "Escadas de tijolos de Anfibolito", + "block.mineralogy.amphibolite_brick_slab": "Laje de tijolos de Anfibolito", + "block.mineralogy.amphibolite_smooth": "Bloco polido de Anfibolito", + "block.mineralogy.amphibolite_smooth_stairs": "Escadas polidas de Anfibolito", + "block.mineralogy.amphibolite_smooth_slab": "Laje polida de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick": "Tijolos polidos de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Escadas de tijolos polidos de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_slab": "Laje de tijolos polidos de Anfibolito", + "item.mineralogy.gypsum_dust": "Pó de gesso", + "item.mineralogy.sulfur_dust": "Pó de enxofre", + "item.mineralogy.phosphorous_dust": "Pó de fósforo", + "item.mineralogy.nitrate_dust": "Pó de nitrato", + "item.mineralogy.mineral_fertilizer": "Fertilizante mineral", + "block.mineralogy.chert": "Sílex", + "block.mineralogy.gypsum": "Gesso", + "block.mineralogy.pumice": "Pedra-pomes", + "block.mineralogy.sulfur_block": "Enxofre", + "block.mineralogy.sulfur_ore": "Minério de enxofre", + "block.mineralogy.phosphorous_block": "Fósforo", + "block.mineralogy.phosphorous_ore": "Minério de fósforo", + "block.mineralogy.nitrate_block": "Nitrato", + "block.mineralogy.nitrate_ore": "Minério de nitrato", + "block.mineralogy.drywall_black": "Placa de gesso preta", + "block.mineralogy.drywall_red": "Placa de gesso vermelha", + "block.mineralogy.drywall_green": "Placa de gesso verde", + "block.mineralogy.drywall_brown": "Placa de gesso marrom", + "block.mineralogy.drywall_blue": "Placa de gesso azul", + "block.mineralogy.drywall_purple": "Placa de gesso roxa", + "block.mineralogy.drywall_cyan": "Placa de gesso ciana", + "block.mineralogy.drywall_silver": "Placa de gesso cinza-clara", + "block.mineralogy.drywall_gray": "Placa de gesso cinza", + "block.mineralogy.drywall_pink": "Placa de gesso rosa", + "block.mineralogy.drywall_lime": "Placa de gesso verde-limão", + "block.mineralogy.drywall_yellow": "Placa de gesso amarela", + "block.mineralogy.drywall_light_blue": "Placa de gesso azul-clara", + "block.mineralogy.drywall_magenta": "Placa de gesso magenta", + "block.mineralogy.drywall_orange": "Placa de gesso laranja", + "block.mineralogy.drywall_white": "Placa de gesso branca", + "block.mineralogy.andesite_wall": "Muro de Andesito", + "block.mineralogy.andesite_brick_wall": "Muro de tijolos de Andesito", + "block.mineralogy.andesite_smooth_wall": "Muro polido de Andesito", + "block.mineralogy.andesite_smooth_brick_wall": "Muro de tijolos polidos de Andesito", + "block.mineralogy.basalt_wall": "Muro de Basalto", + "block.mineralogy.basalt_brick_wall": "Muro de tijolos de Basalto", + "block.mineralogy.basalt_smooth_wall": "Muro polido de Basalto", + "block.mineralogy.basalt_smooth_brick_wall": "Muro de tijolos polidos de Basalto", + "block.mineralogy.diorite_wall": "Muro de Diorito", + "block.mineralogy.diorite_brick_wall": "Muro de tijolos de Diorito", + "block.mineralogy.diorite_smooth_wall": "Muro polido de Diorito", + "block.mineralogy.diorite_smooth_brick_wall": "Muro de tijolos polidos de Diorito", + "block.mineralogy.granite_wall": "Muro de Granito", + "block.mineralogy.granite_brick_wall": "Muro de tijolos de Granito", + "block.mineralogy.granite_smooth_wall": "Muro polido de Granito", + "block.mineralogy.granite_smooth_brick_wall": "Muro de tijolos polidos de Granito", + "block.mineralogy.rhyolite_wall": "Muro de Riolito", + "block.mineralogy.rhyolite_brick_wall": "Muro de tijolos de Riolito", + "block.mineralogy.rhyolite_smooth_wall": "Muro polido de Riolito", + "block.mineralogy.rhyolite_smooth_brick_wall": "Muro de tijolos polidos de Riolito", + "block.mineralogy.pegmatite_wall": "Muro de Pegmatito", + "block.mineralogy.pegmatite_brick_wall": "Muro de tijolos de Pegmatito", + "block.mineralogy.pegmatite_smooth_wall": "Muro polido de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_wall": "Muro de tijolos polidos de Pegmatito", + "block.mineralogy.shale_wall": "Muro de Folhelho", + "block.mineralogy.shale_brick_wall": "Muro de tijolos de Folhelho", + "block.mineralogy.shale_smooth_wall": "Muro polido de Folhelho", + "block.mineralogy.shale_smooth_brick_wall": "Muro de tijolos polidos de Folhelho", + "block.mineralogy.conglomerate_wall": "Muro de Conglomerado", + "block.mineralogy.conglomerate_brick_wall": "Muro de tijolos de Conglomerado", + "block.mineralogy.conglomerate_smooth_wall": "Muro polido de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_wall": "Muro de tijolos polidos de Conglomerado", + "block.mineralogy.dolomite_wall": "Muro de Dolomita", + "block.mineralogy.dolomite_brick_wall": "Muro de tijolos de Dolomita", + "block.mineralogy.dolomite_smooth_wall": "Muro polido de Dolomita", + "block.mineralogy.dolomite_smooth_brick_wall": "Muro de tijolos polidos de Dolomita", + "block.mineralogy.limestone_wall": "Muro de Calcário", + "block.mineralogy.limestone_brick_wall": "Muro de tijolos de Calcário", + "block.mineralogy.limestone_smooth_wall": "Muro polido de Calcário", + "block.mineralogy.limestone_smooth_brick_wall": "Muro de tijolos polidos de Calcário", + "block.mineralogy.marble_wall": "Muro de Mármore", + "block.mineralogy.marble_brick_wall": "Muro de tijolos de Mármore", + "block.mineralogy.marble_smooth_wall": "Muro polido de Mármore", + "block.mineralogy.marble_smooth_brick_wall": "Muro de tijolos polidos de Mármore", + "block.mineralogy.slate_wall": "Muro de Ardósia", + "block.mineralogy.slate_brick_wall": "Muro de tijolos de Ardósia", + "block.mineralogy.slate_smooth_wall": "Muro polido de Ardósia", + "block.mineralogy.slate_smooth_brick_wall": "Muro de tijolos polidos de Ardósia", + "block.mineralogy.schist_wall": "Muro de Xisto", + "block.mineralogy.schist_brick_wall": "Muro de tijolos de Xisto", + "block.mineralogy.schist_smooth_wall": "Muro polido de Xisto", + "block.mineralogy.schist_smooth_brick_wall": "Muro de tijolos polidos de Xisto", + "block.mineralogy.gneiss_wall": "Muro de Gnaisse", + "block.mineralogy.gneiss_brick_wall": "Muro de tijolos de Gnaisse", + "block.mineralogy.gneiss_smooth_wall": "Muro polido de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_wall": "Muro de tijolos polidos de Gnaisse", + "block.mineralogy.phyllite_wall": "Muro de Filito", + "block.mineralogy.phyllite_brick_wall": "Muro de tijolos de Filito", + "block.mineralogy.phyllite_smooth_wall": "Muro polido de Filito", + "block.mineralogy.phyllite_smooth_brick_wall": "Muro de tijolos polidos de Filito", + "block.mineralogy.amphibolite_wall": "Muro de Anfibolito", + "block.mineralogy.amphibolite_brick_wall": "Muro de tijolos de Anfibolito", + "block.mineralogy.amphibolite_smooth_wall": "Muro polido de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_wall": "Muro de tijolos polidos de Anfibolito", + "block.mineralogy.andesite_furnace": "Fornalha de Andesito", + "block.mineralogy.andesite_brick_furnace": "Fornalha de tijolos de Andesito", + "block.mineralogy.andesite_smooth_furnace": "Fornalha polida de Andesito", + "block.mineralogy.andesite_smooth_brick_furnace": "Fornalha de tijolos polidos de Andesito", + "block.mineralogy.basalt_furnace": "Fornalha de Basalto", + "block.mineralogy.basalt_brick_furnace": "Fornalha de tijolos de Basalto", + "block.mineralogy.basalt_smooth_furnace": "Fornalha polida de Basalto", + "block.mineralogy.basalt_smooth_brick_furnace": "Fornalha de tijolos polidos de Basalto", + "block.mineralogy.diorite_furnace": "Fornalha de Diorito", + "block.mineralogy.diorite_brick_furnace": "Fornalha de tijolos de Diorito", + "block.mineralogy.diorite_smooth_furnace": "Fornalha polida de Diorito", + "block.mineralogy.diorite_smooth_brick_furnace": "Fornalha de tijolos polidos de Diorito", + "block.mineralogy.granite_furnace": "Fornalha de Granito", + "block.mineralogy.granite_brick_furnace": "Fornalha de tijolos de Granito", + "block.mineralogy.granite_smooth_furnace": "Fornalha polida de Granito", + "block.mineralogy.granite_smooth_brick_furnace": "Fornalha de tijolos polidos de Granito", + "block.mineralogy.rhyolite_furnace": "Fornalha de Riolito", + "block.mineralogy.rhyolite_brick_furnace": "Fornalha de tijolos de Riolito", + "block.mineralogy.rhyolite_smooth_furnace": "Fornalha polida de Riolito", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Fornalha de tijolos polidos de Riolito", + "block.mineralogy.pegmatite_furnace": "Fornalha de Pegmatito", + "block.mineralogy.pegmatite_brick_furnace": "Fornalha de tijolos de Pegmatito", + "block.mineralogy.pegmatite_smooth_furnace": "Fornalha polida de Pegmatito", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Fornalha de tijolos polidos de Pegmatito", + "block.mineralogy.shale_furnace": "Fornalha de Folhelho", + "block.mineralogy.shale_brick_furnace": "Fornalha de tijolos de Folhelho", + "block.mineralogy.shale_smooth_furnace": "Fornalha polida de Folhelho", + "block.mineralogy.shale_smooth_brick_furnace": "Fornalha de tijolos polidos de Folhelho", + "block.mineralogy.conglomerate_furnace": "Fornalha de Conglomerado", + "block.mineralogy.conglomerate_brick_furnace": "Fornalha de tijolos de Conglomerado", + "block.mineralogy.conglomerate_smooth_furnace": "Fornalha polida de Conglomerado", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Fornalha de tijolos polidos de Conglomerado", + "block.mineralogy.dolomite_furnace": "Fornalha de Dolomita", + "block.mineralogy.dolomite_brick_furnace": "Fornalha de tijolos de Dolomita", + "block.mineralogy.dolomite_smooth_furnace": "Fornalha polida de Dolomita", + "block.mineralogy.dolomite_smooth_brick_furnace": "Fornalha de tijolos polidos de Dolomita", + "block.mineralogy.limestone_furnace": "Fornalha de Calcário", + "block.mineralogy.limestone_brick_furnace": "Fornalha de tijolos de Calcário", + "block.mineralogy.limestone_smooth_furnace": "Fornalha polida de Calcário", + "block.mineralogy.limestone_smooth_brick_furnace": "Fornalha de tijolos polidos de Calcário", + "block.mineralogy.marble_furnace": "Fornalha de Mármore", + "block.mineralogy.marble_brick_furnace": "Fornalha de tijolos de Mármore", + "block.mineralogy.marble_smooth_furnace": "Fornalha polida de Mármore", + "block.mineralogy.marble_smooth_brick_furnace": "Fornalha de tijolos polidos de Mármore", + "block.mineralogy.slate_furnace": "Fornalha de Ardósia", + "block.mineralogy.slate_brick_furnace": "Fornalha de tijolos de Ardósia", + "block.mineralogy.slate_smooth_furnace": "Fornalha polida de Ardósia", + "block.mineralogy.slate_smooth_brick_furnace": "Fornalha de tijolos polidos de Ardósia", + "block.mineralogy.schist_furnace": "Fornalha de Xisto", + "block.mineralogy.schist_brick_furnace": "Fornalha de tijolos de Xisto", + "block.mineralogy.schist_smooth_furnace": "Fornalha polida de Xisto", + "block.mineralogy.schist_smooth_brick_furnace": "Fornalha de tijolos polidos de Xisto", + "block.mineralogy.gneiss_furnace": "Fornalha de Gnaisse", + "block.mineralogy.gneiss_brick_furnace": "Fornalha de tijolos de Gnaisse", + "block.mineralogy.gneiss_smooth_furnace": "Fornalha polida de Gnaisse", + "block.mineralogy.gneiss_smooth_brick_furnace": "Fornalha de tijolos polidos de Gnaisse", + "block.mineralogy.phyllite_furnace": "Fornalha de Filito", + "block.mineralogy.phyllite_brick_furnace": "Fornalha de tijolos de Filito", + "block.mineralogy.phyllite_smooth_furnace": "Fornalha polida de Filito", + "block.mineralogy.phyllite_smooth_brick_furnace": "Fornalha de tijolos polidos de Filito", + "block.mineralogy.amphibolite_furnace": "Fornalha de Anfibolito", + "block.mineralogy.amphibolite_brick_furnace": "Fornalha de tijolos de Anfibolito", + "block.mineralogy.amphibolite_smooth_furnace": "Fornalha polida de Anfibolito", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Fornalha de tijolos polidos de Anfibolito", + "block.mineralogy.diabase": "Diabásio", + "block.mineralogy.diabase_stairs": "Escadas de Diabásio", + "block.mineralogy.diabase_slab": "Laje de Diabásio", + "block.mineralogy.diabase_brick": "Tijolos de Diabásio", + "block.mineralogy.diabase_brick_stairs": "Escadas de tijolos de Diabásio", + "block.mineralogy.diabase_brick_slab": "Laje de tijolos de Diabásio", + "block.mineralogy.diabase_smooth": "Bloco polido de Diabásio", + "block.mineralogy.diabase_smooth_stairs": "Escadas polidas de Diabásio", + "block.mineralogy.diabase_smooth_slab": "Laje polida de Diabásio", + "block.mineralogy.diabase_smooth_brick": "Tijolos polidos de Diabásio", + "block.mineralogy.diabase_smooth_brick_stairs": "Escadas de tijolos polidos de Diabásio", + "block.mineralogy.diabase_smooth_brick_slab": "Laje de tijolos polidos de Diabásio", + "block.mineralogy.diabase_wall": "Muro de Diabásio", + "block.mineralogy.diabase_brick_wall": "Muro de tijolos de Diabásio", + "block.mineralogy.diabase_smooth_wall": "Muro polido de Diabásio", + "block.mineralogy.diabase_smooth_brick_wall": "Muro de tijolos polidos de Diabásio", + "block.mineralogy.diabase_furnace": "Fornalha de Diabásio", + "block.mineralogy.diabase_brick_furnace": "Fornalha de tijolos de Diabásio", + "block.mineralogy.diabase_smooth_furnace": "Fornalha polida de Diabásio", + "block.mineralogy.diabase_smooth_brick_furnace": "Fornalha de tijolos polidos de Diabásio", + "block.mineralogy.gabbro": "Gabro", + "block.mineralogy.gabbro_stairs": "Escadas de Gabro", + "block.mineralogy.gabbro_slab": "Laje de Gabro", + "block.mineralogy.gabbro_brick": "Tijolos de Gabro", + "block.mineralogy.gabbro_brick_stairs": "Escadas de tijolos de Gabro", + "block.mineralogy.gabbro_brick_slab": "Laje de tijolos de Gabro", + "block.mineralogy.gabbro_smooth": "Bloco polido de Gabro", + "block.mineralogy.gabbro_smooth_stairs": "Escadas polidas de Gabro", + "block.mineralogy.gabbro_smooth_slab": "Laje polida de Gabro", + "block.mineralogy.gabbro_smooth_brick": "Tijolos polidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_stairs": "Escadas de tijolos polidos de Gabro", + "block.mineralogy.gabbro_smooth_brick_slab": "Laje de tijolos polidos de Gabro", + "block.mineralogy.gabbro_wall": "Muro de Gabro", + "block.mineralogy.gabbro_brick_wall": "Muro de tijolos de Gabro", + "block.mineralogy.gabbro_smooth_wall": "Muro polido de Gabro", + "block.mineralogy.gabbro_smooth_brick_wall": "Muro de tijolos polidos de Gabro", + "block.mineralogy.gabbro_furnace": "Fornalha de Gabro", + "block.mineralogy.gabbro_brick_furnace": "Fornalha de tijolos de Gabro", + "block.mineralogy.gabbro_smooth_furnace": "Fornalha polida de Gabro", + "block.mineralogy.gabbro_smooth_brick_furnace": "Fornalha de tijolos polidos de Gabro", + "block.mineralogy.peridotite": "Peridotito", + "block.mineralogy.peridotite_stairs": "Escadas de Peridotito", + "block.mineralogy.peridotite_slab": "Laje de Peridotito", + "block.mineralogy.peridotite_brick": "Tijolos de Peridotito", + "block.mineralogy.peridotite_brick_stairs": "Escadas de tijolos de Peridotito", + "block.mineralogy.peridotite_brick_slab": "Laje de tijolos de Peridotito", + "block.mineralogy.peridotite_smooth": "Bloco polido de Peridotito", + "block.mineralogy.peridotite_smooth_stairs": "Escadas polidas de Peridotito", + "block.mineralogy.peridotite_smooth_slab": "Laje polida de Peridotito", + "block.mineralogy.peridotite_smooth_brick": "Tijolos polidos de Peridotito", + "block.mineralogy.peridotite_smooth_brick_stairs": "Escadas de tijolos polidos de Peridotito", + "block.mineralogy.peridotite_smooth_brick_slab": "Laje de tijolos polidos de Peridotito", + "block.mineralogy.peridotite_wall": "Muro de Peridotito", + "block.mineralogy.peridotite_brick_wall": "Muro de tijolos de Peridotito", + "block.mineralogy.peridotite_smooth_wall": "Muro polido de Peridotito", + "block.mineralogy.peridotite_smooth_brick_wall": "Muro de tijolos polidos de Peridotito", + "block.mineralogy.peridotite_furnace": "Fornalha de Peridotito", + "block.mineralogy.peridotite_brick_furnace": "Fornalha de tijolos de Peridotito", + "block.mineralogy.peridotite_smooth_furnace": "Fornalha polida de Peridotito", + "block.mineralogy.peridotite_smooth_brick_furnace": "Fornalha de tijolos polidos de Peridotito", + "block.mineralogy.basaltic_glass": "Vidro basáltico", + "block.mineralogy.basaltic_glass_stairs": "Escadas de Vidro basáltico", + "block.mineralogy.basaltic_glass_slab": "Laje de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick": "Tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_stairs": "Escadas de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_slab": "Laje de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth": "Bloco polido de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_stairs": "Escadas polidas de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_slab": "Laje polida de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick": "Tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Escadas de tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Laje de tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_wall": "Muro de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_wall": "Muro de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_wall": "Muro polido de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Muro de tijolos polidos de Vidro basáltico", + "block.mineralogy.basaltic_glass_furnace": "Fornalha de Vidro basáltico", + "block.mineralogy.basaltic_glass_brick_furnace": "Fornalha de tijolos de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_furnace": "Fornalha polida de Vidro basáltico", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Fornalha de tijolos polidos de Vidro basáltico", + "block.mineralogy.scoria": "Escória", + "block.mineralogy.scoria_stairs": "Escadas de Escória", + "block.mineralogy.scoria_slab": "Laje de Escória", + "block.mineralogy.scoria_brick": "Tijolos de Escória", + "block.mineralogy.scoria_brick_stairs": "Escadas de tijolos de Escória", + "block.mineralogy.scoria_brick_slab": "Laje de tijolos de Escória", + "block.mineralogy.scoria_smooth": "Bloco polido de Escória", + "block.mineralogy.scoria_smooth_stairs": "Escadas polidas de Escória", + "block.mineralogy.scoria_smooth_slab": "Laje polida de Escória", + "block.mineralogy.scoria_smooth_brick": "Tijolos polidos de Escória", + "block.mineralogy.scoria_smooth_brick_stairs": "Escadas de tijolos polidos de Escória", + "block.mineralogy.scoria_smooth_brick_slab": "Laje de tijolos polidos de Escória", + "block.mineralogy.scoria_wall": "Muro de Escória", + "block.mineralogy.scoria_brick_wall": "Muro de tijolos de Escória", + "block.mineralogy.scoria_smooth_wall": "Muro polido de Escória", + "block.mineralogy.scoria_smooth_brick_wall": "Muro de tijolos polidos de Escória", + "block.mineralogy.scoria_furnace": "Fornalha de Escória", + "block.mineralogy.scoria_brick_furnace": "Fornalha de tijolos de Escória", + "block.mineralogy.scoria_smooth_furnace": "Fornalha polida de Escória", + "block.mineralogy.scoria_smooth_brick_furnace": "Fornalha de tijolos polidos de Escória", + "block.mineralogy.tuff": "Tufo", + "block.mineralogy.tuff_stairs": "Escadas de Tufo", + "block.mineralogy.tuff_slab": "Laje de Tufo", + "block.mineralogy.tuff_brick": "Tijolos de Tufo", + "block.mineralogy.tuff_brick_stairs": "Escadas de tijolos de Tufo", + "block.mineralogy.tuff_brick_slab": "Laje de tijolos de Tufo", + "block.mineralogy.tuff_smooth": "Bloco polido de Tufo", + "block.mineralogy.tuff_smooth_stairs": "Escadas polidas de Tufo", + "block.mineralogy.tuff_smooth_slab": "Laje polida de Tufo", + "block.mineralogy.tuff_smooth_brick": "Tijolos polidos de Tufo", + "block.mineralogy.tuff_smooth_brick_stairs": "Escadas de tijolos polidos de Tufo", + "block.mineralogy.tuff_smooth_brick_slab": "Laje de tijolos polidos de Tufo", + "block.mineralogy.tuff_wall": "Muro de Tufo", + "block.mineralogy.tuff_brick_wall": "Muro de tijolos de Tufo", + "block.mineralogy.tuff_smooth_wall": "Muro polido de Tufo", + "block.mineralogy.tuff_smooth_brick_wall": "Muro de tijolos polidos de Tufo", + "block.mineralogy.tuff_furnace": "Fornalha de Tufo", + "block.mineralogy.tuff_brick_furnace": "Fornalha de tijolos de Tufo", + "block.mineralogy.tuff_smooth_furnace": "Fornalha polida de Tufo", + "block.mineralogy.tuff_smooth_brick_furnace": "Fornalha de tijolos polidos de Tufo", + "block.mineralogy.siltstone": "Siltito", + "block.mineralogy.siltstone_stairs": "Escadas de Siltito", + "block.mineralogy.siltstone_slab": "Laje de Siltito", + "block.mineralogy.siltstone_brick": "Tijolos de Siltito", + "block.mineralogy.siltstone_brick_stairs": "Escadas de tijolos de Siltito", + "block.mineralogy.siltstone_brick_slab": "Laje de tijolos de Siltito", + "block.mineralogy.siltstone_smooth": "Bloco polido de Siltito", + "block.mineralogy.siltstone_smooth_stairs": "Escadas polidas de Siltito", + "block.mineralogy.siltstone_smooth_slab": "Laje polida de Siltito", + "block.mineralogy.siltstone_smooth_brick": "Tijolos polidos de Siltito", + "block.mineralogy.siltstone_smooth_brick_stairs": "Escadas de tijolos polidos de Siltito", + "block.mineralogy.siltstone_smooth_brick_slab": "Laje de tijolos polidos de Siltito", + "block.mineralogy.siltstone_wall": "Muro de Siltito", + "block.mineralogy.siltstone_brick_wall": "Muro de tijolos de Siltito", + "block.mineralogy.siltstone_smooth_wall": "Muro polido de Siltito", + "block.mineralogy.siltstone_smooth_brick_wall": "Muro de tijolos polidos de Siltito", + "block.mineralogy.siltstone_furnace": "Fornalha de Siltito", + "block.mineralogy.siltstone_brick_furnace": "Fornalha de tijolos de Siltito", + "block.mineralogy.siltstone_smooth_furnace": "Fornalha polida de Siltito", + "block.mineralogy.siltstone_smooth_brick_furnace": "Fornalha de tijolos polidos de Siltito", + "block.mineralogy.rock_salt": "Sal-gema", + "block.mineralogy.rock_salt_stairs": "Escadas de Sal-gema", + "block.mineralogy.rock_salt_slab": "Laje de Sal-gema", + "block.mineralogy.rock_salt_brick": "Tijolos de Sal-gema", + "block.mineralogy.rock_salt_brick_stairs": "Escadas de tijolos de Sal-gema", + "block.mineralogy.rock_salt_brick_slab": "Laje de tijolos de Sal-gema", + "block.mineralogy.rock_salt_smooth": "Bloco polido de Sal-gema", + "block.mineralogy.rock_salt_smooth_stairs": "Escadas polidas de Sal-gema", + "block.mineralogy.rock_salt_smooth_slab": "Laje polida de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick": "Tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Escadas de tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_slab": "Laje de tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_wall": "Muro de Sal-gema", + "block.mineralogy.rock_salt_brick_wall": "Muro de tijolos de Sal-gema", + "block.mineralogy.rock_salt_smooth_wall": "Muro polido de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_wall": "Muro de tijolos polidos de Sal-gema", + "block.mineralogy.rock_salt_furnace": "Fornalha de Sal-gema", + "block.mineralogy.rock_salt_brick_furnace": "Fornalha de tijolos de Sal-gema", + "block.mineralogy.rock_salt_smooth_furnace": "Fornalha polida de Sal-gema", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Fornalha de tijolos polidos de Sal-gema", + "block.mineralogy.hornfels": "Cornubianito", + "block.mineralogy.hornfels_stairs": "Escadas de Cornubianito", + "block.mineralogy.hornfels_slab": "Laje de Cornubianito", + "block.mineralogy.hornfels_brick": "Tijolos de Cornubianito", + "block.mineralogy.hornfels_brick_stairs": "Escadas de tijolos de Cornubianito", + "block.mineralogy.hornfels_brick_slab": "Laje de tijolos de Cornubianito", + "block.mineralogy.hornfels_smooth": "Bloco polido de Cornubianito", + "block.mineralogy.hornfels_smooth_stairs": "Escadas polidas de Cornubianito", + "block.mineralogy.hornfels_smooth_slab": "Laje polida de Cornubianito", + "block.mineralogy.hornfels_smooth_brick": "Tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_stairs": "Escadas de tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_slab": "Laje de tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_wall": "Muro de Cornubianito", + "block.mineralogy.hornfels_brick_wall": "Muro de tijolos de Cornubianito", + "block.mineralogy.hornfels_smooth_wall": "Muro polido de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_wall": "Muro de tijolos polidos de Cornubianito", + "block.mineralogy.hornfels_furnace": "Fornalha de Cornubianito", + "block.mineralogy.hornfels_brick_furnace": "Fornalha de tijolos de Cornubianito", + "block.mineralogy.hornfels_smooth_furnace": "Fornalha polida de Cornubianito", + "block.mineralogy.hornfels_smooth_brick_furnace": "Fornalha de tijolos polidos de Cornubianito", + "block.mineralogy.quartzite": "Quartzito", + "block.mineralogy.quartzite_stairs": "Escadas de Quartzito", + "block.mineralogy.quartzite_slab": "Laje de Quartzito", + "block.mineralogy.quartzite_brick": "Tijolos de Quartzito", + "block.mineralogy.quartzite_brick_stairs": "Escadas de tijolos de Quartzito", + "block.mineralogy.quartzite_brick_slab": "Laje de tijolos de Quartzito", + "block.mineralogy.quartzite_smooth": "Bloco polido de Quartzito", + "block.mineralogy.quartzite_smooth_stairs": "Escadas polidas de Quartzito", + "block.mineralogy.quartzite_smooth_slab": "Laje polida de Quartzito", + "block.mineralogy.quartzite_smooth_brick": "Tijolos polidos de Quartzito", + "block.mineralogy.quartzite_smooth_brick_stairs": "Escadas de tijolos polidos de Quartzito", + "block.mineralogy.quartzite_smooth_brick_slab": "Laje de tijolos polidos de Quartzito", + "block.mineralogy.quartzite_wall": "Muro de Quartzito", + "block.mineralogy.quartzite_brick_wall": "Muro de tijolos de Quartzito", + "block.mineralogy.quartzite_smooth_wall": "Muro polido de Quartzito", + "block.mineralogy.quartzite_smooth_brick_wall": "Muro de tijolos polidos de Quartzito", + "block.mineralogy.quartzite_furnace": "Fornalha de Quartzito", + "block.mineralogy.quartzite_brick_furnace": "Fornalha de tijolos de Quartzito", + "block.mineralogy.quartzite_smooth_furnace": "Fornalha polida de Quartzito", + "block.mineralogy.quartzite_smooth_brick_furnace": "Fornalha de tijolos polidos de Quartzito", + "block.mineralogy.novaculite": "Novaculita", + "block.mineralogy.novaculite_stairs": "Escadas de Novaculita", + "block.mineralogy.novaculite_slab": "Laje de Novaculita", + "block.mineralogy.novaculite_brick": "Tijolos de Novaculita", + "block.mineralogy.novaculite_brick_stairs": "Escadas de tijolos de Novaculita", + "block.mineralogy.novaculite_brick_slab": "Laje de tijolos de Novaculita", + "block.mineralogy.novaculite_smooth": "Bloco polido de Novaculita", + "block.mineralogy.novaculite_smooth_stairs": "Escadas polidas de Novaculita", + "block.mineralogy.novaculite_smooth_slab": "Laje polida de Novaculita", + "block.mineralogy.novaculite_smooth_brick": "Tijolos polidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_stairs": "Escadas de tijolos polidos de Novaculita", + "block.mineralogy.novaculite_smooth_brick_slab": "Laje de tijolos polidos de Novaculita", + "block.mineralogy.novaculite_wall": "Muro de Novaculita", + "block.mineralogy.novaculite_brick_wall": "Muro de tijolos de Novaculita", + "block.mineralogy.novaculite_smooth_wall": "Muro polido de Novaculita", + "block.mineralogy.novaculite_smooth_brick_wall": "Muro de tijolos polidos de Novaculita", + "block.mineralogy.novaculite_furnace": "Fornalha de Novaculita", + "block.mineralogy.novaculite_brick_furnace": "Fornalha de tijolos de Novaculita", + "block.mineralogy.novaculite_smooth_furnace": "Fornalha polida de Novaculita", + "block.mineralogy.novaculite_smooth_brick_furnace": "Fornalha de tijolos polidos de Novaculita", + "block.mineralogy.chalk": "Giz", + "item.mineralogy.chalk_dust": "Pó de giz", + "item.mineralogy.salt_dust": "Sal", + "item.mineralogy.rock_salt_dust": "Cristais de sal-gema", + "block.mineralogy.rocksaltlamp": "Luminária de sal-gema", + "block.mineralogy.rocksaltstreetlamp": "Poste de luz de sal-gema", + "block.mineralogy.andesite_relief_axe": "Baixo-relevo de Andesito (machado)", + "block.mineralogy.andesite_relief_blank": "Baixo-relevo de Andesito (sem motivo)", + "block.mineralogy.andesite_relief_cross": "Baixo-relevo de Andesito (cruz)", + "block.mineralogy.andesite_relief_hammer": "Baixo-relevo de Andesito (martelo)", + "block.mineralogy.andesite_relief_hoe": "Baixo-relevo de Andesito (enxada)", + "block.mineralogy.andesite_relief_horizontal": "Baixo-relevo de Andesito (horizontal)", + "block.mineralogy.andesite_relief_i": "Baixo-relevo de Andesito (I)", + "block.mineralogy.andesite_relief_left": "Baixo-relevo de Andesito (esquerda)", + "block.mineralogy.andesite_relief_pickaxe": "Baixo-relevo de Andesito (picareta)", + "block.mineralogy.andesite_relief_plus": "Baixo-relevo de Andesito (sinal de mais)", + "block.mineralogy.andesite_relief_right": "Baixo-relevo de Andesito (direita)", + "block.mineralogy.andesite_relief_sword": "Baixo-relevo de Andesito (espada)", + "block.mineralogy.andesite_relief_vertical": "Baixo-relevo de Andesito (vertical)", + "block.mineralogy.basalt_relief_axe": "Baixo-relevo de Basalto (machado)", + "block.mineralogy.basalt_relief_blank": "Baixo-relevo de Basalto (sem motivo)", + "block.mineralogy.basalt_relief_cross": "Baixo-relevo de Basalto (cruz)", + "block.mineralogy.basalt_relief_hammer": "Baixo-relevo de Basalto (martelo)", + "block.mineralogy.basalt_relief_hoe": "Baixo-relevo de Basalto (enxada)", + "block.mineralogy.basalt_relief_horizontal": "Baixo-relevo de Basalto (horizontal)", + "block.mineralogy.basalt_relief_i": "Baixo-relevo de Basalto (I)", + "block.mineralogy.basalt_relief_left": "Baixo-relevo de Basalto (esquerda)", + "block.mineralogy.basalt_relief_pickaxe": "Baixo-relevo de Basalto (picareta)", + "block.mineralogy.basalt_relief_plus": "Baixo-relevo de Basalto (sinal de mais)", + "block.mineralogy.basalt_relief_right": "Baixo-relevo de Basalto (direita)", + "block.mineralogy.basalt_relief_sword": "Baixo-relevo de Basalto (espada)", + "block.mineralogy.basalt_relief_vertical": "Baixo-relevo de Basalto (vertical)", + "block.mineralogy.diorite_relief_axe": "Baixo-relevo de Diorito (machado)", + "block.mineralogy.diorite_relief_blank": "Baixo-relevo de Diorito (sem motivo)", + "block.mineralogy.diorite_relief_cross": "Baixo-relevo de Diorito (cruz)", + "block.mineralogy.diorite_relief_hammer": "Baixo-relevo de Diorito (martelo)", + "block.mineralogy.diorite_relief_hoe": "Baixo-relevo de Diorito (enxada)", + "block.mineralogy.diorite_relief_horizontal": "Baixo-relevo de Diorito (horizontal)", + "block.mineralogy.diorite_relief_i": "Baixo-relevo de Diorito (I)", + "block.mineralogy.diorite_relief_left": "Baixo-relevo de Diorito (esquerda)", + "block.mineralogy.diorite_relief_pickaxe": "Baixo-relevo de Diorito (picareta)", + "block.mineralogy.diorite_relief_plus": "Baixo-relevo de Diorito (sinal de mais)", + "block.mineralogy.diorite_relief_right": "Baixo-relevo de Diorito (direita)", + "block.mineralogy.diorite_relief_sword": "Baixo-relevo de Diorito (espada)", + "block.mineralogy.diorite_relief_vertical": "Baixo-relevo de Diorito (vertical)", + "block.mineralogy.granite_relief_axe": "Baixo-relevo de Granito (machado)", + "block.mineralogy.granite_relief_blank": "Baixo-relevo de Granito (sem motivo)", + "block.mineralogy.granite_relief_cross": "Baixo-relevo de Granito (cruz)", + "block.mineralogy.granite_relief_hammer": "Baixo-relevo de Granito (martelo)", + "block.mineralogy.granite_relief_hoe": "Baixo-relevo de Granito (enxada)", + "block.mineralogy.granite_relief_horizontal": "Baixo-relevo de Granito (horizontal)", + "block.mineralogy.granite_relief_i": "Baixo-relevo de Granito (I)", + "block.mineralogy.granite_relief_left": "Baixo-relevo de Granito (esquerda)", + "block.mineralogy.granite_relief_pickaxe": "Baixo-relevo de Granito (picareta)", + "block.mineralogy.granite_relief_plus": "Baixo-relevo de Granito (sinal de mais)", + "block.mineralogy.granite_relief_right": "Baixo-relevo de Granito (direita)", + "block.mineralogy.granite_relief_sword": "Baixo-relevo de Granito (espada)", + "block.mineralogy.granite_relief_vertical": "Baixo-relevo de Granito (vertical)", + "block.mineralogy.rhyolite_relief_axe": "Baixo-relevo de Riolito (machado)", + "block.mineralogy.rhyolite_relief_blank": "Baixo-relevo de Riolito (sem motivo)", + "block.mineralogy.rhyolite_relief_cross": "Baixo-relevo de Riolito (cruz)", + "block.mineralogy.rhyolite_relief_hammer": "Baixo-relevo de Riolito (martelo)", + "block.mineralogy.rhyolite_relief_hoe": "Baixo-relevo de Riolito (enxada)", + "block.mineralogy.rhyolite_relief_horizontal": "Baixo-relevo de Riolito (horizontal)", + "block.mineralogy.rhyolite_relief_i": "Baixo-relevo de Riolito (I)", + "block.mineralogy.rhyolite_relief_left": "Baixo-relevo de Riolito (esquerda)", + "block.mineralogy.rhyolite_relief_pickaxe": "Baixo-relevo de Riolito (picareta)", + "block.mineralogy.rhyolite_relief_plus": "Baixo-relevo de Riolito (sinal de mais)", + "block.mineralogy.rhyolite_relief_right": "Baixo-relevo de Riolito (direita)", + "block.mineralogy.rhyolite_relief_sword": "Baixo-relevo de Riolito (espada)", + "block.mineralogy.rhyolite_relief_vertical": "Baixo-relevo de Riolito (vertical)", + "block.mineralogy.pegmatite_relief_axe": "Baixo-relevo de Pegmatito (machado)", + "block.mineralogy.pegmatite_relief_blank": "Baixo-relevo de Pegmatito (sem motivo)", + "block.mineralogy.pegmatite_relief_cross": "Baixo-relevo de Pegmatito (cruz)", + "block.mineralogy.pegmatite_relief_hammer": "Baixo-relevo de Pegmatito (martelo)", + "block.mineralogy.pegmatite_relief_hoe": "Baixo-relevo de Pegmatito (enxada)", + "block.mineralogy.pegmatite_relief_horizontal": "Baixo-relevo de Pegmatito (horizontal)", + "block.mineralogy.pegmatite_relief_i": "Baixo-relevo de Pegmatito (I)", + "block.mineralogy.pegmatite_relief_left": "Baixo-relevo de Pegmatito (esquerda)", + "block.mineralogy.pegmatite_relief_pickaxe": "Baixo-relevo de Pegmatito (picareta)", + "block.mineralogy.pegmatite_relief_plus": "Baixo-relevo de Pegmatito (sinal de mais)", + "block.mineralogy.pegmatite_relief_right": "Baixo-relevo de Pegmatito (direita)", + "block.mineralogy.pegmatite_relief_sword": "Baixo-relevo de Pegmatito (espada)", + "block.mineralogy.pegmatite_relief_vertical": "Baixo-relevo de Pegmatito (vertical)", + "block.mineralogy.shale_relief_axe": "Baixo-relevo de Folhelho (machado)", + "block.mineralogy.shale_relief_blank": "Baixo-relevo de Folhelho (sem motivo)", + "block.mineralogy.shale_relief_cross": "Baixo-relevo de Folhelho (cruz)", + "block.mineralogy.shale_relief_hammer": "Baixo-relevo de Folhelho (martelo)", + "block.mineralogy.shale_relief_hoe": "Baixo-relevo de Folhelho (enxada)", + "block.mineralogy.shale_relief_horizontal": "Baixo-relevo de Folhelho (horizontal)", + "block.mineralogy.shale_relief_i": "Baixo-relevo de Folhelho (I)", + "block.mineralogy.shale_relief_left": "Baixo-relevo de Folhelho (esquerda)", + "block.mineralogy.shale_relief_pickaxe": "Baixo-relevo de Folhelho (picareta)", + "block.mineralogy.shale_relief_plus": "Baixo-relevo de Folhelho (sinal de mais)", + "block.mineralogy.shale_relief_right": "Baixo-relevo de Folhelho (direita)", + "block.mineralogy.shale_relief_sword": "Baixo-relevo de Folhelho (espada)", + "block.mineralogy.shale_relief_vertical": "Baixo-relevo de Folhelho (vertical)", + "block.mineralogy.conglomerate_relief_axe": "Baixo-relevo de Conglomerado (machado)", + "block.mineralogy.conglomerate_relief_blank": "Baixo-relevo de Conglomerado (sem motivo)", + "block.mineralogy.conglomerate_relief_cross": "Baixo-relevo de Conglomerado (cruz)", + "block.mineralogy.conglomerate_relief_hammer": "Baixo-relevo de Conglomerado (martelo)", + "block.mineralogy.conglomerate_relief_hoe": "Baixo-relevo de Conglomerado (enxada)", + "block.mineralogy.conglomerate_relief_horizontal": "Baixo-relevo de Conglomerado (horizontal)", + "block.mineralogy.conglomerate_relief_i": "Baixo-relevo de Conglomerado (I)", + "block.mineralogy.conglomerate_relief_left": "Baixo-relevo de Conglomerado (esquerda)", + "block.mineralogy.conglomerate_relief_pickaxe": "Baixo-relevo de Conglomerado (picareta)", + "block.mineralogy.conglomerate_relief_plus": "Baixo-relevo de Conglomerado (sinal de mais)", + "block.mineralogy.conglomerate_relief_right": "Baixo-relevo de Conglomerado (direita)", + "block.mineralogy.conglomerate_relief_sword": "Baixo-relevo de Conglomerado (espada)", + "block.mineralogy.conglomerate_relief_vertical": "Baixo-relevo de Conglomerado (vertical)", + "block.mineralogy.dolomite_relief_axe": "Baixo-relevo de Dolomita (machado)", + "block.mineralogy.dolomite_relief_blank": "Baixo-relevo de Dolomita (sem motivo)", + "block.mineralogy.dolomite_relief_cross": "Baixo-relevo de Dolomita (cruz)", + "block.mineralogy.dolomite_relief_hammer": "Baixo-relevo de Dolomita (martelo)", + "block.mineralogy.dolomite_relief_hoe": "Baixo-relevo de Dolomita (enxada)", + "block.mineralogy.dolomite_relief_horizontal": "Baixo-relevo de Dolomita (horizontal)", + "block.mineralogy.dolomite_relief_i": "Baixo-relevo de Dolomita (I)", + "block.mineralogy.dolomite_relief_left": "Baixo-relevo de Dolomita (esquerda)", + "block.mineralogy.dolomite_relief_pickaxe": "Baixo-relevo de Dolomita (picareta)", + "block.mineralogy.dolomite_relief_plus": "Baixo-relevo de Dolomita (sinal de mais)", + "block.mineralogy.dolomite_relief_right": "Baixo-relevo de Dolomita (direita)", + "block.mineralogy.dolomite_relief_sword": "Baixo-relevo de Dolomita (espada)", + "block.mineralogy.dolomite_relief_vertical": "Baixo-relevo de Dolomita (vertical)", + "block.mineralogy.limestone_relief_axe": "Baixo-relevo de Calcário (machado)", + "block.mineralogy.limestone_relief_blank": "Baixo-relevo de Calcário (sem motivo)", + "block.mineralogy.limestone_relief_cross": "Baixo-relevo de Calcário (cruz)", + "block.mineralogy.limestone_relief_hammer": "Baixo-relevo de Calcário (martelo)", + "block.mineralogy.limestone_relief_hoe": "Baixo-relevo de Calcário (enxada)", + "block.mineralogy.limestone_relief_horizontal": "Baixo-relevo de Calcário (horizontal)", + "block.mineralogy.limestone_relief_i": "Baixo-relevo de Calcário (I)", + "block.mineralogy.limestone_relief_left": "Baixo-relevo de Calcário (esquerda)", + "block.mineralogy.limestone_relief_pickaxe": "Baixo-relevo de Calcário (picareta)", + "block.mineralogy.limestone_relief_plus": "Baixo-relevo de Calcário (sinal de mais)", + "block.mineralogy.limestone_relief_right": "Baixo-relevo de Calcário (direita)", + "block.mineralogy.limestone_relief_sword": "Baixo-relevo de Calcário (espada)", + "block.mineralogy.limestone_relief_vertical": "Baixo-relevo de Calcário (vertical)", + "block.mineralogy.marble_relief_axe": "Baixo-relevo de Mármore (machado)", + "block.mineralogy.marble_relief_blank": "Baixo-relevo de Mármore (sem motivo)", + "block.mineralogy.marble_relief_cross": "Baixo-relevo de Mármore (cruz)", + "block.mineralogy.marble_relief_hammer": "Baixo-relevo de Mármore (martelo)", + "block.mineralogy.marble_relief_hoe": "Baixo-relevo de Mármore (enxada)", + "block.mineralogy.marble_relief_horizontal": "Baixo-relevo de Mármore (horizontal)", + "block.mineralogy.marble_relief_i": "Baixo-relevo de Mármore (I)", + "block.mineralogy.marble_relief_left": "Baixo-relevo de Mármore (esquerda)", + "block.mineralogy.marble_relief_pickaxe": "Baixo-relevo de Mármore (picareta)", + "block.mineralogy.marble_relief_plus": "Baixo-relevo de Mármore (sinal de mais)", + "block.mineralogy.marble_relief_right": "Baixo-relevo de Mármore (direita)", + "block.mineralogy.marble_relief_sword": "Baixo-relevo de Mármore (espada)", + "block.mineralogy.marble_relief_vertical": "Baixo-relevo de Mármore (vertical)", + "block.mineralogy.slate_relief_axe": "Baixo-relevo de Ardósia (machado)", + "block.mineralogy.slate_relief_blank": "Baixo-relevo de Ardósia (sem motivo)", + "block.mineralogy.slate_relief_cross": "Baixo-relevo de Ardósia (cruz)", + "block.mineralogy.slate_relief_hammer": "Baixo-relevo de Ardósia (martelo)", + "block.mineralogy.slate_relief_hoe": "Baixo-relevo de Ardósia (enxada)", + "block.mineralogy.slate_relief_horizontal": "Baixo-relevo de Ardósia (horizontal)", + "block.mineralogy.slate_relief_i": "Baixo-relevo de Ardósia (I)", + "block.mineralogy.slate_relief_left": "Baixo-relevo de Ardósia (esquerda)", + "block.mineralogy.slate_relief_pickaxe": "Baixo-relevo de Ardósia (picareta)", + "block.mineralogy.slate_relief_plus": "Baixo-relevo de Ardósia (sinal de mais)", + "block.mineralogy.slate_relief_right": "Baixo-relevo de Ardósia (direita)", + "block.mineralogy.slate_relief_sword": "Baixo-relevo de Ardósia (espada)", + "block.mineralogy.slate_relief_vertical": "Baixo-relevo de Ardósia (vertical)", + "block.mineralogy.schist_relief_axe": "Baixo-relevo de Xisto (machado)", + "block.mineralogy.schist_relief_blank": "Baixo-relevo de Xisto (sem motivo)", + "block.mineralogy.schist_relief_cross": "Baixo-relevo de Xisto (cruz)", + "block.mineralogy.schist_relief_hammer": "Baixo-relevo de Xisto (martelo)", + "block.mineralogy.schist_relief_hoe": "Baixo-relevo de Xisto (enxada)", + "block.mineralogy.schist_relief_horizontal": "Baixo-relevo de Xisto (horizontal)", + "block.mineralogy.schist_relief_i": "Baixo-relevo de Xisto (I)", + "block.mineralogy.schist_relief_left": "Baixo-relevo de Xisto (esquerda)", + "block.mineralogy.schist_relief_pickaxe": "Baixo-relevo de Xisto (picareta)", + "block.mineralogy.schist_relief_plus": "Baixo-relevo de Xisto (sinal de mais)", + "block.mineralogy.schist_relief_right": "Baixo-relevo de Xisto (direita)", + "block.mineralogy.schist_relief_sword": "Baixo-relevo de Xisto (espada)", + "block.mineralogy.schist_relief_vertical": "Baixo-relevo de Xisto (vertical)", + "block.mineralogy.gneiss_relief_axe": "Baixo-relevo de Gnaisse (machado)", + "block.mineralogy.gneiss_relief_blank": "Baixo-relevo de Gnaisse (sem motivo)", + "block.mineralogy.gneiss_relief_cross": "Baixo-relevo de Gnaisse (cruz)", + "block.mineralogy.gneiss_relief_hammer": "Baixo-relevo de Gnaisse (martelo)", + "block.mineralogy.gneiss_relief_hoe": "Baixo-relevo de Gnaisse (enxada)", + "block.mineralogy.gneiss_relief_horizontal": "Baixo-relevo de Gnaisse (horizontal)", + "block.mineralogy.gneiss_relief_i": "Baixo-relevo de Gnaisse (I)", + "block.mineralogy.gneiss_relief_left": "Baixo-relevo de Gnaisse (esquerda)", + "block.mineralogy.gneiss_relief_pickaxe": "Baixo-relevo de Gnaisse (picareta)", + "block.mineralogy.gneiss_relief_plus": "Baixo-relevo de Gnaisse (sinal de mais)", + "block.mineralogy.gneiss_relief_right": "Baixo-relevo de Gnaisse (direita)", + "block.mineralogy.gneiss_relief_sword": "Baixo-relevo de Gnaisse (espada)", + "block.mineralogy.gneiss_relief_vertical": "Baixo-relevo de Gnaisse (vertical)", + "block.mineralogy.phyllite_relief_axe": "Baixo-relevo de Filito (machado)", + "block.mineralogy.phyllite_relief_blank": "Baixo-relevo de Filito (sem motivo)", + "block.mineralogy.phyllite_relief_cross": "Baixo-relevo de Filito (cruz)", + "block.mineralogy.phyllite_relief_hammer": "Baixo-relevo de Filito (martelo)", + "block.mineralogy.phyllite_relief_hoe": "Baixo-relevo de Filito (enxada)", + "block.mineralogy.phyllite_relief_horizontal": "Baixo-relevo de Filito (horizontal)", + "block.mineralogy.phyllite_relief_i": "Baixo-relevo de Filito (I)", + "block.mineralogy.phyllite_relief_left": "Baixo-relevo de Filito (esquerda)", + "block.mineralogy.phyllite_relief_pickaxe": "Baixo-relevo de Filito (picareta)", + "block.mineralogy.phyllite_relief_plus": "Baixo-relevo de Filito (sinal de mais)", + "block.mineralogy.phyllite_relief_right": "Baixo-relevo de Filito (direita)", + "block.mineralogy.phyllite_relief_sword": "Baixo-relevo de Filito (espada)", + "block.mineralogy.phyllite_relief_vertical": "Baixo-relevo de Filito (vertical)", + "block.mineralogy.amphibolite_relief_axe": "Baixo-relevo de Anfibolito (machado)", + "block.mineralogy.amphibolite_relief_blank": "Baixo-relevo de Anfibolito (sem motivo)", + "block.mineralogy.amphibolite_relief_cross": "Baixo-relevo de Anfibolito (cruz)", + "block.mineralogy.amphibolite_relief_hammer": "Baixo-relevo de Anfibolito (martelo)", + "block.mineralogy.amphibolite_relief_hoe": "Baixo-relevo de Anfibolito (enxada)", + "block.mineralogy.amphibolite_relief_horizontal": "Baixo-relevo de Anfibolito (horizontal)", + "block.mineralogy.amphibolite_relief_i": "Baixo-relevo de Anfibolito (I)", + "block.mineralogy.amphibolite_relief_left": "Baixo-relevo de Anfibolito (esquerda)", + "block.mineralogy.amphibolite_relief_pickaxe": "Baixo-relevo de Anfibolito (picareta)", + "block.mineralogy.amphibolite_relief_plus": "Baixo-relevo de Anfibolito (sinal de mais)", + "block.mineralogy.amphibolite_relief_right": "Baixo-relevo de Anfibolito (direita)", + "block.mineralogy.amphibolite_relief_sword": "Baixo-relevo de Anfibolito (espada)", + "block.mineralogy.amphibolite_relief_vertical": "Baixo-relevo de Anfibolito (vertical)", + "block.mineralogy.diabase_relief_axe": "Baixo-relevo de Diabásio (machado)", + "block.mineralogy.diabase_relief_blank": "Baixo-relevo de Diabásio (sem motivo)", + "block.mineralogy.diabase_relief_cross": "Baixo-relevo de Diabásio (cruz)", + "block.mineralogy.diabase_relief_hammer": "Baixo-relevo de Diabásio (martelo)", + "block.mineralogy.diabase_relief_hoe": "Baixo-relevo de Diabásio (enxada)", + "block.mineralogy.diabase_relief_horizontal": "Baixo-relevo de Diabásio (horizontal)", + "block.mineralogy.diabase_relief_i": "Baixo-relevo de Diabásio (I)", + "block.mineralogy.diabase_relief_left": "Baixo-relevo de Diabásio (esquerda)", + "block.mineralogy.diabase_relief_pickaxe": "Baixo-relevo de Diabásio (picareta)", + "block.mineralogy.diabase_relief_plus": "Baixo-relevo de Diabásio (sinal de mais)", + "block.mineralogy.diabase_relief_right": "Baixo-relevo de Diabásio (direita)", + "block.mineralogy.diabase_relief_sword": "Baixo-relevo de Diabásio (espada)", + "block.mineralogy.diabase_relief_vertical": "Baixo-relevo de Diabásio (vertical)", + "block.mineralogy.gabbro_relief_axe": "Baixo-relevo de Gabro (machado)", + "block.mineralogy.gabbro_relief_blank": "Baixo-relevo de Gabro (sem motivo)", + "block.mineralogy.gabbro_relief_cross": "Baixo-relevo de Gabro (cruz)", + "block.mineralogy.gabbro_relief_hammer": "Baixo-relevo de Gabro (martelo)", + "block.mineralogy.gabbro_relief_hoe": "Baixo-relevo de Gabro (enxada)", + "block.mineralogy.gabbro_relief_horizontal": "Baixo-relevo de Gabro (horizontal)", + "block.mineralogy.gabbro_relief_i": "Baixo-relevo de Gabro (I)", + "block.mineralogy.gabbro_relief_left": "Baixo-relevo de Gabro (esquerda)", + "block.mineralogy.gabbro_relief_pickaxe": "Baixo-relevo de Gabro (picareta)", + "block.mineralogy.gabbro_relief_plus": "Baixo-relevo de Gabro (sinal de mais)", + "block.mineralogy.gabbro_relief_right": "Baixo-relevo de Gabro (direita)", + "block.mineralogy.gabbro_relief_sword": "Baixo-relevo de Gabro (espada)", + "block.mineralogy.gabbro_relief_vertical": "Baixo-relevo de Gabro (vertical)", + "block.mineralogy.peridotite_relief_axe": "Baixo-relevo de Peridotito (machado)", + "block.mineralogy.peridotite_relief_blank": "Baixo-relevo de Peridotito (sem motivo)", + "block.mineralogy.peridotite_relief_cross": "Baixo-relevo de Peridotito (cruz)", + "block.mineralogy.peridotite_relief_hammer": "Baixo-relevo de Peridotito (martelo)", + "block.mineralogy.peridotite_relief_hoe": "Baixo-relevo de Peridotito (enxada)", + "block.mineralogy.peridotite_relief_horizontal": "Baixo-relevo de Peridotito (horizontal)", + "block.mineralogy.peridotite_relief_i": "Baixo-relevo de Peridotito (I)", + "block.mineralogy.peridotite_relief_left": "Baixo-relevo de Peridotito (esquerda)", + "block.mineralogy.peridotite_relief_pickaxe": "Baixo-relevo de Peridotito (picareta)", + "block.mineralogy.peridotite_relief_plus": "Baixo-relevo de Peridotito (sinal de mais)", + "block.mineralogy.peridotite_relief_right": "Baixo-relevo de Peridotito (direita)", + "block.mineralogy.peridotite_relief_sword": "Baixo-relevo de Peridotito (espada)", + "block.mineralogy.peridotite_relief_vertical": "Baixo-relevo de Peridotito (vertical)", + "block.mineralogy.basaltic_glass_relief_axe": "Baixo-relevo de Vidro basáltico (machado)", + "block.mineralogy.basaltic_glass_relief_blank": "Baixo-relevo de Vidro basáltico (sem motivo)", + "block.mineralogy.basaltic_glass_relief_cross": "Baixo-relevo de Vidro basáltico (cruz)", + "block.mineralogy.basaltic_glass_relief_hammer": "Baixo-relevo de Vidro basáltico (martelo)", + "block.mineralogy.basaltic_glass_relief_hoe": "Baixo-relevo de Vidro basáltico (enxada)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Baixo-relevo de Vidro basáltico (horizontal)", + "block.mineralogy.basaltic_glass_relief_i": "Baixo-relevo de Vidro basáltico (I)", + "block.mineralogy.basaltic_glass_relief_left": "Baixo-relevo de Vidro basáltico (esquerda)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Baixo-relevo de Vidro basáltico (picareta)", + "block.mineralogy.basaltic_glass_relief_plus": "Baixo-relevo de Vidro basáltico (sinal de mais)", + "block.mineralogy.basaltic_glass_relief_right": "Baixo-relevo de Vidro basáltico (direita)", + "block.mineralogy.basaltic_glass_relief_sword": "Baixo-relevo de Vidro basáltico (espada)", + "block.mineralogy.basaltic_glass_relief_vertical": "Baixo-relevo de Vidro basáltico (vertical)", + "block.mineralogy.scoria_relief_axe": "Baixo-relevo de Escória (machado)", + "block.mineralogy.scoria_relief_blank": "Baixo-relevo de Escória (sem motivo)", + "block.mineralogy.scoria_relief_cross": "Baixo-relevo de Escória (cruz)", + "block.mineralogy.scoria_relief_hammer": "Baixo-relevo de Escória (martelo)", + "block.mineralogy.scoria_relief_hoe": "Baixo-relevo de Escória (enxada)", + "block.mineralogy.scoria_relief_horizontal": "Baixo-relevo de Escória (horizontal)", + "block.mineralogy.scoria_relief_i": "Baixo-relevo de Escória (I)", + "block.mineralogy.scoria_relief_left": "Baixo-relevo de Escória (esquerda)", + "block.mineralogy.scoria_relief_pickaxe": "Baixo-relevo de Escória (picareta)", + "block.mineralogy.scoria_relief_plus": "Baixo-relevo de Escória (sinal de mais)", + "block.mineralogy.scoria_relief_right": "Baixo-relevo de Escória (direita)", + "block.mineralogy.scoria_relief_sword": "Baixo-relevo de Escória (espada)", + "block.mineralogy.scoria_relief_vertical": "Baixo-relevo de Escória (vertical)", + "block.mineralogy.tuff_relief_axe": "Baixo-relevo de Tufo (machado)", + "block.mineralogy.tuff_relief_blank": "Baixo-relevo de Tufo (sem motivo)", + "block.mineralogy.tuff_relief_cross": "Baixo-relevo de Tufo (cruz)", + "block.mineralogy.tuff_relief_hammer": "Baixo-relevo de Tufo (martelo)", + "block.mineralogy.tuff_relief_hoe": "Baixo-relevo de Tufo (enxada)", + "block.mineralogy.tuff_relief_horizontal": "Baixo-relevo de Tufo (horizontal)", + "block.mineralogy.tuff_relief_i": "Baixo-relevo de Tufo (I)", + "block.mineralogy.tuff_relief_left": "Baixo-relevo de Tufo (esquerda)", + "block.mineralogy.tuff_relief_pickaxe": "Baixo-relevo de Tufo (picareta)", + "block.mineralogy.tuff_relief_plus": "Baixo-relevo de Tufo (sinal de mais)", + "block.mineralogy.tuff_relief_right": "Baixo-relevo de Tufo (direita)", + "block.mineralogy.tuff_relief_sword": "Baixo-relevo de Tufo (espada)", + "block.mineralogy.tuff_relief_vertical": "Baixo-relevo de Tufo (vertical)", + "block.mineralogy.siltstone_relief_axe": "Baixo-relevo de Siltito (machado)", + "block.mineralogy.siltstone_relief_blank": "Baixo-relevo de Siltito (sem motivo)", + "block.mineralogy.siltstone_relief_cross": "Baixo-relevo de Siltito (cruz)", + "block.mineralogy.siltstone_relief_hammer": "Baixo-relevo de Siltito (martelo)", + "block.mineralogy.siltstone_relief_hoe": "Baixo-relevo de Siltito (enxada)", + "block.mineralogy.siltstone_relief_horizontal": "Baixo-relevo de Siltito (horizontal)", + "block.mineralogy.siltstone_relief_i": "Baixo-relevo de Siltito (I)", + "block.mineralogy.siltstone_relief_left": "Baixo-relevo de Siltito (esquerda)", + "block.mineralogy.siltstone_relief_pickaxe": "Baixo-relevo de Siltito (picareta)", + "block.mineralogy.siltstone_relief_plus": "Baixo-relevo de Siltito (sinal de mais)", + "block.mineralogy.siltstone_relief_right": "Baixo-relevo de Siltito (direita)", + "block.mineralogy.siltstone_relief_sword": "Baixo-relevo de Siltito (espada)", + "block.mineralogy.siltstone_relief_vertical": "Baixo-relevo de Siltito (vertical)", + "block.mineralogy.rock_salt_relief_axe": "Baixo-relevo de Sal-gema (machado)", + "block.mineralogy.rock_salt_relief_blank": "Baixo-relevo de Sal-gema (sem motivo)", + "block.mineralogy.rock_salt_relief_cross": "Baixo-relevo de Sal-gema (cruz)", + "block.mineralogy.rock_salt_relief_hammer": "Baixo-relevo de Sal-gema (martelo)", + "block.mineralogy.rock_salt_relief_hoe": "Baixo-relevo de Sal-gema (enxada)", + "block.mineralogy.rock_salt_relief_horizontal": "Baixo-relevo de Sal-gema (horizontal)", + "block.mineralogy.rock_salt_relief_i": "Baixo-relevo de Sal-gema (I)", + "block.mineralogy.rock_salt_relief_left": "Baixo-relevo de Sal-gema (esquerda)", + "block.mineralogy.rock_salt_relief_pickaxe": "Baixo-relevo de Sal-gema (picareta)", + "block.mineralogy.rock_salt_relief_plus": "Baixo-relevo de Sal-gema (sinal de mais)", + "block.mineralogy.rock_salt_relief_right": "Baixo-relevo de Sal-gema (direita)", + "block.mineralogy.rock_salt_relief_sword": "Baixo-relevo de Sal-gema (espada)", + "block.mineralogy.rock_salt_relief_vertical": "Baixo-relevo de Sal-gema (vertical)", + "block.mineralogy.hornfels_relief_axe": "Baixo-relevo de Cornubianito (machado)", + "block.mineralogy.hornfels_relief_blank": "Baixo-relevo de Cornubianito (sem motivo)", + "block.mineralogy.hornfels_relief_cross": "Baixo-relevo de Cornubianito (cruz)", + "block.mineralogy.hornfels_relief_hammer": "Baixo-relevo de Cornubianito (martelo)", + "block.mineralogy.hornfels_relief_hoe": "Baixo-relevo de Cornubianito (enxada)", + "block.mineralogy.hornfels_relief_horizontal": "Baixo-relevo de Cornubianito (horizontal)", + "block.mineralogy.hornfels_relief_i": "Baixo-relevo de Cornubianito (I)", + "block.mineralogy.hornfels_relief_left": "Baixo-relevo de Cornubianito (esquerda)", + "block.mineralogy.hornfels_relief_pickaxe": "Baixo-relevo de Cornubianito (picareta)", + "block.mineralogy.hornfels_relief_plus": "Baixo-relevo de Cornubianito (sinal de mais)", + "block.mineralogy.hornfels_relief_right": "Baixo-relevo de Cornubianito (direita)", + "block.mineralogy.hornfels_relief_sword": "Baixo-relevo de Cornubianito (espada)", + "block.mineralogy.hornfels_relief_vertical": "Baixo-relevo de Cornubianito (vertical)", + "block.mineralogy.quartzite_relief_axe": "Baixo-relevo de Quartzito (machado)", + "block.mineralogy.quartzite_relief_blank": "Baixo-relevo de Quartzito (sem motivo)", + "block.mineralogy.quartzite_relief_cross": "Baixo-relevo de Quartzito (cruz)", + "block.mineralogy.quartzite_relief_hammer": "Baixo-relevo de Quartzito (martelo)", + "block.mineralogy.quartzite_relief_hoe": "Baixo-relevo de Quartzito (enxada)", + "block.mineralogy.quartzite_relief_horizontal": "Baixo-relevo de Quartzito (horizontal)", + "block.mineralogy.quartzite_relief_i": "Baixo-relevo de Quartzito (I)", + "block.mineralogy.quartzite_relief_left": "Baixo-relevo de Quartzito (esquerda)", + "block.mineralogy.quartzite_relief_pickaxe": "Baixo-relevo de Quartzito (picareta)", + "block.mineralogy.quartzite_relief_plus": "Baixo-relevo de Quartzito (sinal de mais)", + "block.mineralogy.quartzite_relief_right": "Baixo-relevo de Quartzito (direita)", + "block.mineralogy.quartzite_relief_sword": "Baixo-relevo de Quartzito (espada)", + "block.mineralogy.quartzite_relief_vertical": "Baixo-relevo de Quartzito (vertical)", + "block.mineralogy.novaculite_relief_axe": "Baixo-relevo de Novaculita (machado)", + "block.mineralogy.novaculite_relief_blank": "Baixo-relevo de Novaculita (sem motivo)", + "block.mineralogy.novaculite_relief_cross": "Baixo-relevo de Novaculita (cruz)", + "block.mineralogy.novaculite_relief_hammer": "Baixo-relevo de Novaculita (martelo)", + "block.mineralogy.novaculite_relief_hoe": "Baixo-relevo de Novaculita (enxada)", + "block.mineralogy.novaculite_relief_horizontal": "Baixo-relevo de Novaculita (horizontal)", + "block.mineralogy.novaculite_relief_i": "Baixo-relevo de Novaculita (I)", + "block.mineralogy.novaculite_relief_left": "Baixo-relevo de Novaculita (esquerda)", + "block.mineralogy.novaculite_relief_pickaxe": "Baixo-relevo de Novaculita (picareta)", + "block.mineralogy.novaculite_relief_plus": "Baixo-relevo de Novaculita (sinal de mais)", + "block.mineralogy.novaculite_relief_right": "Baixo-relevo de Novaculita (direita)", + "block.mineralogy.novaculite_relief_sword": "Baixo-relevo de Novaculita (espada)", + "block.mineralogy.novaculite_relief_vertical": "Baixo-relevo de Novaculita (vertical)", + "itemGroup.mineralogy.mineralogy": "Mineralogia", + "itemGroup.mineralogy.rock": "Rochas da Mineralogia", + "itemGroup.mineralogy.stair": "Escadas da Mineralogia", + "itemGroup.mineralogy.slab": "Lajes da Mineralogia", + "itemGroup.mineralogy.wall": "Muros da Mineralogia", + "itemGroup.mineralogy.item": "Itens da Mineralogia", + "block.mineralogy.crude_oil": "Petróleo bruto", + "item.mineralogy.crude_oil_bucket": "Balde de petróleo bruto", + "fluid.mineralogy.crude_oil": "Petróleo bruto", + "advancements.mineralogy.all_the_rocks.title": "Todas as rochas", + "advancements.mineralogy.all_the_rocks.description": "Você encontrou todos os tipos de rocha padrão do Mineralogy!" +} diff --git a/src/main/resources/assets/mineralogy/lang/ru_ru.json b/src/main/resources/assets/mineralogy/lang/ru_ru.json new file mode 100644 index 000000000..134ac56f5 --- /dev/null +++ b/src/main/resources/assets/mineralogy/lang/ru_ru.json @@ -0,0 +1,940 @@ +{ + "block.mineralogy.andesite": "Ðндезит", + "block.mineralogy.andesite_stairs": "Ступеньки: Ðндезит", + "block.mineralogy.andesite_slab": "Плита: Ðндезит", + "block.mineralogy.andesite_brick": "Кирпичи: Ðндезит", + "block.mineralogy.andesite_brick_stairs": "Кирпичные Ñтупеньки: Ðндезит", + "block.mineralogy.andesite_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Ðндезит", + "block.mineralogy.andesite_smooth": "Полированный блок: Ðндезит", + "block.mineralogy.andesite_smooth_stairs": "Полированные Ñтупеньки: Ðндезит", + "block.mineralogy.andesite_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Ðндезит", + "block.mineralogy.andesite_smooth_brick": "Полированные кирпичи: Ðндезит", + "block.mineralogy.andesite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Ðндезит", + "block.mineralogy.andesite_smooth_brick_slab": "Плита из полированного кирпича: Ðндезит", + "block.mineralogy.basalt": "Базальт", + "block.mineralogy.basalt_stairs": "Ступеньки: Базальт", + "block.mineralogy.basalt_slab": "Плита: Базальт", + "block.mineralogy.basalt_brick": "Кирпичи: Базальт", + "block.mineralogy.basalt_brick_stairs": "Кирпичные Ñтупеньки: Базальт", + "block.mineralogy.basalt_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Базальт", + "block.mineralogy.basalt_smooth": "Полированный блок: Базальт", + "block.mineralogy.basalt_smooth_stairs": "Полированные Ñтупеньки: Базальт", + "block.mineralogy.basalt_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Базальт", + "block.mineralogy.basalt_smooth_brick": "Полированные кирпичи: Базальт", + "block.mineralogy.basalt_smooth_brick_stairs": "Ступеньки из полированного кирпича: Базальт", + "block.mineralogy.basalt_smooth_brick_slab": "Плита из полированного кирпича: Базальт", + "block.mineralogy.diorite": "Диорит", + "block.mineralogy.diorite_stairs": "Ступеньки: Диорит", + "block.mineralogy.diorite_slab": "Плита: Диорит", + "block.mineralogy.diorite_brick": "Кирпичи: Диорит", + "block.mineralogy.diorite_brick_stairs": "Кирпичные Ñтупеньки: Диорит", + "block.mineralogy.diorite_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Диорит", + "block.mineralogy.diorite_smooth": "Полированный блок: Диорит", + "block.mineralogy.diorite_smooth_stairs": "Полированные Ñтупеньки: Диорит", + "block.mineralogy.diorite_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Диорит", + "block.mineralogy.diorite_smooth_brick": "Полированные кирпичи: Диорит", + "block.mineralogy.diorite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Диорит", + "block.mineralogy.diorite_smooth_brick_slab": "Плита из полированного кирпича: Диорит", + "block.mineralogy.granite": "Гранит", + "block.mineralogy.granite_stairs": "Ступеньки: Гранит", + "block.mineralogy.granite_slab": "Плита: Гранит", + "block.mineralogy.granite_brick": "Кирпичи: Гранит", + "block.mineralogy.granite_brick_stairs": "Кирпичные Ñтупеньки: Гранит", + "block.mineralogy.granite_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Гранит", + "block.mineralogy.granite_smooth": "Полированный блок: Гранит", + "block.mineralogy.granite_smooth_stairs": "Полированные Ñтупеньки: Гранит", + "block.mineralogy.granite_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Гранит", + "block.mineralogy.granite_smooth_brick": "Полированные кирпичи: Гранит", + "block.mineralogy.granite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Гранит", + "block.mineralogy.granite_smooth_brick_slab": "Плита из полированного кирпича: Гранит", + "block.mineralogy.rhyolite": "Риолит", + "block.mineralogy.rhyolite_stairs": "Ступеньки: Риолит", + "block.mineralogy.rhyolite_slab": "Плита: Риолит", + "block.mineralogy.rhyolite_brick": "Кирпичи: Риолит", + "block.mineralogy.rhyolite_brick_stairs": "Кирпичные Ñтупеньки: Риолит", + "block.mineralogy.rhyolite_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Риолит", + "block.mineralogy.rhyolite_smooth": "Полированный блок: Риолит", + "block.mineralogy.rhyolite_smooth_stairs": "Полированные Ñтупеньки: Риолит", + "block.mineralogy.rhyolite_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Риолит", + "block.mineralogy.rhyolite_smooth_brick": "Полированные кирпичи: Риолит", + "block.mineralogy.rhyolite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Риолит", + "block.mineralogy.rhyolite_smooth_brick_slab": "Плита из полированного кирпича: Риолит", + "block.mineralogy.pegmatite": "Пегматит", + "block.mineralogy.pegmatite_stairs": "Ступеньки: Пегматит", + "block.mineralogy.pegmatite_slab": "Плита: Пегматит", + "block.mineralogy.pegmatite_brick": "Кирпичи: Пегматит", + "block.mineralogy.pegmatite_brick_stairs": "Кирпичные Ñтупеньки: Пегматит", + "block.mineralogy.pegmatite_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Пегматит", + "block.mineralogy.pegmatite_smooth": "Полированный блок: Пегматит", + "block.mineralogy.pegmatite_smooth_stairs": "Полированные Ñтупеньки: Пегматит", + "block.mineralogy.pegmatite_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Пегматит", + "block.mineralogy.pegmatite_smooth_brick": "Полированные кирпичи: Пегматит", + "block.mineralogy.pegmatite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Пегматит", + "block.mineralogy.pegmatite_smooth_brick_slab": "Плита из полированного кирпича: Пегматит", + "block.mineralogy.shale": "ГлиниÑтый Ñланец", + "block.mineralogy.shale_stairs": "Ступеньки: ГлиниÑтый Ñланец", + "block.mineralogy.shale_slab": "Плита: ГлиниÑтый Ñланец", + "block.mineralogy.shale_brick": "Кирпичи: ГлиниÑтый Ñланец", + "block.mineralogy.shale_brick_stairs": "Кирпичные Ñтупеньки: ГлиниÑтый Ñланец", + "block.mineralogy.shale_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: ГлиниÑтый Ñланец", + "block.mineralogy.shale_smooth": "Полированный блок: ГлиниÑтый Ñланец", + "block.mineralogy.shale_smooth_stairs": "Полированные Ñтупеньки: ГлиниÑтый Ñланец", + "block.mineralogy.shale_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: ГлиниÑтый Ñланец", + "block.mineralogy.shale_smooth_brick": "Полированные кирпичи: ГлиниÑтый Ñланец", + "block.mineralogy.shale_smooth_brick_stairs": "Ступеньки из полированного кирпича: ГлиниÑтый Ñланец", + "block.mineralogy.shale_smooth_brick_slab": "Плита из полированного кирпича: ГлиниÑтый Ñланец", + "block.mineralogy.conglomerate": "Конгломерат", + "block.mineralogy.conglomerate_stairs": "Ступеньки: Конгломерат", + "block.mineralogy.conglomerate_slab": "Плита: Конгломерат", + "block.mineralogy.conglomerate_brick": "Кирпичи: Конгломерат", + "block.mineralogy.conglomerate_brick_stairs": "Кирпичные Ñтупеньки: Конгломерат", + "block.mineralogy.conglomerate_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Конгломерат", + "block.mineralogy.conglomerate_smooth": "Полированный блок: Конгломерат", + "block.mineralogy.conglomerate_smooth_stairs": "Полированные Ñтупеньки: Конгломерат", + "block.mineralogy.conglomerate_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Конгломерат", + "block.mineralogy.conglomerate_smooth_brick": "Полированные кирпичи: Конгломерат", + "block.mineralogy.conglomerate_smooth_brick_stairs": "Ступеньки из полированного кирпича: Конгломерат", + "block.mineralogy.conglomerate_smooth_brick_slab": "Плита из полированного кирпича: Конгломерат", + "block.mineralogy.dolomite": "Доломит", + "block.mineralogy.dolomite_stairs": "Ступеньки: Доломит", + "block.mineralogy.dolomite_slab": "Плита: Доломит", + "block.mineralogy.dolomite_brick": "Кирпичи: Доломит", + "block.mineralogy.dolomite_brick_stairs": "Кирпичные Ñтупеньки: Доломит", + "block.mineralogy.dolomite_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Доломит", + "block.mineralogy.dolomite_smooth": "Полированный блок: Доломит", + "block.mineralogy.dolomite_smooth_stairs": "Полированные Ñтупеньки: Доломит", + "block.mineralogy.dolomite_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Доломит", + "block.mineralogy.dolomite_smooth_brick": "Полированные кирпичи: Доломит", + "block.mineralogy.dolomite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Доломит", + "block.mineralogy.dolomite_smooth_brick_slab": "Плита из полированного кирпича: Доломит", + "block.mineralogy.limestone": "ИзвеÑтнÑк", + "block.mineralogy.limestone_stairs": "Ступеньки: ИзвеÑтнÑк", + "block.mineralogy.limestone_slab": "Плита: ИзвеÑтнÑк", + "block.mineralogy.limestone_brick": "Кирпичи: ИзвеÑтнÑк", + "block.mineralogy.limestone_brick_stairs": "Кирпичные Ñтупеньки: ИзвеÑтнÑк", + "block.mineralogy.limestone_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: ИзвеÑтнÑк", + "block.mineralogy.limestone_smooth": "Полированный блок: ИзвеÑтнÑк", + "block.mineralogy.limestone_smooth_stairs": "Полированные Ñтупеньки: ИзвеÑтнÑк", + "block.mineralogy.limestone_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: ИзвеÑтнÑк", + "block.mineralogy.limestone_smooth_brick": "Полированные кирпичи: ИзвеÑтнÑк", + "block.mineralogy.limestone_smooth_brick_stairs": "Ступеньки из полированного кирпича: ИзвеÑтнÑк", + "block.mineralogy.limestone_smooth_brick_slab": "Плита из полированного кирпича: ИзвеÑтнÑк", + "block.mineralogy.slate": "ÐÑпидный Ñланец", + "block.mineralogy.slate_stairs": "Ступеньки: ÐÑпидный Ñланец", + "block.mineralogy.slate_slab": "Плита: ÐÑпидный Ñланец", + "block.mineralogy.slate_brick": "Кирпичи: ÐÑпидный Ñланец", + "block.mineralogy.slate_brick_stairs": "Кирпичные Ñтупеньки: ÐÑпидный Ñланец", + "block.mineralogy.slate_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: ÐÑпидный Ñланец", + "block.mineralogy.slate_smooth": "Полированный блок: ÐÑпидный Ñланец", + "block.mineralogy.slate_smooth_stairs": "Полированные Ñтупеньки: ÐÑпидный Ñланец", + "block.mineralogy.slate_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: ÐÑпидный Ñланец", + "block.mineralogy.slate_smooth_brick": "Полированные кирпичи: ÐÑпидный Ñланец", + "block.mineralogy.slate_smooth_brick_stairs": "Ступеньки из полированного кирпича: ÐÑпидный Ñланец", + "block.mineralogy.slate_smooth_brick_slab": "Плита из полированного кирпича: ÐÑпидный Ñланец", + "block.mineralogy.schist": "КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_stairs": "Ступеньки: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_slab": "Плита: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_brick": "Кирпичи: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_brick_stairs": "Кирпичные Ñтупеньки: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_smooth": "Полированный блок: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_smooth_stairs": "Полированные Ñтупеньки: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_smooth_brick": "Полированные кирпичи: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_smooth_brick_stairs": "Ступеньки из полированного кирпича: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_smooth_brick_slab": "Плита из полированного кирпича: КриÑталличеÑкий Ñланец", + "block.mineralogy.gneiss": "ГнейÑ", + "block.mineralogy.gneiss_stairs": "Ступеньки: ГнейÑ", + "block.mineralogy.gneiss_slab": "Плита: ГнейÑ", + "block.mineralogy.gneiss_brick": "Кирпичи: ГнейÑ", + "block.mineralogy.gneiss_brick_stairs": "Кирпичные Ñтупеньки: ГнейÑ", + "block.mineralogy.gneiss_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: ГнейÑ", + "block.mineralogy.gneiss_smooth": "Полированный блок: ГнейÑ", + "block.mineralogy.gneiss_smooth_stairs": "Полированные Ñтупеньки: ГнейÑ", + "block.mineralogy.gneiss_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: ГнейÑ", + "block.mineralogy.gneiss_smooth_brick": "Полированные кирпичи: ГнейÑ", + "block.mineralogy.gneiss_smooth_brick_stairs": "Ступеньки из полированного кирпича: ГнейÑ", + "block.mineralogy.gneiss_smooth_brick_slab": "Плита из полированного кирпича: ГнейÑ", + "block.mineralogy.marble": "Мрамор", + "block.mineralogy.marble_stairs": "Ступеньки: Мрамор", + "block.mineralogy.marble_slab": "Плита: Мрамор", + "block.mineralogy.marble_brick": "Кирпичи: Мрамор", + "block.mineralogy.marble_brick_stairs": "Кирпичные Ñтупеньки: Мрамор", + "block.mineralogy.marble_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Мрамор", + "block.mineralogy.marble_smooth": "Полированный блок: Мрамор", + "block.mineralogy.marble_smooth_stairs": "Полированные Ñтупеньки: Мрамор", + "block.mineralogy.marble_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Мрамор", + "block.mineralogy.marble_smooth_brick": "Полированные кирпичи: Мрамор", + "block.mineralogy.marble_smooth_brick_stairs": "Ступеньки из полированного кирпича: Мрамор", + "block.mineralogy.marble_smooth_brick_slab": "Плита из полированного кирпича: Мрамор", + "block.mineralogy.phyllite": "Филлит", + "block.mineralogy.phyllite_stairs": "Ступеньки: Филлит", + "block.mineralogy.phyllite_slab": "Плита: Филлит", + "block.mineralogy.phyllite_brick": "Кирпичи: Филлит", + "block.mineralogy.phyllite_brick_stairs": "Кирпичные Ñтупеньки: Филлит", + "block.mineralogy.phyllite_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Филлит", + "block.mineralogy.phyllite_smooth": "Полированный блок: Филлит", + "block.mineralogy.phyllite_smooth_stairs": "Полированные Ñтупеньки: Филлит", + "block.mineralogy.phyllite_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Филлит", + "block.mineralogy.phyllite_smooth_brick": "Полированные кирпичи: Филлит", + "block.mineralogy.phyllite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Филлит", + "block.mineralogy.phyllite_smooth_brick_slab": "Плита из полированного кирпича: Филлит", + "block.mineralogy.amphibolite": "Ðмфиболит", + "block.mineralogy.amphibolite_stairs": "Ступеньки: Ðмфиболит", + "block.mineralogy.amphibolite_slab": "Плита: Ðмфиболит", + "block.mineralogy.amphibolite_brick": "Кирпичи: Ðмфиболит", + "block.mineralogy.amphibolite_brick_stairs": "Кирпичные Ñтупеньки: Ðмфиболит", + "block.mineralogy.amphibolite_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Ðмфиболит", + "block.mineralogy.amphibolite_smooth": "Полированный блок: Ðмфиболит", + "block.mineralogy.amphibolite_smooth_stairs": "Полированные Ñтупеньки: Ðмфиболит", + "block.mineralogy.amphibolite_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Ðмфиболит", + "block.mineralogy.amphibolite_smooth_brick": "Полированные кирпичи: Ðмфиболит", + "block.mineralogy.amphibolite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Ðмфиболит", + "block.mineralogy.amphibolite_smooth_brick_slab": "Плита из полированного кирпича: Ðмфиболит", + "item.mineralogy.gypsum_dust": "ГипÑовый порошок", + "item.mineralogy.sulfur_dust": "Серный порошок", + "item.mineralogy.phosphorous_dust": "ФоÑфорный порошок", + "item.mineralogy.nitrate_dust": "Ðитратный порошок", + "item.mineralogy.mineral_fertilizer": "Минеральное удобрение", + "block.mineralogy.chert": "Кремень", + "block.mineralogy.gypsum": "ГипÑ", + "block.mineralogy.pumice": "Пемза", + "block.mineralogy.sulfur_block": "Сера", + "block.mineralogy.sulfur_ore": "Ð¡ÐµÑ€Ð½Ð°Ñ Ñ€ÑƒÐ´Ð°", + "block.mineralogy.phosphorous_block": "ФоÑфор", + "block.mineralogy.phosphorous_ore": "ФоÑÑ„Ð¾Ñ€Ð½Ð°Ñ Ñ€ÑƒÐ´Ð°", + "block.mineralogy.nitrate_block": "Ðитрат", + "block.mineralogy.nitrate_ore": "ÐÐ¸Ñ‚Ñ€Ð°Ñ‚Ð½Ð°Ñ Ñ€ÑƒÐ´Ð°", + "block.mineralogy.drywall_black": "ГипÑокартон (чёрный)", + "block.mineralogy.drywall_red": "ГипÑокартон (краÑный)", + "block.mineralogy.drywall_green": "ГипÑокартон (зелёный)", + "block.mineralogy.drywall_brown": "ГипÑокартон (коричневый)", + "block.mineralogy.drywall_blue": "ГипÑокартон (Ñиний)", + "block.mineralogy.drywall_purple": "ГипÑокартон (фиолетовый)", + "block.mineralogy.drywall_cyan": "ГипÑокартон (бирюзовый)", + "block.mineralogy.drywall_silver": "ГипÑокартон (Ñветло-Ñерый)", + "block.mineralogy.drywall_gray": "ГипÑокартон (Ñерый)", + "block.mineralogy.drywall_pink": "ГипÑокартон (розовый)", + "block.mineralogy.drywall_lime": "ГипÑокартон (лаймовый)", + "block.mineralogy.drywall_yellow": "ГипÑокартон (жёлтый)", + "block.mineralogy.drywall_light_blue": "ГипÑокартон (голубой)", + "block.mineralogy.drywall_magenta": "ГипÑокартон (пурпурный)", + "block.mineralogy.drywall_orange": "ГипÑокартон (оранжевый)", + "block.mineralogy.drywall_white": "ГипÑокартон (белый)", + "block.mineralogy.andesite_wall": "Ограда: Ðндезит", + "block.mineralogy.andesite_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Ðндезит", + "block.mineralogy.andesite_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Ðндезит", + "block.mineralogy.andesite_smooth_brick_wall": "Ограда из полированного кирпича: Ðндезит", + "block.mineralogy.basalt_wall": "Ограда: Базальт", + "block.mineralogy.basalt_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Базальт", + "block.mineralogy.basalt_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Базальт", + "block.mineralogy.basalt_smooth_brick_wall": "Ограда из полированного кирпича: Базальт", + "block.mineralogy.diorite_wall": "Ограда: Диорит", + "block.mineralogy.diorite_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Диорит", + "block.mineralogy.diorite_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Диорит", + "block.mineralogy.diorite_smooth_brick_wall": "Ограда из полированного кирпича: Диорит", + "block.mineralogy.granite_wall": "Ограда: Гранит", + "block.mineralogy.granite_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Гранит", + "block.mineralogy.granite_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Гранит", + "block.mineralogy.granite_smooth_brick_wall": "Ограда из полированного кирпича: Гранит", + "block.mineralogy.rhyolite_wall": "Ограда: Риолит", + "block.mineralogy.rhyolite_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Риолит", + "block.mineralogy.rhyolite_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Риолит", + "block.mineralogy.rhyolite_smooth_brick_wall": "Ограда из полированного кирпича: Риолит", + "block.mineralogy.pegmatite_wall": "Ограда: Пегматит", + "block.mineralogy.pegmatite_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Пегматит", + "block.mineralogy.pegmatite_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Пегматит", + "block.mineralogy.pegmatite_smooth_brick_wall": "Ограда из полированного кирпича: Пегматит", + "block.mineralogy.shale_wall": "Ограда: ГлиниÑтый Ñланец", + "block.mineralogy.shale_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: ГлиниÑтый Ñланец", + "block.mineralogy.shale_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: ГлиниÑтый Ñланец", + "block.mineralogy.shale_smooth_brick_wall": "Ограда из полированного кирпича: ГлиниÑтый Ñланец", + "block.mineralogy.conglomerate_wall": "Ограда: Конгломерат", + "block.mineralogy.conglomerate_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Конгломерат", + "block.mineralogy.conglomerate_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Конгломерат", + "block.mineralogy.conglomerate_smooth_brick_wall": "Ограда из полированного кирпича: Конгломерат", + "block.mineralogy.dolomite_wall": "Ограда: Доломит", + "block.mineralogy.dolomite_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Доломит", + "block.mineralogy.dolomite_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Доломит", + "block.mineralogy.dolomite_smooth_brick_wall": "Ограда из полированного кирпича: Доломит", + "block.mineralogy.limestone_wall": "Ограда: ИзвеÑтнÑк", + "block.mineralogy.limestone_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: ИзвеÑтнÑк", + "block.mineralogy.limestone_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: ИзвеÑтнÑк", + "block.mineralogy.limestone_smooth_brick_wall": "Ограда из полированного кирпича: ИзвеÑтнÑк", + "block.mineralogy.marble_wall": "Ограда: Мрамор", + "block.mineralogy.marble_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Мрамор", + "block.mineralogy.marble_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Мрамор", + "block.mineralogy.marble_smooth_brick_wall": "Ограда из полированного кирпича: Мрамор", + "block.mineralogy.slate_wall": "Ограда: ÐÑпидный Ñланец", + "block.mineralogy.slate_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: ÐÑпидный Ñланец", + "block.mineralogy.slate_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: ÐÑпидный Ñланец", + "block.mineralogy.slate_smooth_brick_wall": "Ограда из полированного кирпича: ÐÑпидный Ñланец", + "block.mineralogy.schist_wall": "Ограда: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_smooth_brick_wall": "Ограда из полированного кирпича: КриÑталличеÑкий Ñланец", + "block.mineralogy.gneiss_wall": "Ограда: ГнейÑ", + "block.mineralogy.gneiss_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: ГнейÑ", + "block.mineralogy.gneiss_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: ГнейÑ", + "block.mineralogy.gneiss_smooth_brick_wall": "Ограда из полированного кирпича: ГнейÑ", + "block.mineralogy.phyllite_wall": "Ограда: Филлит", + "block.mineralogy.phyllite_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Филлит", + "block.mineralogy.phyllite_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Филлит", + "block.mineralogy.phyllite_smooth_brick_wall": "Ограда из полированного кирпича: Филлит", + "block.mineralogy.amphibolite_wall": "Ограда: Ðмфиболит", + "block.mineralogy.amphibolite_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Ðмфиболит", + "block.mineralogy.amphibolite_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Ðмфиболит", + "block.mineralogy.amphibolite_smooth_brick_wall": "Ограда из полированного кирпича: Ðмфиболит", + "block.mineralogy.andesite_furnace": "Печь: Ðндезит", + "block.mineralogy.andesite_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Ðндезит", + "block.mineralogy.andesite_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Ðндезит", + "block.mineralogy.andesite_smooth_brick_furnace": "Печь из полированного кирпича: Ðндезит", + "block.mineralogy.basalt_furnace": "Печь: Базальт", + "block.mineralogy.basalt_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Базальт", + "block.mineralogy.basalt_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Базальт", + "block.mineralogy.basalt_smooth_brick_furnace": "Печь из полированного кирпича: Базальт", + "block.mineralogy.diorite_furnace": "Печь: Диорит", + "block.mineralogy.diorite_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Диорит", + "block.mineralogy.diorite_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Диорит", + "block.mineralogy.diorite_smooth_brick_furnace": "Печь из полированного кирпича: Диорит", + "block.mineralogy.granite_furnace": "Печь: Гранит", + "block.mineralogy.granite_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Гранит", + "block.mineralogy.granite_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Гранит", + "block.mineralogy.granite_smooth_brick_furnace": "Печь из полированного кирпича: Гранит", + "block.mineralogy.rhyolite_furnace": "Печь: Риолит", + "block.mineralogy.rhyolite_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Риолит", + "block.mineralogy.rhyolite_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Риолит", + "block.mineralogy.rhyolite_smooth_brick_furnace": "Печь из полированного кирпича: Риолит", + "block.mineralogy.pegmatite_furnace": "Печь: Пегматит", + "block.mineralogy.pegmatite_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Пегматит", + "block.mineralogy.pegmatite_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Пегматит", + "block.mineralogy.pegmatite_smooth_brick_furnace": "Печь из полированного кирпича: Пегматит", + "block.mineralogy.shale_furnace": "Печь: ГлиниÑтый Ñланец", + "block.mineralogy.shale_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: ГлиниÑтый Ñланец", + "block.mineralogy.shale_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: ГлиниÑтый Ñланец", + "block.mineralogy.shale_smooth_brick_furnace": "Печь из полированного кирпича: ГлиниÑтый Ñланец", + "block.mineralogy.conglomerate_furnace": "Печь: Конгломерат", + "block.mineralogy.conglomerate_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Конгломерат", + "block.mineralogy.conglomerate_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Конгломерат", + "block.mineralogy.conglomerate_smooth_brick_furnace": "Печь из полированного кирпича: Конгломерат", + "block.mineralogy.dolomite_furnace": "Печь: Доломит", + "block.mineralogy.dolomite_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Доломит", + "block.mineralogy.dolomite_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Доломит", + "block.mineralogy.dolomite_smooth_brick_furnace": "Печь из полированного кирпича: Доломит", + "block.mineralogy.limestone_furnace": "Печь: ИзвеÑтнÑк", + "block.mineralogy.limestone_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: ИзвеÑтнÑк", + "block.mineralogy.limestone_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: ИзвеÑтнÑк", + "block.mineralogy.limestone_smooth_brick_furnace": "Печь из полированного кирпича: ИзвеÑтнÑк", + "block.mineralogy.marble_furnace": "Печь: Мрамор", + "block.mineralogy.marble_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Мрамор", + "block.mineralogy.marble_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Мрамор", + "block.mineralogy.marble_smooth_brick_furnace": "Печь из полированного кирпича: Мрамор", + "block.mineralogy.slate_furnace": "Печь: ÐÑпидный Ñланец", + "block.mineralogy.slate_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: ÐÑпидный Ñланец", + "block.mineralogy.slate_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: ÐÑпидный Ñланец", + "block.mineralogy.slate_smooth_brick_furnace": "Печь из полированного кирпича: ÐÑпидный Ñланец", + "block.mineralogy.schist_furnace": "Печь: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: КриÑталличеÑкий Ñланец", + "block.mineralogy.schist_smooth_brick_furnace": "Печь из полированного кирпича: КриÑталличеÑкий Ñланец", + "block.mineralogy.gneiss_furnace": "Печь: ГнейÑ", + "block.mineralogy.gneiss_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: ГнейÑ", + "block.mineralogy.gneiss_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: ГнейÑ", + "block.mineralogy.gneiss_smooth_brick_furnace": "Печь из полированного кирпича: ГнейÑ", + "block.mineralogy.phyllite_furnace": "Печь: Филлит", + "block.mineralogy.phyllite_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Филлит", + "block.mineralogy.phyllite_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Филлит", + "block.mineralogy.phyllite_smooth_brick_furnace": "Печь из полированного кирпича: Филлит", + "block.mineralogy.amphibolite_furnace": "Печь: Ðмфиболит", + "block.mineralogy.amphibolite_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Ðмфиболит", + "block.mineralogy.amphibolite_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Ðмфиболит", + "block.mineralogy.amphibolite_smooth_brick_furnace": "Печь из полированного кирпича: Ðмфиболит", + "block.mineralogy.diabase": "Диабаз", + "block.mineralogy.diabase_stairs": "Ступеньки: Диабаз", + "block.mineralogy.diabase_slab": "Плита: Диабаз", + "block.mineralogy.diabase_brick": "Кирпичи: Диабаз", + "block.mineralogy.diabase_brick_stairs": "Кирпичные Ñтупеньки: Диабаз", + "block.mineralogy.diabase_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Диабаз", + "block.mineralogy.diabase_smooth": "Полированный блок: Диабаз", + "block.mineralogy.diabase_smooth_stairs": "Полированные Ñтупеньки: Диабаз", + "block.mineralogy.diabase_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Диабаз", + "block.mineralogy.diabase_smooth_brick": "Полированные кирпичи: Диабаз", + "block.mineralogy.diabase_smooth_brick_stairs": "Ступеньки из полированного кирпича: Диабаз", + "block.mineralogy.diabase_smooth_brick_slab": "Плита из полированного кирпича: Диабаз", + "block.mineralogy.diabase_wall": "Ограда: Диабаз", + "block.mineralogy.diabase_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Диабаз", + "block.mineralogy.diabase_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Диабаз", + "block.mineralogy.diabase_smooth_brick_wall": "Ограда из полированного кирпича: Диабаз", + "block.mineralogy.diabase_furnace": "Печь: Диабаз", + "block.mineralogy.diabase_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Диабаз", + "block.mineralogy.diabase_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Диабаз", + "block.mineralogy.diabase_smooth_brick_furnace": "Печь из полированного кирпича: Диабаз", + "block.mineralogy.gabbro": "Габбро", + "block.mineralogy.gabbro_stairs": "Ступеньки: Габбро", + "block.mineralogy.gabbro_slab": "Плита: Габбро", + "block.mineralogy.gabbro_brick": "Кирпичи: Габбро", + "block.mineralogy.gabbro_brick_stairs": "Кирпичные Ñтупеньки: Габбро", + "block.mineralogy.gabbro_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Габбро", + "block.mineralogy.gabbro_smooth": "Полированный блок: Габбро", + "block.mineralogy.gabbro_smooth_stairs": "Полированные Ñтупеньки: Габбро", + "block.mineralogy.gabbro_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Габбро", + "block.mineralogy.gabbro_smooth_brick": "Полированные кирпичи: Габбро", + "block.mineralogy.gabbro_smooth_brick_stairs": "Ступеньки из полированного кирпича: Габбро", + "block.mineralogy.gabbro_smooth_brick_slab": "Плита из полированного кирпича: Габбро", + "block.mineralogy.gabbro_wall": "Ограда: Габбро", + "block.mineralogy.gabbro_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Габбро", + "block.mineralogy.gabbro_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Габбро", + "block.mineralogy.gabbro_smooth_brick_wall": "Ограда из полированного кирпича: Габбро", + "block.mineralogy.gabbro_furnace": "Печь: Габбро", + "block.mineralogy.gabbro_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Габбро", + "block.mineralogy.gabbro_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Габбро", + "block.mineralogy.gabbro_smooth_brick_furnace": "Печь из полированного кирпича: Габбро", + "block.mineralogy.peridotite": "Перидотит", + "block.mineralogy.peridotite_stairs": "Ступеньки: Перидотит", + "block.mineralogy.peridotite_slab": "Плита: Перидотит", + "block.mineralogy.peridotite_brick": "Кирпичи: Перидотит", + "block.mineralogy.peridotite_brick_stairs": "Кирпичные Ñтупеньки: Перидотит", + "block.mineralogy.peridotite_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Перидотит", + "block.mineralogy.peridotite_smooth": "Полированный блок: Перидотит", + "block.mineralogy.peridotite_smooth_stairs": "Полированные Ñтупеньки: Перидотит", + "block.mineralogy.peridotite_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Перидотит", + "block.mineralogy.peridotite_smooth_brick": "Полированные кирпичи: Перидотит", + "block.mineralogy.peridotite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Перидотит", + "block.mineralogy.peridotite_smooth_brick_slab": "Плита из полированного кирпича: Перидотит", + "block.mineralogy.peridotite_wall": "Ограда: Перидотит", + "block.mineralogy.peridotite_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Перидотит", + "block.mineralogy.peridotite_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Перидотит", + "block.mineralogy.peridotite_smooth_brick_wall": "Ограда из полированного кирпича: Перидотит", + "block.mineralogy.peridotite_furnace": "Печь: Перидотит", + "block.mineralogy.peridotite_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Перидотит", + "block.mineralogy.peridotite_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Перидотит", + "block.mineralogy.peridotite_smooth_brick_furnace": "Печь из полированного кирпича: Перидотит", + "block.mineralogy.basaltic_glass": "Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_stairs": "Ступеньки: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_slab": "Плита: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_brick": "Кирпичи: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_brick_stairs": "Кирпичные Ñтупеньки: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_smooth": "Полированный блок: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_smooth_stairs": "Полированные Ñтупеньки: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_smooth_brick": "Полированные кирпичи: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "Ступеньки из полированного кирпича: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "Плита из полированного кирпича: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_wall": "Ограда: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "Ограда из полированного кирпича: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_furnace": "Печь: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Базальтовое Ñтекло", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "Печь из полированного кирпича: Базальтовое Ñтекло", + "block.mineralogy.scoria": "СкориÑ", + "block.mineralogy.scoria_stairs": "Ступеньки: СкориÑ", + "block.mineralogy.scoria_slab": "Плита: СкориÑ", + "block.mineralogy.scoria_brick": "Кирпичи: СкориÑ", + "block.mineralogy.scoria_brick_stairs": "Кирпичные Ñтупеньки: СкориÑ", + "block.mineralogy.scoria_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: СкориÑ", + "block.mineralogy.scoria_smooth": "Полированный блок: СкориÑ", + "block.mineralogy.scoria_smooth_stairs": "Полированные Ñтупеньки: СкориÑ", + "block.mineralogy.scoria_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: СкориÑ", + "block.mineralogy.scoria_smooth_brick": "Полированные кирпичи: СкориÑ", + "block.mineralogy.scoria_smooth_brick_stairs": "Ступеньки из полированного кирпича: СкориÑ", + "block.mineralogy.scoria_smooth_brick_slab": "Плита из полированного кирпича: СкориÑ", + "block.mineralogy.scoria_wall": "Ограда: СкориÑ", + "block.mineralogy.scoria_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: СкориÑ", + "block.mineralogy.scoria_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: СкориÑ", + "block.mineralogy.scoria_smooth_brick_wall": "Ограда из полированного кирпича: СкориÑ", + "block.mineralogy.scoria_furnace": "Печь: СкориÑ", + "block.mineralogy.scoria_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: СкориÑ", + "block.mineralogy.scoria_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: СкориÑ", + "block.mineralogy.scoria_smooth_brick_furnace": "Печь из полированного кирпича: СкориÑ", + "block.mineralogy.tuff": "Туф", + "block.mineralogy.tuff_stairs": "Ступеньки: Туф", + "block.mineralogy.tuff_slab": "Плита: Туф", + "block.mineralogy.tuff_brick": "Кирпичи: Туф", + "block.mineralogy.tuff_brick_stairs": "Кирпичные Ñтупеньки: Туф", + "block.mineralogy.tuff_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Туф", + "block.mineralogy.tuff_smooth": "Полированный блок: Туф", + "block.mineralogy.tuff_smooth_stairs": "Полированные Ñтупеньки: Туф", + "block.mineralogy.tuff_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Туф", + "block.mineralogy.tuff_smooth_brick": "Полированные кирпичи: Туф", + "block.mineralogy.tuff_smooth_brick_stairs": "Ступеньки из полированного кирпича: Туф", + "block.mineralogy.tuff_smooth_brick_slab": "Плита из полированного кирпича: Туф", + "block.mineralogy.tuff_wall": "Ограда: Туф", + "block.mineralogy.tuff_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Туф", + "block.mineralogy.tuff_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Туф", + "block.mineralogy.tuff_smooth_brick_wall": "Ограда из полированного кирпича: Туф", + "block.mineralogy.tuff_furnace": "Печь: Туф", + "block.mineralogy.tuff_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Туф", + "block.mineralogy.tuff_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Туф", + "block.mineralogy.tuff_smooth_brick_furnace": "Печь из полированного кирпича: Туф", + "block.mineralogy.siltstone": "Ðлевролит", + "block.mineralogy.siltstone_stairs": "Ступеньки: Ðлевролит", + "block.mineralogy.siltstone_slab": "Плита: Ðлевролит", + "block.mineralogy.siltstone_brick": "Кирпичи: Ðлевролит", + "block.mineralogy.siltstone_brick_stairs": "Кирпичные Ñтупеньки: Ðлевролит", + "block.mineralogy.siltstone_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Ðлевролит", + "block.mineralogy.siltstone_smooth": "Полированный блок: Ðлевролит", + "block.mineralogy.siltstone_smooth_stairs": "Полированные Ñтупеньки: Ðлевролит", + "block.mineralogy.siltstone_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Ðлевролит", + "block.mineralogy.siltstone_smooth_brick": "Полированные кирпичи: Ðлевролит", + "block.mineralogy.siltstone_smooth_brick_stairs": "Ступеньки из полированного кирпича: Ðлевролит", + "block.mineralogy.siltstone_smooth_brick_slab": "Плита из полированного кирпича: Ðлевролит", + "block.mineralogy.siltstone_wall": "Ограда: Ðлевролит", + "block.mineralogy.siltstone_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Ðлевролит", + "block.mineralogy.siltstone_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Ðлевролит", + "block.mineralogy.siltstone_smooth_brick_wall": "Ограда из полированного кирпича: Ðлевролит", + "block.mineralogy.siltstone_furnace": "Печь: Ðлевролит", + "block.mineralogy.siltstone_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Ðлевролит", + "block.mineralogy.siltstone_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Ðлевролит", + "block.mineralogy.siltstone_smooth_brick_furnace": "Печь из полированного кирпича: Ðлевролит", + "block.mineralogy.rock_salt": "ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_stairs": "Ступеньки: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_slab": "Плита: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_brick": "Кирпичи: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_brick_stairs": "Кирпичные Ñтупеньки: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_smooth": "Полированный блок: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_smooth_stairs": "Полированные Ñтупеньки: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_smooth_brick": "Полированные кирпичи: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_smooth_brick_stairs": "Ступеньки из полированного кирпича: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_smooth_brick_slab": "Плита из полированного кирпича: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_wall": "Ограда: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_smooth_brick_wall": "Ограда из полированного кирпича: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_furnace": "Печь: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.rock_salt_smooth_brick_furnace": "Печь из полированного кирпича: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль", + "block.mineralogy.hornfels": "Роговик", + "block.mineralogy.hornfels_stairs": "Ступеньки: Роговик", + "block.mineralogy.hornfels_slab": "Плита: Роговик", + "block.mineralogy.hornfels_brick": "Кирпичи: Роговик", + "block.mineralogy.hornfels_brick_stairs": "Кирпичные Ñтупеньки: Роговик", + "block.mineralogy.hornfels_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Роговик", + "block.mineralogy.hornfels_smooth": "Полированный блок: Роговик", + "block.mineralogy.hornfels_smooth_stairs": "Полированные Ñтупеньки: Роговик", + "block.mineralogy.hornfels_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Роговик", + "block.mineralogy.hornfels_smooth_brick": "Полированные кирпичи: Роговик", + "block.mineralogy.hornfels_smooth_brick_stairs": "Ступеньки из полированного кирпича: Роговик", + "block.mineralogy.hornfels_smooth_brick_slab": "Плита из полированного кирпича: Роговик", + "block.mineralogy.hornfels_wall": "Ограда: Роговик", + "block.mineralogy.hornfels_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Роговик", + "block.mineralogy.hornfels_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Роговик", + "block.mineralogy.hornfels_smooth_brick_wall": "Ограда из полированного кирпича: Роговик", + "block.mineralogy.hornfels_furnace": "Печь: Роговик", + "block.mineralogy.hornfels_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Роговик", + "block.mineralogy.hornfels_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Роговик", + "block.mineralogy.hornfels_smooth_brick_furnace": "Печь из полированного кирпича: Роговик", + "block.mineralogy.quartzite": "Кварцит", + "block.mineralogy.quartzite_stairs": "Ступеньки: Кварцит", + "block.mineralogy.quartzite_slab": "Плита: Кварцит", + "block.mineralogy.quartzite_brick": "Кирпичи: Кварцит", + "block.mineralogy.quartzite_brick_stairs": "Кирпичные Ñтупеньки: Кварцит", + "block.mineralogy.quartzite_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Кварцит", + "block.mineralogy.quartzite_smooth": "Полированный блок: Кварцит", + "block.mineralogy.quartzite_smooth_stairs": "Полированные Ñтупеньки: Кварцит", + "block.mineralogy.quartzite_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Кварцит", + "block.mineralogy.quartzite_smooth_brick": "Полированные кирпичи: Кварцит", + "block.mineralogy.quartzite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Кварцит", + "block.mineralogy.quartzite_smooth_brick_slab": "Плита из полированного кирпича: Кварцит", + "block.mineralogy.quartzite_wall": "Ограда: Кварцит", + "block.mineralogy.quartzite_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Кварцит", + "block.mineralogy.quartzite_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Кварцит", + "block.mineralogy.quartzite_smooth_brick_wall": "Ограда из полированного кирпича: Кварцит", + "block.mineralogy.quartzite_furnace": "Печь: Кварцит", + "block.mineralogy.quartzite_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Кварцит", + "block.mineralogy.quartzite_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Кварцит", + "block.mineralogy.quartzite_smooth_brick_furnace": "Печь из полированного кирпича: Кварцит", + "block.mineralogy.novaculite": "Ðовакулит", + "block.mineralogy.novaculite_stairs": "Ступеньки: Ðовакулит", + "block.mineralogy.novaculite_slab": "Плита: Ðовакулит", + "block.mineralogy.novaculite_brick": "Кирпичи: Ðовакулит", + "block.mineralogy.novaculite_brick_stairs": "Кирпичные Ñтупеньки: Ðовакулит", + "block.mineralogy.novaculite_brick_slab": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Ðовакулит", + "block.mineralogy.novaculite_smooth": "Полированный блок: Ðовакулит", + "block.mineralogy.novaculite_smooth_stairs": "Полированные Ñтупеньки: Ðовакулит", + "block.mineralogy.novaculite_smooth_slab": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚Ð°: Ðовакулит", + "block.mineralogy.novaculite_smooth_brick": "Полированные кирпичи: Ðовакулит", + "block.mineralogy.novaculite_smooth_brick_stairs": "Ступеньки из полированного кирпича: Ðовакулит", + "block.mineralogy.novaculite_smooth_brick_slab": "Плита из полированного кирпича: Ðовакулит", + "block.mineralogy.novaculite_wall": "Ограда: Ðовакулит", + "block.mineralogy.novaculite_brick_wall": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Ðовакулит", + "block.mineralogy.novaculite_smooth_wall": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾Ð³Ñ€Ð°Ð´Ð°: Ðовакулит", + "block.mineralogy.novaculite_smooth_brick_wall": "Ограда из полированного кирпича: Ðовакулит", + "block.mineralogy.novaculite_furnace": "Печь: Ðовакулит", + "block.mineralogy.novaculite_brick_furnace": "ÐšÐ¸Ñ€Ð¿Ð¸Ñ‡Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Ðовакулит", + "block.mineralogy.novaculite_smooth_furnace": "ÐŸÐ¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿ÐµÑ‡ÑŒ: Ðовакулит", + "block.mineralogy.novaculite_smooth_brick_furnace": "Печь из полированного кирпича: Ðовакулит", + "block.mineralogy.chalk": "Мел", + "item.mineralogy.chalk_dust": "Меловой порошок", + "item.mineralogy.salt_dust": "Соль", + "item.mineralogy.rock_salt_dust": "КриÑталлы каменной Ñоли", + "block.mineralogy.rocksaltlamp": "Лампа из каменной Ñоли", + "block.mineralogy.rocksaltstreetlamp": "Уличный фонарь из каменной Ñоли", + "block.mineralogy.andesite_relief_axe": "Барельеф: Ðндезит (топор)", + "block.mineralogy.andesite_relief_blank": "Барельеф: Ðндезит (без узора)", + "block.mineralogy.andesite_relief_cross": "Барельеф: Ðндезит (креÑÑ‚)", + "block.mineralogy.andesite_relief_hammer": "Барельеф: Ðндезит (молот)", + "block.mineralogy.andesite_relief_hoe": "Барельеф: Ðндезит (мотыга)", + "block.mineralogy.andesite_relief_horizontal": "Барельеф: Ðндезит (горизонтальный узор)", + "block.mineralogy.andesite_relief_i": "Барельеф: Ðндезит (I)", + "block.mineralogy.andesite_relief_left": "Барельеф: Ðндезит (левый узор)", + "block.mineralogy.andesite_relief_pickaxe": "Барельеф: Ðндезит (кирка)", + "block.mineralogy.andesite_relief_plus": "Барельеф: Ðндезит (знак плюÑа)", + "block.mineralogy.andesite_relief_right": "Барельеф: Ðндезит (правый узор)", + "block.mineralogy.andesite_relief_sword": "Барельеф: Ðндезит (меч)", + "block.mineralogy.andesite_relief_vertical": "Барельеф: Ðндезит (вертикальный узор)", + "block.mineralogy.basalt_relief_axe": "Барельеф: Базальт (топор)", + "block.mineralogy.basalt_relief_blank": "Барельеф: Базальт (без узора)", + "block.mineralogy.basalt_relief_cross": "Барельеф: Базальт (креÑÑ‚)", + "block.mineralogy.basalt_relief_hammer": "Барельеф: Базальт (молот)", + "block.mineralogy.basalt_relief_hoe": "Барельеф: Базальт (мотыга)", + "block.mineralogy.basalt_relief_horizontal": "Барельеф: Базальт (горизонтальный узор)", + "block.mineralogy.basalt_relief_i": "Барельеф: Базальт (I)", + "block.mineralogy.basalt_relief_left": "Барельеф: Базальт (левый узор)", + "block.mineralogy.basalt_relief_pickaxe": "Барельеф: Базальт (кирка)", + "block.mineralogy.basalt_relief_plus": "Барельеф: Базальт (знак плюÑа)", + "block.mineralogy.basalt_relief_right": "Барельеф: Базальт (правый узор)", + "block.mineralogy.basalt_relief_sword": "Барельеф: Базальт (меч)", + "block.mineralogy.basalt_relief_vertical": "Барельеф: Базальт (вертикальный узор)", + "block.mineralogy.diorite_relief_axe": "Барельеф: Диорит (топор)", + "block.mineralogy.diorite_relief_blank": "Барельеф: Диорит (без узора)", + "block.mineralogy.diorite_relief_cross": "Барельеф: Диорит (креÑÑ‚)", + "block.mineralogy.diorite_relief_hammer": "Барельеф: Диорит (молот)", + "block.mineralogy.diorite_relief_hoe": "Барельеф: Диорит (мотыга)", + "block.mineralogy.diorite_relief_horizontal": "Барельеф: Диорит (горизонтальный узор)", + "block.mineralogy.diorite_relief_i": "Барельеф: Диорит (I)", + "block.mineralogy.diorite_relief_left": "Барельеф: Диорит (левый узор)", + "block.mineralogy.diorite_relief_pickaxe": "Барельеф: Диорит (кирка)", + "block.mineralogy.diorite_relief_plus": "Барельеф: Диорит (знак плюÑа)", + "block.mineralogy.diorite_relief_right": "Барельеф: Диорит (правый узор)", + "block.mineralogy.diorite_relief_sword": "Барельеф: Диорит (меч)", + "block.mineralogy.diorite_relief_vertical": "Барельеф: Диорит (вертикальный узор)", + "block.mineralogy.granite_relief_axe": "Барельеф: Гранит (топор)", + "block.mineralogy.granite_relief_blank": "Барельеф: Гранит (без узора)", + "block.mineralogy.granite_relief_cross": "Барельеф: Гранит (креÑÑ‚)", + "block.mineralogy.granite_relief_hammer": "Барельеф: Гранит (молот)", + "block.mineralogy.granite_relief_hoe": "Барельеф: Гранит (мотыга)", + "block.mineralogy.granite_relief_horizontal": "Барельеф: Гранит (горизонтальный узор)", + "block.mineralogy.granite_relief_i": "Барельеф: Гранит (I)", + "block.mineralogy.granite_relief_left": "Барельеф: Гранит (левый узор)", + "block.mineralogy.granite_relief_pickaxe": "Барельеф: Гранит (кирка)", + "block.mineralogy.granite_relief_plus": "Барельеф: Гранит (знак плюÑа)", + "block.mineralogy.granite_relief_right": "Барельеф: Гранит (правый узор)", + "block.mineralogy.granite_relief_sword": "Барельеф: Гранит (меч)", + "block.mineralogy.granite_relief_vertical": "Барельеф: Гранит (вертикальный узор)", + "block.mineralogy.rhyolite_relief_axe": "Барельеф: Риолит (топор)", + "block.mineralogy.rhyolite_relief_blank": "Барельеф: Риолит (без узора)", + "block.mineralogy.rhyolite_relief_cross": "Барельеф: Риолит (креÑÑ‚)", + "block.mineralogy.rhyolite_relief_hammer": "Барельеф: Риолит (молот)", + "block.mineralogy.rhyolite_relief_hoe": "Барельеф: Риолит (мотыга)", + "block.mineralogy.rhyolite_relief_horizontal": "Барельеф: Риолит (горизонтальный узор)", + "block.mineralogy.rhyolite_relief_i": "Барельеф: Риолит (I)", + "block.mineralogy.rhyolite_relief_left": "Барельеф: Риолит (левый узор)", + "block.mineralogy.rhyolite_relief_pickaxe": "Барельеф: Риолит (кирка)", + "block.mineralogy.rhyolite_relief_plus": "Барельеф: Риолит (знак плюÑа)", + "block.mineralogy.rhyolite_relief_right": "Барельеф: Риолит (правый узор)", + "block.mineralogy.rhyolite_relief_sword": "Барельеф: Риолит (меч)", + "block.mineralogy.rhyolite_relief_vertical": "Барельеф: Риолит (вертикальный узор)", + "block.mineralogy.pegmatite_relief_axe": "Барельеф: Пегматит (топор)", + "block.mineralogy.pegmatite_relief_blank": "Барельеф: Пегматит (без узора)", + "block.mineralogy.pegmatite_relief_cross": "Барельеф: Пегматит (креÑÑ‚)", + "block.mineralogy.pegmatite_relief_hammer": "Барельеф: Пегматит (молот)", + "block.mineralogy.pegmatite_relief_hoe": "Барельеф: Пегматит (мотыга)", + "block.mineralogy.pegmatite_relief_horizontal": "Барельеф: Пегматит (горизонтальный узор)", + "block.mineralogy.pegmatite_relief_i": "Барельеф: Пегматит (I)", + "block.mineralogy.pegmatite_relief_left": "Барельеф: Пегматит (левый узор)", + "block.mineralogy.pegmatite_relief_pickaxe": "Барельеф: Пегматит (кирка)", + "block.mineralogy.pegmatite_relief_plus": "Барельеф: Пегматит (знак плюÑа)", + "block.mineralogy.pegmatite_relief_right": "Барельеф: Пегматит (правый узор)", + "block.mineralogy.pegmatite_relief_sword": "Барельеф: Пегматит (меч)", + "block.mineralogy.pegmatite_relief_vertical": "Барельеф: Пегматит (вертикальный узор)", + "block.mineralogy.shale_relief_axe": "Барельеф: ГлиниÑтый Ñланец (топор)", + "block.mineralogy.shale_relief_blank": "Барельеф: ГлиниÑтый Ñланец (без узора)", + "block.mineralogy.shale_relief_cross": "Барельеф: ГлиниÑтый Ñланец (креÑÑ‚)", + "block.mineralogy.shale_relief_hammer": "Барельеф: ГлиниÑтый Ñланец (молот)", + "block.mineralogy.shale_relief_hoe": "Барельеф: ГлиниÑтый Ñланец (мотыга)", + "block.mineralogy.shale_relief_horizontal": "Барельеф: ГлиниÑтый Ñланец (горизонтальный узор)", + "block.mineralogy.shale_relief_i": "Барельеф: ГлиниÑтый Ñланец (I)", + "block.mineralogy.shale_relief_left": "Барельеф: ГлиниÑтый Ñланец (левый узор)", + "block.mineralogy.shale_relief_pickaxe": "Барельеф: ГлиниÑтый Ñланец (кирка)", + "block.mineralogy.shale_relief_plus": "Барельеф: ГлиниÑтый Ñланец (знак плюÑа)", + "block.mineralogy.shale_relief_right": "Барельеф: ГлиниÑтый Ñланец (правый узор)", + "block.mineralogy.shale_relief_sword": "Барельеф: ГлиниÑтый Ñланец (меч)", + "block.mineralogy.shale_relief_vertical": "Барельеф: ГлиниÑтый Ñланец (вертикальный узор)", + "block.mineralogy.conglomerate_relief_axe": "Барельеф: Конгломерат (топор)", + "block.mineralogy.conglomerate_relief_blank": "Барельеф: Конгломерат (без узора)", + "block.mineralogy.conglomerate_relief_cross": "Барельеф: Конгломерат (креÑÑ‚)", + "block.mineralogy.conglomerate_relief_hammer": "Барельеф: Конгломерат (молот)", + "block.mineralogy.conglomerate_relief_hoe": "Барельеф: Конгломерат (мотыга)", + "block.mineralogy.conglomerate_relief_horizontal": "Барельеф: Конгломерат (горизонтальный узор)", + "block.mineralogy.conglomerate_relief_i": "Барельеф: Конгломерат (I)", + "block.mineralogy.conglomerate_relief_left": "Барельеф: Конгломерат (левый узор)", + "block.mineralogy.conglomerate_relief_pickaxe": "Барельеф: Конгломерат (кирка)", + "block.mineralogy.conglomerate_relief_plus": "Барельеф: Конгломерат (знак плюÑа)", + "block.mineralogy.conglomerate_relief_right": "Барельеф: Конгломерат (правый узор)", + "block.mineralogy.conglomerate_relief_sword": "Барельеф: Конгломерат (меч)", + "block.mineralogy.conglomerate_relief_vertical": "Барельеф: Конгломерат (вертикальный узор)", + "block.mineralogy.dolomite_relief_axe": "Барельеф: Доломит (топор)", + "block.mineralogy.dolomite_relief_blank": "Барельеф: Доломит (без узора)", + "block.mineralogy.dolomite_relief_cross": "Барельеф: Доломит (креÑÑ‚)", + "block.mineralogy.dolomite_relief_hammer": "Барельеф: Доломит (молот)", + "block.mineralogy.dolomite_relief_hoe": "Барельеф: Доломит (мотыга)", + "block.mineralogy.dolomite_relief_horizontal": "Барельеф: Доломит (горизонтальный узор)", + "block.mineralogy.dolomite_relief_i": "Барельеф: Доломит (I)", + "block.mineralogy.dolomite_relief_left": "Барельеф: Доломит (левый узор)", + "block.mineralogy.dolomite_relief_pickaxe": "Барельеф: Доломит (кирка)", + "block.mineralogy.dolomite_relief_plus": "Барельеф: Доломит (знак плюÑа)", + "block.mineralogy.dolomite_relief_right": "Барельеф: Доломит (правый узор)", + "block.mineralogy.dolomite_relief_sword": "Барельеф: Доломит (меч)", + "block.mineralogy.dolomite_relief_vertical": "Барельеф: Доломит (вертикальный узор)", + "block.mineralogy.limestone_relief_axe": "Барельеф: ИзвеÑтнÑк (топор)", + "block.mineralogy.limestone_relief_blank": "Барельеф: ИзвеÑтнÑк (без узора)", + "block.mineralogy.limestone_relief_cross": "Барельеф: ИзвеÑтнÑк (креÑÑ‚)", + "block.mineralogy.limestone_relief_hammer": "Барельеф: ИзвеÑтнÑк (молот)", + "block.mineralogy.limestone_relief_hoe": "Барельеф: ИзвеÑтнÑк (мотыга)", + "block.mineralogy.limestone_relief_horizontal": "Барельеф: ИзвеÑтнÑк (горизонтальный узор)", + "block.mineralogy.limestone_relief_i": "Барельеф: ИзвеÑтнÑк (I)", + "block.mineralogy.limestone_relief_left": "Барельеф: ИзвеÑтнÑк (левый узор)", + "block.mineralogy.limestone_relief_pickaxe": "Барельеф: ИзвеÑтнÑк (кирка)", + "block.mineralogy.limestone_relief_plus": "Барельеф: ИзвеÑтнÑк (знак плюÑа)", + "block.mineralogy.limestone_relief_right": "Барельеф: ИзвеÑтнÑк (правый узор)", + "block.mineralogy.limestone_relief_sword": "Барельеф: ИзвеÑтнÑк (меч)", + "block.mineralogy.limestone_relief_vertical": "Барельеф: ИзвеÑтнÑк (вертикальный узор)", + "block.mineralogy.marble_relief_axe": "Барельеф: Мрамор (топор)", + "block.mineralogy.marble_relief_blank": "Барельеф: Мрамор (без узора)", + "block.mineralogy.marble_relief_cross": "Барельеф: Мрамор (креÑÑ‚)", + "block.mineralogy.marble_relief_hammer": "Барельеф: Мрамор (молот)", + "block.mineralogy.marble_relief_hoe": "Барельеф: Мрамор (мотыга)", + "block.mineralogy.marble_relief_horizontal": "Барельеф: Мрамор (горизонтальный узор)", + "block.mineralogy.marble_relief_i": "Барельеф: Мрамор (I)", + "block.mineralogy.marble_relief_left": "Барельеф: Мрамор (левый узор)", + "block.mineralogy.marble_relief_pickaxe": "Барельеф: Мрамор (кирка)", + "block.mineralogy.marble_relief_plus": "Барельеф: Мрамор (знак плюÑа)", + "block.mineralogy.marble_relief_right": "Барельеф: Мрамор (правый узор)", + "block.mineralogy.marble_relief_sword": "Барельеф: Мрамор (меч)", + "block.mineralogy.marble_relief_vertical": "Барельеф: Мрамор (вертикальный узор)", + "block.mineralogy.slate_relief_axe": "Барельеф: ÐÑпидный Ñланец (топор)", + "block.mineralogy.slate_relief_blank": "Барельеф: ÐÑпидный Ñланец (без узора)", + "block.mineralogy.slate_relief_cross": "Барельеф: ÐÑпидный Ñланец (креÑÑ‚)", + "block.mineralogy.slate_relief_hammer": "Барельеф: ÐÑпидный Ñланец (молот)", + "block.mineralogy.slate_relief_hoe": "Барельеф: ÐÑпидный Ñланец (мотыга)", + "block.mineralogy.slate_relief_horizontal": "Барельеф: ÐÑпидный Ñланец (горизонтальный узор)", + "block.mineralogy.slate_relief_i": "Барельеф: ÐÑпидный Ñланец (I)", + "block.mineralogy.slate_relief_left": "Барельеф: ÐÑпидный Ñланец (левый узор)", + "block.mineralogy.slate_relief_pickaxe": "Барельеф: ÐÑпидный Ñланец (кирка)", + "block.mineralogy.slate_relief_plus": "Барельеф: ÐÑпидный Ñланец (знак плюÑа)", + "block.mineralogy.slate_relief_right": "Барельеф: ÐÑпидный Ñланец (правый узор)", + "block.mineralogy.slate_relief_sword": "Барельеф: ÐÑпидный Ñланец (меч)", + "block.mineralogy.slate_relief_vertical": "Барельеф: ÐÑпидный Ñланец (вертикальный узор)", + "block.mineralogy.schist_relief_axe": "Барельеф: КриÑталличеÑкий Ñланец (топор)", + "block.mineralogy.schist_relief_blank": "Барельеф: КриÑталличеÑкий Ñланец (без узора)", + "block.mineralogy.schist_relief_cross": "Барельеф: КриÑталличеÑкий Ñланец (креÑÑ‚)", + "block.mineralogy.schist_relief_hammer": "Барельеф: КриÑталличеÑкий Ñланец (молот)", + "block.mineralogy.schist_relief_hoe": "Барельеф: КриÑталличеÑкий Ñланец (мотыга)", + "block.mineralogy.schist_relief_horizontal": "Барельеф: КриÑталличеÑкий Ñланец (горизонтальный узор)", + "block.mineralogy.schist_relief_i": "Барельеф: КриÑталличеÑкий Ñланец (I)", + "block.mineralogy.schist_relief_left": "Барельеф: КриÑталличеÑкий Ñланец (левый узор)", + "block.mineralogy.schist_relief_pickaxe": "Барельеф: КриÑталличеÑкий Ñланец (кирка)", + "block.mineralogy.schist_relief_plus": "Барельеф: КриÑталличеÑкий Ñланец (знак плюÑа)", + "block.mineralogy.schist_relief_right": "Барельеф: КриÑталличеÑкий Ñланец (правый узор)", + "block.mineralogy.schist_relief_sword": "Барельеф: КриÑталличеÑкий Ñланец (меч)", + "block.mineralogy.schist_relief_vertical": "Барельеф: КриÑталличеÑкий Ñланец (вертикальный узор)", + "block.mineralogy.gneiss_relief_axe": "Барельеф: Ð“Ð½ÐµÐ¹Ñ (топор)", + "block.mineralogy.gneiss_relief_blank": "Барельеф: Ð“Ð½ÐµÐ¹Ñ (без узора)", + "block.mineralogy.gneiss_relief_cross": "Барельеф: Ð“Ð½ÐµÐ¹Ñ (креÑÑ‚)", + "block.mineralogy.gneiss_relief_hammer": "Барельеф: Ð“Ð½ÐµÐ¹Ñ (молот)", + "block.mineralogy.gneiss_relief_hoe": "Барельеф: Ð“Ð½ÐµÐ¹Ñ (мотыга)", + "block.mineralogy.gneiss_relief_horizontal": "Барельеф: Ð“Ð½ÐµÐ¹Ñ (горизонтальный узор)", + "block.mineralogy.gneiss_relief_i": "Барельеф: Ð“Ð½ÐµÐ¹Ñ (I)", + "block.mineralogy.gneiss_relief_left": "Барельеф: Ð“Ð½ÐµÐ¹Ñ (левый узор)", + "block.mineralogy.gneiss_relief_pickaxe": "Барельеф: Ð“Ð½ÐµÐ¹Ñ (кирка)", + "block.mineralogy.gneiss_relief_plus": "Барельеф: Ð“Ð½ÐµÐ¹Ñ (знак плюÑа)", + "block.mineralogy.gneiss_relief_right": "Барельеф: Ð“Ð½ÐµÐ¹Ñ (правый узор)", + "block.mineralogy.gneiss_relief_sword": "Барельеф: Ð“Ð½ÐµÐ¹Ñ (меч)", + "block.mineralogy.gneiss_relief_vertical": "Барельеф: Ð“Ð½ÐµÐ¹Ñ (вертикальный узор)", + "block.mineralogy.phyllite_relief_axe": "Барельеф: Филлит (топор)", + "block.mineralogy.phyllite_relief_blank": "Барельеф: Филлит (без узора)", + "block.mineralogy.phyllite_relief_cross": "Барельеф: Филлит (креÑÑ‚)", + "block.mineralogy.phyllite_relief_hammer": "Барельеф: Филлит (молот)", + "block.mineralogy.phyllite_relief_hoe": "Барельеф: Филлит (мотыга)", + "block.mineralogy.phyllite_relief_horizontal": "Барельеф: Филлит (горизонтальный узор)", + "block.mineralogy.phyllite_relief_i": "Барельеф: Филлит (I)", + "block.mineralogy.phyllite_relief_left": "Барельеф: Филлит (левый узор)", + "block.mineralogy.phyllite_relief_pickaxe": "Барельеф: Филлит (кирка)", + "block.mineralogy.phyllite_relief_plus": "Барельеф: Филлит (знак плюÑа)", + "block.mineralogy.phyllite_relief_right": "Барельеф: Филлит (правый узор)", + "block.mineralogy.phyllite_relief_sword": "Барельеф: Филлит (меч)", + "block.mineralogy.phyllite_relief_vertical": "Барельеф: Филлит (вертикальный узор)", + "block.mineralogy.amphibolite_relief_axe": "Барельеф: Ðмфиболит (топор)", + "block.mineralogy.amphibolite_relief_blank": "Барельеф: Ðмфиболит (без узора)", + "block.mineralogy.amphibolite_relief_cross": "Барельеф: Ðмфиболит (креÑÑ‚)", + "block.mineralogy.amphibolite_relief_hammer": "Барельеф: Ðмфиболит (молот)", + "block.mineralogy.amphibolite_relief_hoe": "Барельеф: Ðмфиболит (мотыга)", + "block.mineralogy.amphibolite_relief_horizontal": "Барельеф: Ðмфиболит (горизонтальный узор)", + "block.mineralogy.amphibolite_relief_i": "Барельеф: Ðмфиболит (I)", + "block.mineralogy.amphibolite_relief_left": "Барельеф: Ðмфиболит (левый узор)", + "block.mineralogy.amphibolite_relief_pickaxe": "Барельеф: Ðмфиболит (кирка)", + "block.mineralogy.amphibolite_relief_plus": "Барельеф: Ðмфиболит (знак плюÑа)", + "block.mineralogy.amphibolite_relief_right": "Барельеф: Ðмфиболит (правый узор)", + "block.mineralogy.amphibolite_relief_sword": "Барельеф: Ðмфиболит (меч)", + "block.mineralogy.amphibolite_relief_vertical": "Барельеф: Ðмфиболит (вертикальный узор)", + "block.mineralogy.diabase_relief_axe": "Барельеф: Диабаз (топор)", + "block.mineralogy.diabase_relief_blank": "Барельеф: Диабаз (без узора)", + "block.mineralogy.diabase_relief_cross": "Барельеф: Диабаз (креÑÑ‚)", + "block.mineralogy.diabase_relief_hammer": "Барельеф: Диабаз (молот)", + "block.mineralogy.diabase_relief_hoe": "Барельеф: Диабаз (мотыга)", + "block.mineralogy.diabase_relief_horizontal": "Барельеф: Диабаз (горизонтальный узор)", + "block.mineralogy.diabase_relief_i": "Барельеф: Диабаз (I)", + "block.mineralogy.diabase_relief_left": "Барельеф: Диабаз (левый узор)", + "block.mineralogy.diabase_relief_pickaxe": "Барельеф: Диабаз (кирка)", + "block.mineralogy.diabase_relief_plus": "Барельеф: Диабаз (знак плюÑа)", + "block.mineralogy.diabase_relief_right": "Барельеф: Диабаз (правый узор)", + "block.mineralogy.diabase_relief_sword": "Барельеф: Диабаз (меч)", + "block.mineralogy.diabase_relief_vertical": "Барельеф: Диабаз (вертикальный узор)", + "block.mineralogy.gabbro_relief_axe": "Барельеф: Габбро (топор)", + "block.mineralogy.gabbro_relief_blank": "Барельеф: Габбро (без узора)", + "block.mineralogy.gabbro_relief_cross": "Барельеф: Габбро (креÑÑ‚)", + "block.mineralogy.gabbro_relief_hammer": "Барельеф: Габбро (молот)", + "block.mineralogy.gabbro_relief_hoe": "Барельеф: Габбро (мотыга)", + "block.mineralogy.gabbro_relief_horizontal": "Барельеф: Габбро (горизонтальный узор)", + "block.mineralogy.gabbro_relief_i": "Барельеф: Габбро (I)", + "block.mineralogy.gabbro_relief_left": "Барельеф: Габбро (левый узор)", + "block.mineralogy.gabbro_relief_pickaxe": "Барельеф: Габбро (кирка)", + "block.mineralogy.gabbro_relief_plus": "Барельеф: Габбро (знак плюÑа)", + "block.mineralogy.gabbro_relief_right": "Барельеф: Габбро (правый узор)", + "block.mineralogy.gabbro_relief_sword": "Барельеф: Габбро (меч)", + "block.mineralogy.gabbro_relief_vertical": "Барельеф: Габбро (вертикальный узор)", + "block.mineralogy.peridotite_relief_axe": "Барельеф: Перидотит (топор)", + "block.mineralogy.peridotite_relief_blank": "Барельеф: Перидотит (без узора)", + "block.mineralogy.peridotite_relief_cross": "Барельеф: Перидотит (креÑÑ‚)", + "block.mineralogy.peridotite_relief_hammer": "Барельеф: Перидотит (молот)", + "block.mineralogy.peridotite_relief_hoe": "Барельеф: Перидотит (мотыга)", + "block.mineralogy.peridotite_relief_horizontal": "Барельеф: Перидотит (горизонтальный узор)", + "block.mineralogy.peridotite_relief_i": "Барельеф: Перидотит (I)", + "block.mineralogy.peridotite_relief_left": "Барельеф: Перидотит (левый узор)", + "block.mineralogy.peridotite_relief_pickaxe": "Барельеф: Перидотит (кирка)", + "block.mineralogy.peridotite_relief_plus": "Барельеф: Перидотит (знак плюÑа)", + "block.mineralogy.peridotite_relief_right": "Барельеф: Перидотит (правый узор)", + "block.mineralogy.peridotite_relief_sword": "Барельеф: Перидотит (меч)", + "block.mineralogy.peridotite_relief_vertical": "Барельеф: Перидотит (вертикальный узор)", + "block.mineralogy.basaltic_glass_relief_axe": "Барельеф: Базальтовое Ñтекло (топор)", + "block.mineralogy.basaltic_glass_relief_blank": "Барельеф: Базальтовое Ñтекло (без узора)", + "block.mineralogy.basaltic_glass_relief_cross": "Барельеф: Базальтовое Ñтекло (креÑÑ‚)", + "block.mineralogy.basaltic_glass_relief_hammer": "Барельеф: Базальтовое Ñтекло (молот)", + "block.mineralogy.basaltic_glass_relief_hoe": "Барельеф: Базальтовое Ñтекло (мотыга)", + "block.mineralogy.basaltic_glass_relief_horizontal": "Барельеф: Базальтовое Ñтекло (горизонтальный узор)", + "block.mineralogy.basaltic_glass_relief_i": "Барельеф: Базальтовое Ñтекло (I)", + "block.mineralogy.basaltic_glass_relief_left": "Барельеф: Базальтовое Ñтекло (левый узор)", + "block.mineralogy.basaltic_glass_relief_pickaxe": "Барельеф: Базальтовое Ñтекло (кирка)", + "block.mineralogy.basaltic_glass_relief_plus": "Барельеф: Базальтовое Ñтекло (знак плюÑа)", + "block.mineralogy.basaltic_glass_relief_right": "Барельеф: Базальтовое Ñтекло (правый узор)", + "block.mineralogy.basaltic_glass_relief_sword": "Барельеф: Базальтовое Ñтекло (меч)", + "block.mineralogy.basaltic_glass_relief_vertical": "Барельеф: Базальтовое Ñтекло (вертикальный узор)", + "block.mineralogy.scoria_relief_axe": "Барельеф: Ð¡ÐºÐ¾Ñ€Ð¸Ñ (топор)", + "block.mineralogy.scoria_relief_blank": "Барельеф: Ð¡ÐºÐ¾Ñ€Ð¸Ñ (без узора)", + "block.mineralogy.scoria_relief_cross": "Барельеф: Ð¡ÐºÐ¾Ñ€Ð¸Ñ (креÑÑ‚)", + "block.mineralogy.scoria_relief_hammer": "Барельеф: Ð¡ÐºÐ¾Ñ€Ð¸Ñ (молот)", + "block.mineralogy.scoria_relief_hoe": "Барельеф: Ð¡ÐºÐ¾Ñ€Ð¸Ñ (мотыга)", + "block.mineralogy.scoria_relief_horizontal": "Барельеф: Ð¡ÐºÐ¾Ñ€Ð¸Ñ (горизонтальный узор)", + "block.mineralogy.scoria_relief_i": "Барельеф: Ð¡ÐºÐ¾Ñ€Ð¸Ñ (I)", + "block.mineralogy.scoria_relief_left": "Барельеф: Ð¡ÐºÐ¾Ñ€Ð¸Ñ (левый узор)", + "block.mineralogy.scoria_relief_pickaxe": "Барельеф: Ð¡ÐºÐ¾Ñ€Ð¸Ñ (кирка)", + "block.mineralogy.scoria_relief_plus": "Барельеф: Ð¡ÐºÐ¾Ñ€Ð¸Ñ (знак плюÑа)", + "block.mineralogy.scoria_relief_right": "Барельеф: Ð¡ÐºÐ¾Ñ€Ð¸Ñ (правый узор)", + "block.mineralogy.scoria_relief_sword": "Барельеф: Ð¡ÐºÐ¾Ñ€Ð¸Ñ (меч)", + "block.mineralogy.scoria_relief_vertical": "Барельеф: Ð¡ÐºÐ¾Ñ€Ð¸Ñ (вертикальный узор)", + "block.mineralogy.tuff_relief_axe": "Барельеф: Туф (топор)", + "block.mineralogy.tuff_relief_blank": "Барельеф: Туф (без узора)", + "block.mineralogy.tuff_relief_cross": "Барельеф: Туф (креÑÑ‚)", + "block.mineralogy.tuff_relief_hammer": "Барельеф: Туф (молот)", + "block.mineralogy.tuff_relief_hoe": "Барельеф: Туф (мотыга)", + "block.mineralogy.tuff_relief_horizontal": "Барельеф: Туф (горизонтальный узор)", + "block.mineralogy.tuff_relief_i": "Барельеф: Туф (I)", + "block.mineralogy.tuff_relief_left": "Барельеф: Туф (левый узор)", + "block.mineralogy.tuff_relief_pickaxe": "Барельеф: Туф (кирка)", + "block.mineralogy.tuff_relief_plus": "Барельеф: Туф (знак плюÑа)", + "block.mineralogy.tuff_relief_right": "Барельеф: Туф (правый узор)", + "block.mineralogy.tuff_relief_sword": "Барельеф: Туф (меч)", + "block.mineralogy.tuff_relief_vertical": "Барельеф: Туф (вертикальный узор)", + "block.mineralogy.siltstone_relief_axe": "Барельеф: Ðлевролит (топор)", + "block.mineralogy.siltstone_relief_blank": "Барельеф: Ðлевролит (без узора)", + "block.mineralogy.siltstone_relief_cross": "Барельеф: Ðлевролит (креÑÑ‚)", + "block.mineralogy.siltstone_relief_hammer": "Барельеф: Ðлевролит (молот)", + "block.mineralogy.siltstone_relief_hoe": "Барельеф: Ðлевролит (мотыга)", + "block.mineralogy.siltstone_relief_horizontal": "Барельеф: Ðлевролит (горизонтальный узор)", + "block.mineralogy.siltstone_relief_i": "Барельеф: Ðлевролит (I)", + "block.mineralogy.siltstone_relief_left": "Барельеф: Ðлевролит (левый узор)", + "block.mineralogy.siltstone_relief_pickaxe": "Барельеф: Ðлевролит (кирка)", + "block.mineralogy.siltstone_relief_plus": "Барельеф: Ðлевролит (знак плюÑа)", + "block.mineralogy.siltstone_relief_right": "Барельеф: Ðлевролит (правый узор)", + "block.mineralogy.siltstone_relief_sword": "Барельеф: Ðлевролит (меч)", + "block.mineralogy.siltstone_relief_vertical": "Барельеф: Ðлевролит (вертикальный узор)", + "block.mineralogy.rock_salt_relief_axe": "Барельеф: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль (топор)", + "block.mineralogy.rock_salt_relief_blank": "Барельеф: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль (без узора)", + "block.mineralogy.rock_salt_relief_cross": "Барельеф: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль (креÑÑ‚)", + "block.mineralogy.rock_salt_relief_hammer": "Барельеф: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль (молот)", + "block.mineralogy.rock_salt_relief_hoe": "Барельеф: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль (мотыга)", + "block.mineralogy.rock_salt_relief_horizontal": "Барельеф: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль (горизонтальный узор)", + "block.mineralogy.rock_salt_relief_i": "Барельеф: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль (I)", + "block.mineralogy.rock_salt_relief_left": "Барельеф: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль (левый узор)", + "block.mineralogy.rock_salt_relief_pickaxe": "Барельеф: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль (кирка)", + "block.mineralogy.rock_salt_relief_plus": "Барельеф: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль (знак плюÑа)", + "block.mineralogy.rock_salt_relief_right": "Барельеф: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль (правый узор)", + "block.mineralogy.rock_salt_relief_sword": "Барельеф: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль (меч)", + "block.mineralogy.rock_salt_relief_vertical": "Барельеф: ÐšÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ñоль (вертикальный узор)", + "block.mineralogy.hornfels_relief_axe": "Барельеф: Роговик (топор)", + "block.mineralogy.hornfels_relief_blank": "Барельеф: Роговик (без узора)", + "block.mineralogy.hornfels_relief_cross": "Барельеф: Роговик (креÑÑ‚)", + "block.mineralogy.hornfels_relief_hammer": "Барельеф: Роговик (молот)", + "block.mineralogy.hornfels_relief_hoe": "Барельеф: Роговик (мотыга)", + "block.mineralogy.hornfels_relief_horizontal": "Барельеф: Роговик (горизонтальный узор)", + "block.mineralogy.hornfels_relief_i": "Барельеф: Роговик (I)", + "block.mineralogy.hornfels_relief_left": "Барельеф: Роговик (левый узор)", + "block.mineralogy.hornfels_relief_pickaxe": "Барельеф: Роговик (кирка)", + "block.mineralogy.hornfels_relief_plus": "Барельеф: Роговик (знак плюÑа)", + "block.mineralogy.hornfels_relief_right": "Барельеф: Роговик (правый узор)", + "block.mineralogy.hornfels_relief_sword": "Барельеф: Роговик (меч)", + "block.mineralogy.hornfels_relief_vertical": "Барельеф: Роговик (вертикальный узор)", + "block.mineralogy.quartzite_relief_axe": "Барельеф: Кварцит (топор)", + "block.mineralogy.quartzite_relief_blank": "Барельеф: Кварцит (без узора)", + "block.mineralogy.quartzite_relief_cross": "Барельеф: Кварцит (креÑÑ‚)", + "block.mineralogy.quartzite_relief_hammer": "Барельеф: Кварцит (молот)", + "block.mineralogy.quartzite_relief_hoe": "Барельеф: Кварцит (мотыга)", + "block.mineralogy.quartzite_relief_horizontal": "Барельеф: Кварцит (горизонтальный узор)", + "block.mineralogy.quartzite_relief_i": "Барельеф: Кварцит (I)", + "block.mineralogy.quartzite_relief_left": "Барельеф: Кварцит (левый узор)", + "block.mineralogy.quartzite_relief_pickaxe": "Барельеф: Кварцит (кирка)", + "block.mineralogy.quartzite_relief_plus": "Барельеф: Кварцит (знак плюÑа)", + "block.mineralogy.quartzite_relief_right": "Барельеф: Кварцит (правый узор)", + "block.mineralogy.quartzite_relief_sword": "Барельеф: Кварцит (меч)", + "block.mineralogy.quartzite_relief_vertical": "Барельеф: Кварцит (вертикальный узор)", + "block.mineralogy.novaculite_relief_axe": "Барельеф: Ðовакулит (топор)", + "block.mineralogy.novaculite_relief_blank": "Барельеф: Ðовакулит (без узора)", + "block.mineralogy.novaculite_relief_cross": "Барельеф: Ðовакулит (креÑÑ‚)", + "block.mineralogy.novaculite_relief_hammer": "Барельеф: Ðовакулит (молот)", + "block.mineralogy.novaculite_relief_hoe": "Барельеф: Ðовакулит (мотыга)", + "block.mineralogy.novaculite_relief_horizontal": "Барельеф: Ðовакулит (горизонтальный узор)", + "block.mineralogy.novaculite_relief_i": "Барельеф: Ðовакулит (I)", + "block.mineralogy.novaculite_relief_left": "Барельеф: Ðовакулит (левый узор)", + "block.mineralogy.novaculite_relief_pickaxe": "Барельеф: Ðовакулит (кирка)", + "block.mineralogy.novaculite_relief_plus": "Барельеф: Ðовакулит (знак плюÑа)", + "block.mineralogy.novaculite_relief_right": "Барельеф: Ðовакулит (правый узор)", + "block.mineralogy.novaculite_relief_sword": "Барельеф: Ðовакулит (меч)", + "block.mineralogy.novaculite_relief_vertical": "Барельеф: Ðовакулит (вертикальный узор)", + "itemGroup.mineralogy.mineralogy": "МинералогиÑ", + "itemGroup.mineralogy.rock": "МинералогичеÑкие породы", + "itemGroup.mineralogy.stair": "МинералогичеÑкие Ñтупеньки", + "itemGroup.mineralogy.slab": "МинералогичеÑкие плиты", + "itemGroup.mineralogy.wall": "МинералогичеÑкие ограды", + "itemGroup.mineralogy.item": "МинералогичеÑкие предметы", + "block.mineralogy.crude_oil": "Ð¡Ñ‹Ñ€Ð°Ñ Ð½ÐµÑ„Ñ‚ÑŒ", + "item.mineralogy.crude_oil_bucket": "Ведро Ñырой нефти", + "fluid.mineralogy.crude_oil": "Ð¡Ñ‹Ñ€Ð°Ñ Ð½ÐµÑ„Ñ‚ÑŒ", + "advancements.mineralogy.all_the_rocks.title": "Ð’Ñе горные породы", + "advancements.mineralogy.all_the_rocks.description": "Ð’Ñ‹ нашли вÑе Ñтандартные горные породы Минералогии!" +} diff --git a/src/main/resources/assets/mineralogy/lang/zh_cn.json b/src/main/resources/assets/mineralogy/lang/zh_cn.json index ab21dbae8..4fb8d511c 100644 --- a/src/main/resources/assets/mineralogy/lang/zh_cn.json +++ b/src/main/resources/assets/mineralogy/lang/zh_cn.json @@ -1,196 +1,196 @@ { "block.mineralogy.andesite": "安山岩", "block.mineralogy.andesite_stairs": "安山岩楼梯", - "block.mineralogy.andesite_slab": "安山岩æ¿", + "block.mineralogy.andesite_slab": "安山岩å°é˜¶", "block.mineralogy.andesite_brick": "安山岩砖", "block.mineralogy.andesite_brick_stairs": "安山岩砖楼梯", - "block.mineralogy.andesite_brick_slab": "安山岩砖æ¿", - "block.mineralogy.andesite_smooth": "精致安山岩", - "block.mineralogy.andesite_smooth_stairs": "精致安山岩楼梯", - "block.mineralogy.andesite_smooth_slab": "精致安山岩æ¿", - "block.mineralogy.andesite_smooth_brick": "精致安山岩砖", - "block.mineralogy.andesite_smooth_brick_stairs": "精致安山岩砖楼梯", - "block.mineralogy.andesite_smooth_brick_slab": "精致安山岩砖æ¿", + "block.mineralogy.andesite_brick_slab": "安山岩砖å°é˜¶", + "block.mineralogy.andesite_smooth": "磨制安山岩", + "block.mineralogy.andesite_smooth_stairs": "磨制安山岩楼梯", + "block.mineralogy.andesite_smooth_slab": "磨制安山岩å°é˜¶", + "block.mineralogy.andesite_smooth_brick": "磨制安山岩砖", + "block.mineralogy.andesite_smooth_brick_stairs": "磨制安山岩砖楼梯", + "block.mineralogy.andesite_smooth_brick_slab": "磨制安山岩砖å°é˜¶", "block.mineralogy.basalt": "玄武岩", "block.mineralogy.basalt_stairs": "玄武岩楼梯", - "block.mineralogy.basalt_slab": "玄武岩æ¿", + "block.mineralogy.basalt_slab": "玄武岩å°é˜¶", "block.mineralogy.basalt_brick": "玄武岩砖", "block.mineralogy.basalt_brick_stairs": "玄武岩砖楼梯", - "block.mineralogy.basalt_brick_slab": "玄武岩砖æ¿", - "block.mineralogy.basalt_smooth": "精致玄武岩", - "block.mineralogy.basalt_smooth_stairs": "精致玄武岩楼梯", - "block.mineralogy.basalt_smooth_slab": "精致玄武岩æ¿", - "block.mineralogy.basalt_smooth_brick": "精致玄武岩砖", - "block.mineralogy.basalt_smooth_brick_stairs": "精致玄武岩砖楼梯", - "block.mineralogy.basalt_smooth_brick_slab": "精致玄武岩砖æ¿", + "block.mineralogy.basalt_brick_slab": "玄武岩砖å°é˜¶", + "block.mineralogy.basalt_smooth": "磨制玄武岩", + "block.mineralogy.basalt_smooth_stairs": "磨制玄武岩楼梯", + "block.mineralogy.basalt_smooth_slab": "磨制玄武岩å°é˜¶", + "block.mineralogy.basalt_smooth_brick": "磨制玄武岩砖", + "block.mineralogy.basalt_smooth_brick_stairs": "磨制玄武岩砖楼梯", + "block.mineralogy.basalt_smooth_brick_slab": "磨制玄武岩砖å°é˜¶", "block.mineralogy.diorite": "闪长岩", "block.mineralogy.diorite_stairs": "闪长岩楼梯", - "block.mineralogy.diorite_slab": "闪长岩æ¿", + "block.mineralogy.diorite_slab": "闪长岩å°é˜¶", "block.mineralogy.diorite_brick": "闪长岩砖", "block.mineralogy.diorite_brick_stairs": "闪长岩砖楼梯", - "block.mineralogy.diorite_brick_slab": "闪长岩砖æ¿", - "block.mineralogy.diorite_smooth": "精致闪长岩", - "block.mineralogy.diorite_smooth_stairs": "精致闪长岩楼梯", - "block.mineralogy.diorite_smooth_slab": "精致闪长岩æ¿", - "block.mineralogy.diorite_smooth_brick": "精致闪长岩砖", - "block.mineralogy.diorite_smooth_brick_stairs": "精致闪长岩砖楼梯", - "block.mineralogy.diorite_smooth_brick_slab": "精致闪长岩砖æ¿", + "block.mineralogy.diorite_brick_slab": "闪长岩砖å°é˜¶", + "block.mineralogy.diorite_smooth": "磨制闪长岩", + "block.mineralogy.diorite_smooth_stairs": "磨制闪长岩楼梯", + "block.mineralogy.diorite_smooth_slab": "磨制闪长岩å°é˜¶", + "block.mineralogy.diorite_smooth_brick": "磨制闪长岩砖", + "block.mineralogy.diorite_smooth_brick_stairs": "磨制闪长岩砖楼梯", + "block.mineralogy.diorite_smooth_brick_slab": "磨制闪长岩砖å°é˜¶", "block.mineralogy.granite": "花岗岩", "block.mineralogy.granite_stairs": "花岗岩楼梯", - "block.mineralogy.granite_slab": "花岗岩æ¿", + "block.mineralogy.granite_slab": "花岗岩å°é˜¶", "block.mineralogy.granite_brick": "花岗岩砖", "block.mineralogy.granite_brick_stairs": "花岗岩砖楼梯", - "block.mineralogy.granite_brick_slab": "花岗岩砖æ¿", - "block.mineralogy.granite_smooth": "精致花岗岩", - "block.mineralogy.granite_smooth_stairs": "精致花岗岩楼梯", - "block.mineralogy.granite_smooth_slab": "精致花岗岩æ¿", - "block.mineralogy.granite_smooth_brick": "精致花岗岩砖", - "block.mineralogy.granite_smooth_brick_stairs": "精致花岗岩砖楼梯", - "block.mineralogy.granite_smooth_brick_slab": "精致花岗岩砖æ¿", + "block.mineralogy.granite_brick_slab": "花岗岩砖å°é˜¶", + "block.mineralogy.granite_smooth": "磨制花岗岩", + "block.mineralogy.granite_smooth_stairs": "磨制花岗岩楼梯", + "block.mineralogy.granite_smooth_slab": "磨制花岗岩å°é˜¶", + "block.mineralogy.granite_smooth_brick": "磨制花岗岩砖", + "block.mineralogy.granite_smooth_brick_stairs": "磨制花岗岩砖楼梯", + "block.mineralogy.granite_smooth_brick_slab": "磨制花岗岩砖å°é˜¶", "block.mineralogy.rhyolite": "æµçº¹å²©", "block.mineralogy.rhyolite_stairs": "æµçº¹å²©æ¥¼æ¢¯", - "block.mineralogy.rhyolite_slab": "æµçº¹å²©æ¿", + "block.mineralogy.rhyolite_slab": "æµçº¹å²©å°é˜¶", "block.mineralogy.rhyolite_brick": "æµçº¹å²©ç –", "block.mineralogy.rhyolite_brick_stairs": "æµçº¹å²©ç –楼梯", - "block.mineralogy.rhyolite_brick_slab": "æµçº¹å²©ç –æ¿", - "block.mineralogy.rhyolite_smooth": "精致æµçº¹å²©", - "block.mineralogy.rhyolite_smooth_stairs": "精致æµçº¹å²©æ¥¼æ¢¯", - "block.mineralogy.rhyolite_smooth_slab": "精致æµçº¹å²©æ¿", - "block.mineralogy.rhyolite_smooth_brick": "精致æµçº¹å²©ç –", - "block.mineralogy.rhyolite_smooth_brick_stairs": "精致æµçº¹å²©ç –楼梯", - "block.mineralogy.rhyolite_smooth_brick_slab": "精致æµçº¹å²©ç –æ¿", + "block.mineralogy.rhyolite_brick_slab": "æµçº¹å²©ç –å°é˜¶", + "block.mineralogy.rhyolite_smooth": "磨制æµçº¹å²©", + "block.mineralogy.rhyolite_smooth_stairs": "磨制æµçº¹å²©æ¥¼æ¢¯", + "block.mineralogy.rhyolite_smooth_slab": "磨制æµçº¹å²©å°é˜¶", + "block.mineralogy.rhyolite_smooth_brick": "磨制æµçº¹å²©ç –", + "block.mineralogy.rhyolite_smooth_brick_stairs": "磨制æµçº¹å²©ç –楼梯", + "block.mineralogy.rhyolite_smooth_brick_slab": "磨制æµçº¹å²©ç –å°é˜¶", "block.mineralogy.pegmatite": "伟晶岩", "block.mineralogy.pegmatite_stairs": "伟晶岩楼梯", - "block.mineralogy.pegmatite_slab": "伟晶岩æ¿", + "block.mineralogy.pegmatite_slab": "伟晶岩å°é˜¶", "block.mineralogy.pegmatite_brick": "伟晶岩砖", "block.mineralogy.pegmatite_brick_stairs": "伟晶岩砖楼梯", - "block.mineralogy.pegmatite_brick_slab": "伟晶岩砖æ¿", - "block.mineralogy.pegmatite_smooth": "精致伟晶岩", - "block.mineralogy.pegmatite_smooth_stairs": "精致伟晶岩楼梯", - "block.mineralogy.pegmatite_smooth_slab": "精致伟晶岩æ¿", - "block.mineralogy.pegmatite_smooth_brick": "精致伟晶岩砖", - "block.mineralogy.pegmatite_smooth_brick_stairs": "精致伟晶岩砖楼梯", - "block.mineralogy.pegmatite_smooth_brick_slab": "精致伟晶岩砖æ¿", + "block.mineralogy.pegmatite_brick_slab": "伟晶岩砖å°é˜¶", + "block.mineralogy.pegmatite_smooth": "磨制伟晶岩", + "block.mineralogy.pegmatite_smooth_stairs": "磨制伟晶岩楼梯", + "block.mineralogy.pegmatite_smooth_slab": "磨制伟晶岩å°é˜¶", + "block.mineralogy.pegmatite_smooth_brick": "磨制伟晶岩砖", + "block.mineralogy.pegmatite_smooth_brick_stairs": "磨制伟晶岩砖楼梯", + "block.mineralogy.pegmatite_smooth_brick_slab": "磨制伟晶岩砖å°é˜¶", "block.mineralogy.shale": "页岩", "block.mineralogy.shale_stairs": "页岩楼梯", - "block.mineralogy.shale_slab": "页岩æ¿", + "block.mineralogy.shale_slab": "页岩å°é˜¶", "block.mineralogy.shale_brick": "页岩砖", "block.mineralogy.shale_brick_stairs": "页岩砖楼梯", - "block.mineralogy.shale_brick_slab": "页岩砖æ¿", - "block.mineralogy.shale_smooth": "精致页岩", - "block.mineralogy.shale_smooth_stairs": "精致页岩楼梯", - "block.mineralogy.shale_smooth_slab": "精致页岩æ¿", - "block.mineralogy.shale_smooth_brick": "精致页岩砖", - "block.mineralogy.shale_smooth_brick_stairs": "精致页岩砖楼梯", - "block.mineralogy.shale_smooth_brick_slab": "精致页岩砖æ¿", + "block.mineralogy.shale_brick_slab": "页岩砖å°é˜¶", + "block.mineralogy.shale_smooth": "磨制页岩", + "block.mineralogy.shale_smooth_stairs": "磨制页岩楼梯", + "block.mineralogy.shale_smooth_slab": "磨制页岩å°é˜¶", + "block.mineralogy.shale_smooth_brick": "磨制页岩砖", + "block.mineralogy.shale_smooth_brick_stairs": "磨制页岩砖楼梯", + "block.mineralogy.shale_smooth_brick_slab": "磨制页岩砖å°é˜¶", "block.mineralogy.conglomerate": "砾岩", "block.mineralogy.conglomerate_stairs": "砾岩楼梯", - "block.mineralogy.conglomerate_slab": "砾岩æ¿", + "block.mineralogy.conglomerate_slab": "砾岩å°é˜¶", "block.mineralogy.conglomerate_brick": "砾岩砖", "block.mineralogy.conglomerate_brick_stairs": "砾岩砖楼梯", - "block.mineralogy.conglomerate_brick_slab": "砾岩砖æ¿", - "block.mineralogy.conglomerate_smooth": "精致砾岩", - "block.mineralogy.conglomerate_smooth_stairs": "精致砾岩楼梯", - "block.mineralogy.conglomerate_smooth_slab": "精致砾岩æ¿", - "block.mineralogy.conglomerate_smooth_brick": "精致砾岩砖", - "block.mineralogy.conglomerate_smooth_brick_stairs": "精致砾岩砖楼梯", - "block.mineralogy.conglomerate_smooth_brick_slab": "精致砾岩砖æ¿", - "block.mineralogy.dolomite": "白云石", - "block.mineralogy.dolomite_stairs": "白云石楼梯", - "block.mineralogy.dolomite_slab": "白云石æ¿", - "block.mineralogy.dolomite_brick": "白云石砖", - "block.mineralogy.dolomite_brick_stairs": "白云石砖楼梯", - "block.mineralogy.dolomite_brick_slab": "白云石砖æ¿", - "block.mineralogy.dolomite_smooth": "精致白云石", - "block.mineralogy.dolomite_smooth_stairs": "精致白云石楼梯", - "block.mineralogy.dolomite_smooth_slab": "精致白云石æ¿", - "block.mineralogy.dolomite_smooth_brick": "精致白云石砖", - "block.mineralogy.dolomite_smooth_brick_stairs": "精致白云石砖楼梯", - "block.mineralogy.dolomite_smooth_brick_slab": "精致白云石砖æ¿", + "block.mineralogy.conglomerate_brick_slab": "砾岩砖å°é˜¶", + "block.mineralogy.conglomerate_smooth": "磨制砾岩", + "block.mineralogy.conglomerate_smooth_stairs": "磨制砾岩楼梯", + "block.mineralogy.conglomerate_smooth_slab": "磨制砾岩å°é˜¶", + "block.mineralogy.conglomerate_smooth_brick": "磨制砾岩砖", + "block.mineralogy.conglomerate_smooth_brick_stairs": "磨制砾岩砖楼梯", + "block.mineralogy.conglomerate_smooth_brick_slab": "磨制砾岩砖å°é˜¶", + "block.mineralogy.dolomite": "白云岩", + "block.mineralogy.dolomite_stairs": "白云岩楼梯", + "block.mineralogy.dolomite_slab": "白云岩å°é˜¶", + "block.mineralogy.dolomite_brick": "白云岩砖", + "block.mineralogy.dolomite_brick_stairs": "白云岩砖楼梯", + "block.mineralogy.dolomite_brick_slab": "白云岩砖å°é˜¶", + "block.mineralogy.dolomite_smooth": "磨制白云岩", + "block.mineralogy.dolomite_smooth_stairs": "磨制白云岩楼梯", + "block.mineralogy.dolomite_smooth_slab": "磨制白云岩å°é˜¶", + "block.mineralogy.dolomite_smooth_brick": "磨制白云岩砖", + "block.mineralogy.dolomite_smooth_brick_stairs": "磨制白云岩砖楼梯", + "block.mineralogy.dolomite_smooth_brick_slab": "磨制白云岩砖å°é˜¶", "block.mineralogy.limestone": "石ç°çŸ³", "block.mineralogy.limestone_stairs": "石ç°çŸ³æ¥¼æ¢¯", - "block.mineralogy.limestone_slab": "石ç°çŸ³æ¿", + "block.mineralogy.limestone_slab": "石ç°çŸ³å°é˜¶", "block.mineralogy.limestone_brick": "石ç°çŸ³ç –", "block.mineralogy.limestone_brick_stairs": "石ç°çŸ³ç –楼梯", - "block.mineralogy.limestone_brick_slab": "石ç°çŸ³ç –æ¿", - "block.mineralogy.limestone_smooth": "精致石ç°çŸ³", - "block.mineralogy.limestone_smooth_stairs": "精致石ç°çŸ³æ¥¼æ¢¯", - "block.mineralogy.limestone_smooth_slab": "精致石ç°çŸ³æ¿", - "block.mineralogy.limestone_smooth_brick": "精致石ç°çŸ³ç –", - "block.mineralogy.limestone_smooth_brick_stairs": "精致石ç°çŸ³ç –楼梯", - "block.mineralogy.limestone_smooth_brick_slab": "精致石ç°çŸ³ç –æ¿", + "block.mineralogy.limestone_brick_slab": "石ç°çŸ³ç –å°é˜¶", + "block.mineralogy.limestone_smooth": "磨制石ç°çŸ³", + "block.mineralogy.limestone_smooth_stairs": "磨制石ç°çŸ³æ¥¼æ¢¯", + "block.mineralogy.limestone_smooth_slab": "磨制石ç°çŸ³å°é˜¶", + "block.mineralogy.limestone_smooth_brick": "磨制石ç°çŸ³ç –", + "block.mineralogy.limestone_smooth_brick_stairs": "磨制石ç°çŸ³ç –楼梯", + "block.mineralogy.limestone_smooth_brick_slab": "磨制石ç°çŸ³ç –å°é˜¶", "block.mineralogy.slate": "æ¿å²©", "block.mineralogy.slate_stairs": "æ¿å²©æ¥¼æ¢¯", - "block.mineralogy.slate_slab": "æ¿å²©", + "block.mineralogy.slate_slab": "æ¿å²©å°é˜¶", "block.mineralogy.slate_brick": "æ¿å²©ç –", "block.mineralogy.slate_brick_stairs": "æ¿å²©ç –楼梯", - "block.mineralogy.slate_brick_slab": "æ¿å²©ç –æ¿", - "block.mineralogy.slate_smooth": "精致æ¿å²©", - "block.mineralogy.slate_smooth_stairs": "精致æ¿å²©æ¥¼æ¢¯", - "block.mineralogy.slate_smooth_slab": "精致æ¿å²©æ¿", - "block.mineralogy.slate_smooth_brick": "精致æ¿å²©ç –", - "block.mineralogy.slate_smooth_brick_stairs": "精致æ¿å²©ç –楼梯", - "block.mineralogy.slate_smooth_brick_slab": "精致æ¿å²©ç –æ¿", + "block.mineralogy.slate_brick_slab": "æ¿å²©ç –å°é˜¶", + "block.mineralogy.slate_smooth": "磨制æ¿å²©", + "block.mineralogy.slate_smooth_stairs": "磨制æ¿å²©æ¥¼æ¢¯", + "block.mineralogy.slate_smooth_slab": "磨制æ¿å²©å°é˜¶", + "block.mineralogy.slate_smooth_brick": "磨制æ¿å²©ç –", + "block.mineralogy.slate_smooth_brick_stairs": "磨制æ¿å²©ç –楼梯", + "block.mineralogy.slate_smooth_brick_slab": "磨制æ¿å²©ç –å°é˜¶", "block.mineralogy.schist": "片岩", "block.mineralogy.schist_stairs": "片岩楼梯", - "block.mineralogy.schist_slab": "片岩æ¿", + "block.mineralogy.schist_slab": "片岩å°é˜¶", "block.mineralogy.schist_brick": "片岩砖", "block.mineralogy.schist_brick_stairs": "片岩砖楼梯", - "block.mineralogy.schist_brick_slab": "片岩砖æ¿", - "block.mineralogy.schist_smooth": "精致片岩", - "block.mineralogy.schist_smooth_stairs": "精致片岩楼梯", - "block.mineralogy.schist_smooth_slab": "精致片岩æ¿", - "block.mineralogy.schist_smooth_brick": "精致片岩砖", - "block.mineralogy.schist_smooth_brick_stairs": "精致片岩砖楼梯", - "block.mineralogy.schist_smooth_brick_slab": "精致片岩砖æ¿", + "block.mineralogy.schist_brick_slab": "片岩砖å°é˜¶", + "block.mineralogy.schist_smooth": "磨制片岩", + "block.mineralogy.schist_smooth_stairs": "磨制片岩楼梯", + "block.mineralogy.schist_smooth_slab": "磨制片岩å°é˜¶", + "block.mineralogy.schist_smooth_brick": "磨制片岩砖", + "block.mineralogy.schist_smooth_brick_stairs": "磨制片岩砖楼梯", + "block.mineralogy.schist_smooth_brick_slab": "磨制片岩砖å°é˜¶", "block.mineralogy.gneiss": "片麻岩", "block.mineralogy.gneiss_stairs": "片麻岩楼梯", - "block.mineralogy.gneiss_slab": "片麻岩æ¿", - "block.mineralogy.gneiss_brick": "片麻岩æ¿", + "block.mineralogy.gneiss_slab": "片麻岩å°é˜¶", + "block.mineralogy.gneiss_brick": "片麻岩砖", "block.mineralogy.gneiss_brick_stairs": "片麻岩砖楼梯", - "block.mineralogy.gneiss_brick_slab": "片麻岩砖æ¿", - "block.mineralogy.gneiss_smooth": "精致片麻岩", - "block.mineralogy.gneiss_smooth_stairs": "精致片麻岩楼梯", - "block.mineralogy.gneiss_smooth_slab": "精致片麻岩æ¿", - "block.mineralogy.gneiss_smooth_brick": "精致片麻岩砖", - "block.mineralogy.gneiss_smooth_brick_stairs": "精致片麻岩砖楼梯", - "block.mineralogy.gneiss_smooth_brick_slab": "精致片麻岩砖æ¿", + "block.mineralogy.gneiss_brick_slab": "片麻岩砖å°é˜¶", + "block.mineralogy.gneiss_smooth": "磨制片麻岩", + "block.mineralogy.gneiss_smooth_stairs": "磨制片麻岩楼梯", + "block.mineralogy.gneiss_smooth_slab": "磨制片麻岩å°é˜¶", + "block.mineralogy.gneiss_smooth_brick": "磨制片麻岩砖", + "block.mineralogy.gneiss_smooth_brick_stairs": "磨制片麻岩砖楼梯", + "block.mineralogy.gneiss_smooth_brick_slab": "磨制片麻岩砖å°é˜¶", "block.mineralogy.marble": "大ç†çŸ³", "block.mineralogy.marble_stairs": "大ç†çŸ³æ¥¼æ¢¯", - "block.mineralogy.marble_slab": "大ç†çŸ³æ¿", + "block.mineralogy.marble_slab": "大ç†çŸ³å°é˜¶", "block.mineralogy.marble_brick": "大ç†çŸ³ç –", "block.mineralogy.marble_brick_stairs": "大ç†çŸ³ç –楼梯", - "block.mineralogy.marble_brick_slab": "大ç†çŸ³ç –æ¿", - "block.mineralogy.marble_smooth": "精致大ç†çŸ³", - "block.mineralogy.marble_smooth_stairs": "精致大ç†çŸ³æ¥¼æ¢¯", - "block.mineralogy.marble_smooth_slab": "精致大ç†çŸ³æ¿", - "block.mineralogy.marble_smooth_brick": "精致大ç†çŸ³ç –", - "block.mineralogy.marble_smooth_brick_stairs": "精致大ç†çŸ³ç –楼梯", - "block.mineralogy.marble_smooth_brick_slab": "精致大ç†çŸ³ç –æ¿", + "block.mineralogy.marble_brick_slab": "大ç†çŸ³ç –å°é˜¶", + "block.mineralogy.marble_smooth": "磨制大ç†çŸ³", + "block.mineralogy.marble_smooth_stairs": "磨制大ç†çŸ³æ¥¼æ¢¯", + "block.mineralogy.marble_smooth_slab": "磨制大ç†çŸ³å°é˜¶", + "block.mineralogy.marble_smooth_brick": "磨制大ç†çŸ³ç –", + "block.mineralogy.marble_smooth_brick_stairs": "磨制大ç†çŸ³ç –楼梯", + "block.mineralogy.marble_smooth_brick_slab": "磨制大ç†çŸ³ç –å°é˜¶", "block.mineralogy.phyllite": "åƒæžšå²©", "block.mineralogy.phyllite_stairs": "åƒæžšå²©æ¥¼æ¢¯", - "block.mineralogy.phyllite_slab": "åƒæžšå²©æ¿", + "block.mineralogy.phyllite_slab": "åƒæžšå²©å°é˜¶", "block.mineralogy.phyllite_brick": "åƒæžšå²©ç –", "block.mineralogy.phyllite_brick_stairs": "åƒæžšå²©ç –楼梯", - "block.mineralogy.phyllite_brick_slab": "åƒæžšå²©ç –æ¿", - "block.mineralogy.phyllite_smooth": "精致åƒæžšå²©", - "block.mineralogy.phyllite_smooth_stairs": "精致åƒæžšå²©æ¥¼æ¢¯", - "block.mineralogy.phyllite_smooth_slab": "精致åƒæžšå²©æ¿", - "block.mineralogy.phyllite_smooth_brick": "精致åƒæžšå²©ç –", - "block.mineralogy.phyllite_smooth_brick_stairs": "精致åƒæžšå²©ç –楼梯", - "block.mineralogy.phyllite_smooth_brick_slab": "精致åƒæžšå²©ç –æ¿", - "block.mineralogy.amphibolite": "闪岩", - "block.mineralogy.amphibolite_stairs": "闪岩楼梯", - "block.mineralogy.amphibolite_slab": "闪岩æ¿", - "block.mineralogy.amphibolite_brick": "闪岩砖", - "block.mineralogy.amphibolite_brick_stairs": "闪岩砖楼梯", - "block.mineralogy.amphibolite_brick_slab": "闪岩砖æ¿", - "block.mineralogy.amphibolite_smooth": "精致闪岩", - "block.mineralogy.amphibolite_smooth_stairs": "精致闪岩楼梯", - "block.mineralogy.amphibolite_smooth_slab": "精致闪岩æ¿", - "block.mineralogy.amphibolite_smooth_brick": "精致闪岩砖", - "block.mineralogy.amphibolite_smooth_brick_stairs": "精致闪岩砖楼梯", - "block.mineralogy.amphibolite_smooth_brick_slab": "精致闪岩砖æ¿", + "block.mineralogy.phyllite_brick_slab": "åƒæžšå²©ç –å°é˜¶", + "block.mineralogy.phyllite_smooth": "磨制åƒæžšå²©", + "block.mineralogy.phyllite_smooth_stairs": "磨制åƒæžšå²©æ¥¼æ¢¯", + "block.mineralogy.phyllite_smooth_slab": "磨制åƒæžšå²©å°é˜¶", + "block.mineralogy.phyllite_smooth_brick": "磨制åƒæžšå²©ç –", + "block.mineralogy.phyllite_smooth_brick_stairs": "磨制åƒæžšå²©ç –楼梯", + "block.mineralogy.phyllite_smooth_brick_slab": "磨制åƒæžšå²©ç –å°é˜¶", + "block.mineralogy.amphibolite": "角闪岩", + "block.mineralogy.amphibolite_stairs": "角闪岩楼梯", + "block.mineralogy.amphibolite_slab": "角闪岩å°é˜¶", + "block.mineralogy.amphibolite_brick": "角闪岩砖", + "block.mineralogy.amphibolite_brick_stairs": "角闪岩砖楼梯", + "block.mineralogy.amphibolite_brick_slab": "角闪岩砖å°é˜¶", + "block.mineralogy.amphibolite_smooth": "磨制角闪岩", + "block.mineralogy.amphibolite_smooth_stairs": "磨制角闪岩楼梯", + "block.mineralogy.amphibolite_smooth_slab": "磨制角闪岩å°é˜¶", + "block.mineralogy.amphibolite_smooth_brick": "磨制角闪岩砖", + "block.mineralogy.amphibolite_smooth_brick_stairs": "磨制角闪岩砖楼梯", + "block.mineralogy.amphibolite_smooth_brick_slab": "磨制角闪岩砖å°é˜¶", "item.mineralogy.gypsum_dust": "石è†ç²‰", "item.mineralogy.sulfur_dust": "硫磺粉", "item.mineralogy.phosphorous_dust": "磷粉", @@ -199,12 +199,12 @@ "block.mineralogy.chert": "燧石", "block.mineralogy.gypsum": "石è†", "block.mineralogy.pumice": "浮石", - "block.mineralogy.sulfur_block": "ç¡«", - "block.mineralogy.sulfur_ore": "硫矿", + "block.mineralogy.sulfur_block": "硫磺", + "block.mineralogy.sulfur_ore": "硫磺矿石", "block.mineralogy.phosphorous_block": "磷", - "block.mineralogy.phosphorous_ore": "磷矿", + "block.mineralogy.phosphorous_ore": "磷矿石", "block.mineralogy.nitrate_block": "ç¡é…¸ç›", - "block.mineralogy.nitrate_ore": "ç¡é…¸ç›çŸ¿", + "block.mineralogy.nitrate_ore": "ç¡é…¸ç›çŸ¿çŸ³", "block.mineralogy.drywall_black": "黑色石è†æ¿", "block.mineralogy.drywall_red": "红色石è†æ¿", "block.mineralogy.drywall_green": "绿色石è†æ¿", @@ -215,715 +215,726 @@ "block.mineralogy.drywall_silver": "æµ…ç°è‰²çŸ³è†æ¿", "block.mineralogy.drywall_gray": "ç°è‰²çŸ³è†æ¿", "block.mineralogy.drywall_pink": "粉红色石è†æ¿", - "block.mineralogy.drywall_lime": "柠檬绿石è†æ¿", + "block.mineralogy.drywall_lime": "黄绿色石è†æ¿", "block.mineralogy.drywall_yellow": "黄色石è†æ¿", - "block.mineralogy.drywall_light_blue": "æµ…è“色石è†æ¿", - "block.mineralogy.drywall_magenta": "洋红色石è†æ¿", + "block.mineralogy.drywall_light_blue": "æ·¡è“色石è†æ¿", + "block.mineralogy.drywall_magenta": "å“红色石è†æ¿", "block.mineralogy.drywall_orange": "橙色石è†æ¿", "block.mineralogy.drywall_white": "白色石è†æ¿", "block.mineralogy.andesite_wall": "安山岩墙", - "block.mineralogy.andesite_brick_wall": "安山石砖墙", - "block.mineralogy.andesite_smooth_wall": "安山岩抛光墙", - "block.mineralogy.andesite_smooth_brick_wall": "安山岩抛光砖墙", + "block.mineralogy.andesite_brick_wall": "安山岩砖墙", + "block.mineralogy.andesite_smooth_wall": "磨制安山岩墙", + "block.mineralogy.andesite_smooth_brick_wall": "磨制安山岩砖墙", "block.mineralogy.basalt_wall": "玄武岩墙", "block.mineralogy.basalt_brick_wall": "玄武岩砖墙", - "block.mineralogy.basalt_smooth_wall": "玄武岩抛光墙", - "block.mineralogy.basalt_smooth_brick_wall": "玄武岩抛光砖墙", + "block.mineralogy.basalt_smooth_wall": "磨制玄武岩墙", + "block.mineralogy.basalt_smooth_brick_wall": "磨制玄武岩砖墙", "block.mineralogy.diorite_wall": "闪长岩墙", "block.mineralogy.diorite_brick_wall": "闪长岩砖墙", - "block.mineralogy.diorite_smooth_wall": "闪长岩抛光墙", - "block.mineralogy.diorite_smooth_brick_wall": "闪长岩抛光砖墙", + "block.mineralogy.diorite_smooth_wall": "磨制闪长岩墙", + "block.mineralogy.diorite_smooth_brick_wall": "磨制闪长岩砖墙", "block.mineralogy.granite_wall": "花岗岩墙", "block.mineralogy.granite_brick_wall": "花岗岩砖墙", - "block.mineralogy.granite_smooth_wall": "花岗岩抛光墙", - "block.mineralogy.granite_smooth_brick_wall": "花岗岩抛光砖墙", + "block.mineralogy.granite_smooth_wall": "磨制花岗岩墙", + "block.mineralogy.granite_smooth_brick_wall": "磨制花岗岩砖墙", "block.mineralogy.rhyolite_wall": "æµçº¹å²©å¢™", "block.mineralogy.rhyolite_brick_wall": "æµçº¹å²©ç –墙", - "block.mineralogy.rhyolite_smooth_wall": "æµçº¹å²©æŠ›å…‰å¢™", - "block.mineralogy.rhyolite_smooth_brick_wall": "æµçº¹å²©æŠ›å…‰ç –墙", + "block.mineralogy.rhyolite_smooth_wall": "磨制æµçº¹å²©å¢™", + "block.mineralogy.rhyolite_smooth_brick_wall": "磨制æµçº¹å²©ç –墙", "block.mineralogy.pegmatite_wall": "伟晶岩墙", "block.mineralogy.pegmatite_brick_wall": "伟晶岩砖墙", - "block.mineralogy.pegmatite_smooth_wall": "伟晶岩抛光墙", - "block.mineralogy.pegmatite_smooth_brick_wall": "伟晶岩抛光砖墙", + "block.mineralogy.pegmatite_smooth_wall": "磨制伟晶岩墙", + "block.mineralogy.pegmatite_smooth_brick_wall": "磨制伟晶岩砖墙", "block.mineralogy.shale_wall": "页岩墙", "block.mineralogy.shale_brick_wall": "页岩砖墙", - "block.mineralogy.shale_smooth_wall": "页岩抛光墙", - "block.mineralogy.shale_smooth_brick_wall": "页岩抛光砖墙", + "block.mineralogy.shale_smooth_wall": "磨制页岩墙", + "block.mineralogy.shale_smooth_brick_wall": "磨制页岩砖墙", "block.mineralogy.conglomerate_wall": "砾岩墙", "block.mineralogy.conglomerate_brick_wall": "砾岩砖墙", - "block.mineralogy.conglomerate_smooth_wall": "砾岩抛光墙", - "block.mineralogy.conglomerate_smooth_brick_wall": "砾岩抛光砖墙", + "block.mineralogy.conglomerate_smooth_wall": "磨制砾岩墙", + "block.mineralogy.conglomerate_smooth_brick_wall": "磨制砾岩砖墙", "block.mineralogy.dolomite_wall": "白云岩墙", "block.mineralogy.dolomite_brick_wall": "白云岩砖墙", - "block.mineralogy.dolomite_smooth_wall": "白云岩抛光墙", - "block.mineralogy.dolomite_smooth_brick_wall": "白云岩抛光砖墙", + "block.mineralogy.dolomite_smooth_wall": "磨制白云岩墙", + "block.mineralogy.dolomite_smooth_brick_wall": "磨制白云岩砖墙", "block.mineralogy.limestone_wall": "石ç°çŸ³å¢™", "block.mineralogy.limestone_brick_wall": "石ç°çŸ³ç –墙", - "block.mineralogy.limestone_smooth_wall": "石ç°çŸ³æŠ›å…‰å¢™", - "block.mineralogy.limestone_smooth_brick_wall": "石ç°çŸ³æŠ›å…‰ç –墙", + "block.mineralogy.limestone_smooth_wall": "磨制石ç°çŸ³å¢™", + "block.mineralogy.limestone_smooth_brick_wall": "磨制石ç°çŸ³ç –墙", "block.mineralogy.marble_wall": "大ç†çŸ³å¢™", "block.mineralogy.marble_brick_wall": "大ç†çŸ³ç –墙", - "block.mineralogy.marble_smooth_wall": "大ç†çŸ³æŠ›å…‰å¢™", - "block.mineralogy.marble_smooth_brick_wall": "大ç†çŸ³æŠ›å…‰ç –墙", + "block.mineralogy.marble_smooth_wall": "磨制大ç†çŸ³å¢™", + "block.mineralogy.marble_smooth_brick_wall": "磨制大ç†çŸ³ç –墙", "block.mineralogy.slate_wall": "æ¿å²©å¢™", "block.mineralogy.slate_brick_wall": "æ¿å²©ç –墙", - "block.mineralogy.slate_smooth_wall": "æ¿å²©æŠ›å…‰å¢™", - "block.mineralogy.slate_smooth_brick_wall": "æ¿å²©æŠ›å…‰ç –墙", + "block.mineralogy.slate_smooth_wall": "磨制æ¿å²©å¢™", + "block.mineralogy.slate_smooth_brick_wall": "磨制æ¿å²©ç –墙", "block.mineralogy.schist_wall": "片岩墙", "block.mineralogy.schist_brick_wall": "片岩砖墙", - "block.mineralogy.schist_smooth_wall": "片岩抛光墙", - "block.mineralogy.schist_smooth_brick_wall": "片岩抛光砖墙", + "block.mineralogy.schist_smooth_wall": "磨制片岩墙", + "block.mineralogy.schist_smooth_brick_wall": "磨制片岩砖墙", "block.mineralogy.gneiss_wall": "片麻岩墙", "block.mineralogy.gneiss_brick_wall": "片麻岩砖墙", - "block.mineralogy.gneiss_smooth_wall": "片麻岩抛光墙", - "block.mineralogy.gneiss_smooth_brick_wall": "片麻岩抛光砖墙", + "block.mineralogy.gneiss_smooth_wall": "磨制片麻岩墙", + "block.mineralogy.gneiss_smooth_brick_wall": "磨制片麻岩砖墙", "block.mineralogy.phyllite_wall": "åƒæžšå²©å¢™", "block.mineralogy.phyllite_brick_wall": "åƒæžšå²©ç –墙", - "block.mineralogy.phyllite_smooth_wall": "åƒæžšå²©æŠ›å…‰å¢™", - "block.mineralogy.phyllite_smooth_brick_wall": "åƒæžšå²©æŠ›å…‰ç –墙", - "block.mineralogy.amphibolite_wall": "闪岩墙", - "block.mineralogy.amphibolite_brick_wall": "闪岩砖墙", - "block.mineralogy.amphibolite_smooth_wall": "闪岩抛光墙", - "block.mineralogy.amphibolite_smooth_brick_wall": "闪岩抛光砖墙", - "block.mineralogy.andesite_furnace": "安山岩炉", - "block.mineralogy.andesite_brick_furnace": "安山石砖炉", - "block.mineralogy.andesite_smooth_furnace": "安山岩抛光炉", - "block.mineralogy.andesite_smooth_brick_furnace": "安山岩抛光砖炉", - "block.mineralogy.basalt_furnace": "玄武岩炉", - "block.mineralogy.basalt_brick_furnace": "玄武岩砖炉", - "block.mineralogy.basalt_smooth_furnace": "玄武岩抛光炉", - "block.mineralogy.basalt_smooth_brick_furnace": "玄武岩抛光砖炉", - "block.mineralogy.diorite_furnace": "闪长岩炉", - "block.mineralogy.diorite_brick_furnace": "闪长岩砖炉", - "block.mineralogy.diorite_smooth_furnace": "闪长岩抛光炉", - "block.mineralogy.diorite_smooth_brick_furnace": "闪长岩抛光砖炉", - "block.mineralogy.granite_furnace": "花岗岩炉", - "block.mineralogy.granite_brick_furnace": "花岗岩砖炉", - "block.mineralogy.granite_smooth_furnace": "花岗岩抛光炉", - "block.mineralogy.granite_smooth_brick_furnace": "花岗岩抛光砖炉", - "block.mineralogy.rhyolite_furnace": "æµçº¹å²©ç‚‰", - "block.mineralogy.rhyolite_brick_furnace": "æµçº¹å²©ç –炉", - "block.mineralogy.rhyolite_smooth_furnace": "æµçº¹å²©æŠ›å…‰ç‚‰", - "block.mineralogy.rhyolite_smooth_brick_furnace": "æµçº¹å²©æŠ›å…‰ç –炉", - "block.mineralogy.pegmatite_furnace": "伟晶岩炉", - "block.mineralogy.pegmatite_brick_furnace": "伟晶岩砖炉", - "block.mineralogy.pegmatite_smooth_furnace": "伟晶岩抛光炉", - "block.mineralogy.pegmatite_smooth_brick_furnace": "伟晶岩抛光砖炉", - "block.mineralogy.shale_furnace": "页岩炉", - "block.mineralogy.shale_brick_furnace": "页岩砖炉", - "block.mineralogy.shale_smooth_furnace": "页岩抛光炉", - "block.mineralogy.shale_smooth_brick_furnace": "页岩抛光砖炉", - "block.mineralogy.conglomerate_furnace": "砾岩炉", - "block.mineralogy.conglomerate_brick_furnace": "砾岩砖炉", - "block.mineralogy.conglomerate_smooth_furnace": "砾岩抛光炉", - "block.mineralogy.conglomerate_smooth_brick_furnace": "砾岩抛光砖炉", - "block.mineralogy.dolomite_furnace": "白云岩炉", - "block.mineralogy.dolomite_brick_furnace": "白云岩砖炉", - "block.mineralogy.dolomite_smooth_furnace": "白云岩抛光炉", - "block.mineralogy.dolomite_smooth_brick_furnace": "白云岩抛光砖炉", - "block.mineralogy.limestone_furnace": "石ç°çŸ³ç‚‰", - "block.mineralogy.limestone_brick_furnace": "石ç°çŸ³ç –炉", - "block.mineralogy.limestone_smooth_furnace": "石ç°çŸ³æŠ›å…‰ç‚‰", - "block.mineralogy.limestone_smooth_brick_furnace": "石ç°çŸ³æŠ›å…‰ç –炉", - "block.mineralogy.marble_furnace": "大ç†çŸ³ç‚‰", - "block.mineralogy.marble_brick_furnace": "大ç†çŸ³ç –炉", - "block.mineralogy.marble_smooth_furnace": "大ç†çŸ³æŠ›å…‰ç‚‰", - "block.mineralogy.marble_smooth_brick_furnace": "大ç†çŸ³æŠ›å…‰ç –炉", - "block.mineralogy.slate_furnace": "æ¿å²©ç‚‰", - "block.mineralogy.slate_brick_furnace": "æ¿å²©ç –炉", - "block.mineralogy.slate_smooth_furnace": "æ¿å²©æŠ›å…‰ç‚‰", - "block.mineralogy.slate_smooth_brick_furnace": "æ¿å²©æŠ›å…‰ç –炉", - "block.mineralogy.schist_furnace": "片岩炉", - "block.mineralogy.schist_brick_furnace": "片岩砖炉", - "block.mineralogy.schist_smooth_furnace": "片岩抛光炉", - "block.mineralogy.schist_smooth_brick_furnace": "片岩抛光砖炉", - "block.mineralogy.gneiss_furnace": "片麻岩炉", - "block.mineralogy.gneiss_brick_furnace": "片麻岩砖炉", - "block.mineralogy.gneiss_smooth_furnace": "片麻岩抛光炉", - "block.mineralogy.gneiss_smooth_brick_furnace": "片麻岩抛光砖炉", - "block.mineralogy.phyllite_furnace": "åƒæžšå²©ç‚‰", - "block.mineralogy.phyllite_brick_furnace": "åƒæžšå²©ç –炉", - "block.mineralogy.phyllite_smooth_furnace": "åƒæžšå²©æŠ›å…‰ç‚‰", - "block.mineralogy.phyllite_smooth_brick_furnace": "åƒæžšå²©æŠ›å…‰ç –炉", - "block.mineralogy.amphibolite_furnace": "闪岩炉", - "block.mineralogy.amphibolite_brick_furnace": "闪岩砖炉", - "block.mineralogy.amphibolite_smooth_furnace": "闪岩抛光炉", - "block.mineralogy.amphibolite_smooth_brick_furnace": "闪岩抛光砖炉", + "block.mineralogy.phyllite_smooth_wall": "磨制åƒæžšå²©å¢™", + "block.mineralogy.phyllite_smooth_brick_wall": "磨制åƒæžšå²©ç –墙", + "block.mineralogy.amphibolite_wall": "角闪岩墙", + "block.mineralogy.amphibolite_brick_wall": "角闪岩砖墙", + "block.mineralogy.amphibolite_smooth_wall": "磨制角闪岩墙", + "block.mineralogy.amphibolite_smooth_brick_wall": "磨制角闪岩砖墙", + "block.mineralogy.andesite_furnace": "安山岩熔炉", + "block.mineralogy.andesite_brick_furnace": "安山岩砖熔炉", + "block.mineralogy.andesite_smooth_furnace": "磨制安山岩熔炉", + "block.mineralogy.andesite_smooth_brick_furnace": "磨制安山岩砖熔炉", + "block.mineralogy.basalt_furnace": "玄武岩熔炉", + "block.mineralogy.basalt_brick_furnace": "玄武岩砖熔炉", + "block.mineralogy.basalt_smooth_furnace": "磨制玄武岩熔炉", + "block.mineralogy.basalt_smooth_brick_furnace": "磨制玄武岩砖熔炉", + "block.mineralogy.diorite_furnace": "闪长岩熔炉", + "block.mineralogy.diorite_brick_furnace": "闪长岩砖熔炉", + "block.mineralogy.diorite_smooth_furnace": "磨制闪长岩熔炉", + "block.mineralogy.diorite_smooth_brick_furnace": "磨制闪长岩砖熔炉", + "block.mineralogy.granite_furnace": "花岗岩熔炉", + "block.mineralogy.granite_brick_furnace": "花岗岩砖熔炉", + "block.mineralogy.granite_smooth_furnace": "磨制花岗岩熔炉", + "block.mineralogy.granite_smooth_brick_furnace": "磨制花岗岩砖熔炉", + "block.mineralogy.rhyolite_furnace": "æµçº¹å²©ç†”炉", + "block.mineralogy.rhyolite_brick_furnace": "æµçº¹å²©ç –熔炉", + "block.mineralogy.rhyolite_smooth_furnace": "磨制æµçº¹å²©ç†”炉", + "block.mineralogy.rhyolite_smooth_brick_furnace": "磨制æµçº¹å²©ç –熔炉", + "block.mineralogy.pegmatite_furnace": "伟晶岩熔炉", + "block.mineralogy.pegmatite_brick_furnace": "伟晶岩砖熔炉", + "block.mineralogy.pegmatite_smooth_furnace": "磨制伟晶岩熔炉", + "block.mineralogy.pegmatite_smooth_brick_furnace": "磨制伟晶岩砖熔炉", + "block.mineralogy.shale_furnace": "页岩熔炉", + "block.mineralogy.shale_brick_furnace": "页岩砖熔炉", + "block.mineralogy.shale_smooth_furnace": "磨制页岩熔炉", + "block.mineralogy.shale_smooth_brick_furnace": "磨制页岩砖熔炉", + "block.mineralogy.conglomerate_furnace": "砾岩熔炉", + "block.mineralogy.conglomerate_brick_furnace": "砾岩砖熔炉", + "block.mineralogy.conglomerate_smooth_furnace": "磨制砾岩熔炉", + "block.mineralogy.conglomerate_smooth_brick_furnace": "磨制砾岩砖熔炉", + "block.mineralogy.dolomite_furnace": "白云岩熔炉", + "block.mineralogy.dolomite_brick_furnace": "白云岩砖熔炉", + "block.mineralogy.dolomite_smooth_furnace": "磨制白云岩熔炉", + "block.mineralogy.dolomite_smooth_brick_furnace": "磨制白云岩砖熔炉", + "block.mineralogy.limestone_furnace": "石ç°çŸ³ç†”炉", + "block.mineralogy.limestone_brick_furnace": "石ç°çŸ³ç –熔炉", + "block.mineralogy.limestone_smooth_furnace": "磨制石ç°çŸ³ç†”炉", + "block.mineralogy.limestone_smooth_brick_furnace": "磨制石ç°çŸ³ç –熔炉", + "block.mineralogy.marble_furnace": "大ç†çŸ³ç†”炉", + "block.mineralogy.marble_brick_furnace": "大ç†çŸ³ç –熔炉", + "block.mineralogy.marble_smooth_furnace": "磨制大ç†çŸ³ç†”炉", + "block.mineralogy.marble_smooth_brick_furnace": "磨制大ç†çŸ³ç –熔炉", + "block.mineralogy.slate_furnace": "æ¿å²©ç†”炉", + "block.mineralogy.slate_brick_furnace": "æ¿å²©ç –熔炉", + "block.mineralogy.slate_smooth_furnace": "磨制æ¿å²©ç†”炉", + "block.mineralogy.slate_smooth_brick_furnace": "磨制æ¿å²©ç –熔炉", + "block.mineralogy.schist_furnace": "片岩熔炉", + "block.mineralogy.schist_brick_furnace": "片岩砖熔炉", + "block.mineralogy.schist_smooth_furnace": "磨制片岩熔炉", + "block.mineralogy.schist_smooth_brick_furnace": "磨制片岩砖熔炉", + "block.mineralogy.gneiss_furnace": "片麻岩熔炉", + "block.mineralogy.gneiss_brick_furnace": "片麻岩砖熔炉", + "block.mineralogy.gneiss_smooth_furnace": "磨制片麻岩熔炉", + "block.mineralogy.gneiss_smooth_brick_furnace": "磨制片麻岩砖熔炉", + "block.mineralogy.phyllite_furnace": "åƒæžšå²©ç†”炉", + "block.mineralogy.phyllite_brick_furnace": "åƒæžšå²©ç –熔炉", + "block.mineralogy.phyllite_smooth_furnace": "磨制åƒæžšå²©ç†”炉", + "block.mineralogy.phyllite_smooth_brick_furnace": "磨制åƒæžšå²©ç –熔炉", + "block.mineralogy.amphibolite_furnace": "角闪岩熔炉", + "block.mineralogy.amphibolite_brick_furnace": "角闪岩砖熔炉", + "block.mineralogy.amphibolite_smooth_furnace": "磨制角闪岩熔炉", + "block.mineralogy.amphibolite_smooth_brick_furnace": "磨制角闪岩砖熔炉", "block.mineralogy.diabase": "辉绿岩", - "block.mineralogy.diabase_stairs": "辉绿岩 楼梯", - "block.mineralogy.diabase_slab": "辉绿岩 æ¿", - "block.mineralogy.diabase_brick": "辉绿岩 ç –", - "block.mineralogy.diabase_brick_stairs": "辉绿岩 砖楼梯", - "block.mineralogy.diabase_brick_slab": "辉绿岩 ç –æ¿", - "block.mineralogy.diabase_smooth": "Polished 辉绿岩", - "block.mineralogy.diabase_smooth_stairs": "辉绿岩 抛光楼梯", - "block.mineralogy.diabase_smooth_slab": "辉绿岩 抛光æ¿", - "block.mineralogy.diabase_smooth_brick": "辉绿岩 抛光砖", - "block.mineralogy.diabase_smooth_brick_stairs": "辉绿岩 抛光砖楼梯", - "block.mineralogy.diabase_smooth_brick_slab": "辉绿岩 抛光砖æ¿", - "block.mineralogy.diabase_wall": "辉绿岩 Wall", - "block.mineralogy.diabase_brick_wall": "辉绿岩 砖墙", - "block.mineralogy.diabase_smooth_wall": "辉绿岩 抛光墙", - "block.mineralogy.diabase_smooth_brick_wall": "辉绿岩 抛光砖墙", - "block.mineralogy.diabase_furnace": "辉绿岩 炉", - "block.mineralogy.diabase_brick_furnace": "辉绿岩 砖炉", - "block.mineralogy.diabase_smooth_furnace": "辉绿岩 抛光炉", - "block.mineralogy.diabase_smooth_brick_furnace": "辉绿岩 抛光砖炉", + "block.mineralogy.diabase_stairs": "辉绿岩楼梯", + "block.mineralogy.diabase_slab": "辉绿岩å°é˜¶", + "block.mineralogy.diabase_brick": "辉绿岩砖", + "block.mineralogy.diabase_brick_stairs": "辉绿岩砖楼梯", + "block.mineralogy.diabase_brick_slab": "辉绿岩砖å°é˜¶", + "block.mineralogy.diabase_smooth": "磨制辉绿岩", + "block.mineralogy.diabase_smooth_stairs": "磨制辉绿岩楼梯", + "block.mineralogy.diabase_smooth_slab": "磨制辉绿岩å°é˜¶", + "block.mineralogy.diabase_smooth_brick": "磨制辉绿岩砖", + "block.mineralogy.diabase_smooth_brick_stairs": "磨制辉绿岩砖楼梯", + "block.mineralogy.diabase_smooth_brick_slab": "磨制辉绿岩砖å°é˜¶", + "block.mineralogy.diabase_wall": "辉绿岩墙", + "block.mineralogy.diabase_brick_wall": "辉绿岩砖墙", + "block.mineralogy.diabase_smooth_wall": "磨制辉绿岩墙", + "block.mineralogy.diabase_smooth_brick_wall": "磨制辉绿岩砖墙", + "block.mineralogy.diabase_furnace": "辉绿岩熔炉", + "block.mineralogy.diabase_brick_furnace": "辉绿岩砖熔炉", + "block.mineralogy.diabase_smooth_furnace": "磨制辉绿岩熔炉", + "block.mineralogy.diabase_smooth_brick_furnace": "磨制辉绿岩砖熔炉", "block.mineralogy.gabbro": "辉长岩", - "block.mineralogy.gabbro_stairs": "辉长岩 楼梯", - "block.mineralogy.gabbro_slab": "辉长岩 æ¿", - "block.mineralogy.gabbro_brick": "辉长岩 ç –", - "block.mineralogy.gabbro_brick_stairs": "辉长岩 砖楼梯", - "block.mineralogy.gabbro_brick_slab": "辉长岩 ç –æ¿", - "block.mineralogy.gabbro_smooth": "Polished 辉长岩", - "block.mineralogy.gabbro_smooth_stairs": "辉长岩 抛光楼梯", - "block.mineralogy.gabbro_smooth_slab": "辉长岩 抛光æ¿", - "block.mineralogy.gabbro_smooth_brick": "辉长岩 抛光砖", - "block.mineralogy.gabbro_smooth_brick_stairs": "辉长岩 抛光砖楼梯", - "block.mineralogy.gabbro_smooth_brick_slab": "辉长岩 抛光砖æ¿", - "block.mineralogy.gabbro_wall": "辉长岩 Wall", - "block.mineralogy.gabbro_brick_wall": "辉长岩 砖墙", - "block.mineralogy.gabbro_smooth_wall": "辉长岩 抛光墙", - "block.mineralogy.gabbro_smooth_brick_wall": "辉长岩 抛光砖墙", - "block.mineralogy.gabbro_furnace": "辉长岩 炉", - "block.mineralogy.gabbro_brick_furnace": "辉长岩 砖炉", - "block.mineralogy.gabbro_smooth_furnace": "辉长岩 抛光炉", - "block.mineralogy.gabbro_smooth_brick_furnace": "辉长岩 抛光砖炉", + "block.mineralogy.gabbro_stairs": "辉长岩楼梯", + "block.mineralogy.gabbro_slab": "辉长岩å°é˜¶", + "block.mineralogy.gabbro_brick": "辉长岩砖", + "block.mineralogy.gabbro_brick_stairs": "辉长岩砖楼梯", + "block.mineralogy.gabbro_brick_slab": "辉长岩砖å°é˜¶", + "block.mineralogy.gabbro_smooth": "磨制辉长岩", + "block.mineralogy.gabbro_smooth_stairs": "磨制辉长岩楼梯", + "block.mineralogy.gabbro_smooth_slab": "磨制辉长岩å°é˜¶", + "block.mineralogy.gabbro_smooth_brick": "磨制辉长岩砖", + "block.mineralogy.gabbro_smooth_brick_stairs": "磨制辉长岩砖楼梯", + "block.mineralogy.gabbro_smooth_brick_slab": "磨制辉长岩砖å°é˜¶", + "block.mineralogy.gabbro_wall": "辉长岩墙", + "block.mineralogy.gabbro_brick_wall": "辉长岩砖墙", + "block.mineralogy.gabbro_smooth_wall": "磨制辉长岩墙", + "block.mineralogy.gabbro_smooth_brick_wall": "磨制辉长岩砖墙", + "block.mineralogy.gabbro_furnace": "辉长岩熔炉", + "block.mineralogy.gabbro_brick_furnace": "辉长岩砖熔炉", + "block.mineralogy.gabbro_smooth_furnace": "磨制辉长岩熔炉", + "block.mineralogy.gabbro_smooth_brick_furnace": "磨制辉长岩砖熔炉", "block.mineralogy.peridotite": "橄榄岩", - "block.mineralogy.peridotite_stairs": "橄榄岩 楼梯", - "block.mineralogy.peridotite_slab": "橄榄岩 æ¿", - "block.mineralogy.peridotite_brick": "橄榄岩 ç –", - "block.mineralogy.peridotite_brick_stairs": "橄榄岩 砖楼梯", - "block.mineralogy.peridotite_brick_slab": "橄榄岩 ç –æ¿", - "block.mineralogy.peridotite_smooth": "Polished 橄榄岩", - "block.mineralogy.peridotite_smooth_stairs": "橄榄岩 抛光楼梯", - "block.mineralogy.peridotite_smooth_slab": "橄榄岩 抛光æ¿", - "block.mineralogy.peridotite_smooth_brick": "橄榄岩 抛光砖", - "block.mineralogy.peridotite_smooth_brick_stairs": "橄榄岩 抛光砖楼梯", - "block.mineralogy.peridotite_smooth_brick_slab": "橄榄岩 抛光砖æ¿", - "block.mineralogy.peridotite_wall": "橄榄岩 Wall", - "block.mineralogy.peridotite_brick_wall": "橄榄岩 砖墙", - "block.mineralogy.peridotite_smooth_wall": "橄榄岩 抛光墙", - "block.mineralogy.peridotite_smooth_brick_wall": "橄榄岩 抛光砖墙", - "block.mineralogy.peridotite_furnace": "橄榄岩 炉", - "block.mineralogy.peridotite_brick_furnace": "橄榄岩 砖炉", - "block.mineralogy.peridotite_smooth_furnace": "橄榄岩 抛光炉", - "block.mineralogy.peridotite_smooth_brick_furnace": "橄榄岩 抛光砖炉", - "block.mineralogy.basaltic_glass": "玄武玻璃", - "block.mineralogy.basaltic_glass_stairs": "玄武玻璃 楼梯", - "block.mineralogy.basaltic_glass_slab": "玄武玻璃 æ¿", - "block.mineralogy.basaltic_glass_brick": "玄武玻璃 ç –", - "block.mineralogy.basaltic_glass_brick_stairs": "玄武玻璃 砖楼梯", - "block.mineralogy.basaltic_glass_brick_slab": "玄武玻璃 ç –æ¿", - "block.mineralogy.basaltic_glass_smooth": "Polished 玄武玻璃", - "block.mineralogy.basaltic_glass_smooth_stairs": "玄武玻璃 抛光楼梯", - "block.mineralogy.basaltic_glass_smooth_slab": "玄武玻璃 抛光æ¿", - "block.mineralogy.basaltic_glass_smooth_brick": "玄武玻璃 抛光砖", - "block.mineralogy.basaltic_glass_smooth_brick_stairs": "玄武玻璃 抛光砖楼梯", - "block.mineralogy.basaltic_glass_smooth_brick_slab": "玄武玻璃 抛光砖æ¿", - "block.mineralogy.basaltic_glass_wall": "玄武玻璃 Wall", - "block.mineralogy.basaltic_glass_brick_wall": "玄武玻璃 砖墙", - "block.mineralogy.basaltic_glass_smooth_wall": "玄武玻璃 抛光墙", - "block.mineralogy.basaltic_glass_smooth_brick_wall": "玄武玻璃 抛光砖墙", - "block.mineralogy.basaltic_glass_furnace": "玄武玻璃 炉", - "block.mineralogy.basaltic_glass_brick_furnace": "玄武玻璃 砖炉", - "block.mineralogy.basaltic_glass_smooth_furnace": "玄武玻璃 抛光炉", - "block.mineralogy.basaltic_glass_smooth_brick_furnace": "玄武玻璃 抛光砖炉", - "block.mineralogy.scoria": "矿渣", - "block.mineralogy.scoria_stairs": "矿渣 楼梯", - "block.mineralogy.scoria_slab": "矿渣 æ¿", - "block.mineralogy.scoria_brick": "矿渣 ç –", - "block.mineralogy.scoria_brick_stairs": "矿渣 砖楼梯", - "block.mineralogy.scoria_brick_slab": "矿渣 ç –æ¿", - "block.mineralogy.scoria_smooth": "Polished 矿渣", - "block.mineralogy.scoria_smooth_stairs": "矿渣 抛光楼梯", - "block.mineralogy.scoria_smooth_slab": "矿渣 抛光æ¿", - "block.mineralogy.scoria_smooth_brick": "矿渣 抛光砖", - "block.mineralogy.scoria_smooth_brick_stairs": "矿渣 抛光砖楼梯", - "block.mineralogy.scoria_smooth_brick_slab": "矿渣 抛光砖æ¿", - "block.mineralogy.scoria_wall": "矿渣 Wall", - "block.mineralogy.scoria_brick_wall": "矿渣 砖墙", - "block.mineralogy.scoria_smooth_wall": "矿渣 抛光墙", - "block.mineralogy.scoria_smooth_brick_wall": "矿渣 抛光砖墙", - "block.mineralogy.scoria_furnace": "矿渣 炉", - "block.mineralogy.scoria_brick_furnace": "矿渣 砖炉", - "block.mineralogy.scoria_smooth_furnace": "矿渣 抛光炉", - "block.mineralogy.scoria_smooth_brick_furnace": "矿渣 抛光砖炉", + "block.mineralogy.peridotite_stairs": "橄榄岩楼梯", + "block.mineralogy.peridotite_slab": "橄榄岩å°é˜¶", + "block.mineralogy.peridotite_brick": "橄榄岩砖", + "block.mineralogy.peridotite_brick_stairs": "橄榄岩砖楼梯", + "block.mineralogy.peridotite_brick_slab": "橄榄岩砖å°é˜¶", + "block.mineralogy.peridotite_smooth": "磨制橄榄岩", + "block.mineralogy.peridotite_smooth_stairs": "磨制橄榄岩楼梯", + "block.mineralogy.peridotite_smooth_slab": "磨制橄榄岩å°é˜¶", + "block.mineralogy.peridotite_smooth_brick": "磨制橄榄岩砖", + "block.mineralogy.peridotite_smooth_brick_stairs": "磨制橄榄岩砖楼梯", + "block.mineralogy.peridotite_smooth_brick_slab": "磨制橄榄岩砖å°é˜¶", + "block.mineralogy.peridotite_wall": "橄榄岩墙", + "block.mineralogy.peridotite_brick_wall": "橄榄岩砖墙", + "block.mineralogy.peridotite_smooth_wall": "磨制橄榄岩墙", + "block.mineralogy.peridotite_smooth_brick_wall": "磨制橄榄岩砖墙", + "block.mineralogy.peridotite_furnace": "橄榄岩熔炉", + "block.mineralogy.peridotite_brick_furnace": "橄榄岩砖熔炉", + "block.mineralogy.peridotite_smooth_furnace": "磨制橄榄岩熔炉", + "block.mineralogy.peridotite_smooth_brick_furnace": "磨制橄榄岩砖熔炉", + "block.mineralogy.basaltic_glass": "玄武岩质玻璃", + "block.mineralogy.basaltic_glass_stairs": "玄武岩质玻璃楼梯", + "block.mineralogy.basaltic_glass_slab": "玄武岩质玻璃å°é˜¶", + "block.mineralogy.basaltic_glass_brick": "玄武岩质玻璃砖", + "block.mineralogy.basaltic_glass_brick_stairs": "玄武岩质玻璃砖楼梯", + "block.mineralogy.basaltic_glass_brick_slab": "玄武岩质玻璃砖å°é˜¶", + "block.mineralogy.basaltic_glass_smooth": "磨制玄武岩质玻璃", + "block.mineralogy.basaltic_glass_smooth_stairs": "磨制玄武岩质玻璃楼梯", + "block.mineralogy.basaltic_glass_smooth_slab": "磨制玄武岩质玻璃å°é˜¶", + "block.mineralogy.basaltic_glass_smooth_brick": "磨制玄武岩质玻璃砖", + "block.mineralogy.basaltic_glass_smooth_brick_stairs": "磨制玄武岩质玻璃砖楼梯", + "block.mineralogy.basaltic_glass_smooth_brick_slab": "磨制玄武岩质玻璃砖å°é˜¶", + "block.mineralogy.basaltic_glass_wall": "玄武岩质玻璃墙", + "block.mineralogy.basaltic_glass_brick_wall": "玄武岩质玻璃砖墙", + "block.mineralogy.basaltic_glass_smooth_wall": "磨制玄武岩质玻璃墙", + "block.mineralogy.basaltic_glass_smooth_brick_wall": "磨制玄武岩质玻璃砖墙", + "block.mineralogy.basaltic_glass_furnace": "玄武岩质玻璃熔炉", + "block.mineralogy.basaltic_glass_brick_furnace": "玄武岩质玻璃砖熔炉", + "block.mineralogy.basaltic_glass_smooth_furnace": "磨制玄武岩质玻璃熔炉", + "block.mineralogy.basaltic_glass_smooth_brick_furnace": "磨制玄武岩质玻璃砖熔炉", + "block.mineralogy.scoria": "ç«å±±æ¸£", + "block.mineralogy.scoria_stairs": "ç«å±±æ¸£æ¥¼æ¢¯", + "block.mineralogy.scoria_slab": "ç«å±±æ¸£å°é˜¶", + "block.mineralogy.scoria_brick": "ç«å±±æ¸£ç –", + "block.mineralogy.scoria_brick_stairs": "ç«å±±æ¸£ç –楼梯", + "block.mineralogy.scoria_brick_slab": "ç«å±±æ¸£ç –å°é˜¶", + "block.mineralogy.scoria_smooth": "磨制ç«å±±æ¸£", + "block.mineralogy.scoria_smooth_stairs": "磨制ç«å±±æ¸£æ¥¼æ¢¯", + "block.mineralogy.scoria_smooth_slab": "磨制ç«å±±æ¸£å°é˜¶", + "block.mineralogy.scoria_smooth_brick": "磨制ç«å±±æ¸£ç –", + "block.mineralogy.scoria_smooth_brick_stairs": "磨制ç«å±±æ¸£ç –楼梯", + "block.mineralogy.scoria_smooth_brick_slab": "磨制ç«å±±æ¸£ç –å°é˜¶", + "block.mineralogy.scoria_wall": "ç«å±±æ¸£å¢™", + "block.mineralogy.scoria_brick_wall": "ç«å±±æ¸£ç –墙", + "block.mineralogy.scoria_smooth_wall": "磨制ç«å±±æ¸£å¢™", + "block.mineralogy.scoria_smooth_brick_wall": "磨制ç«å±±æ¸£ç –墙", + "block.mineralogy.scoria_furnace": "ç«å±±æ¸£ç†”炉", + "block.mineralogy.scoria_brick_furnace": "ç«å±±æ¸£ç –熔炉", + "block.mineralogy.scoria_smooth_furnace": "磨制ç«å±±æ¸£ç†”炉", + "block.mineralogy.scoria_smooth_brick_furnace": "磨制ç«å±±æ¸£ç –熔炉", "block.mineralogy.tuff": "å‡ç°å²©", - "block.mineralogy.tuff_stairs": "å‡ç°å²© 楼梯", - "block.mineralogy.tuff_slab": "å‡ç°å²© æ¿", - "block.mineralogy.tuff_brick": "å‡ç°å²© ç –", - "block.mineralogy.tuff_brick_stairs": "å‡ç°å²© 砖楼梯", - "block.mineralogy.tuff_brick_slab": "å‡ç°å²© ç –æ¿", - "block.mineralogy.tuff_smooth": "Polished å‡ç°å²©", - "block.mineralogy.tuff_smooth_stairs": "å‡ç°å²© 抛光楼梯", - "block.mineralogy.tuff_smooth_slab": "å‡ç°å²© 抛光æ¿", - "block.mineralogy.tuff_smooth_brick": "å‡ç°å²© 抛光砖", - "block.mineralogy.tuff_smooth_brick_stairs": "å‡ç°å²© 抛光砖楼梯", - "block.mineralogy.tuff_smooth_brick_slab": "å‡ç°å²© 抛光砖æ¿", - "block.mineralogy.tuff_wall": "å‡ç°å²© Wall", - "block.mineralogy.tuff_brick_wall": "å‡ç°å²© 砖墙", - "block.mineralogy.tuff_smooth_wall": "å‡ç°å²© 抛光墙", - "block.mineralogy.tuff_smooth_brick_wall": "å‡ç°å²© 抛光砖墙", - "block.mineralogy.tuff_furnace": "å‡ç°å²© 炉", - "block.mineralogy.tuff_brick_furnace": "å‡ç°å²© 砖炉", - "block.mineralogy.tuff_smooth_furnace": "å‡ç°å²© 抛光炉", - "block.mineralogy.tuff_smooth_brick_furnace": "å‡ç°å²© 抛光砖炉", + "block.mineralogy.tuff_stairs": "å‡ç°å²©æ¥¼æ¢¯", + "block.mineralogy.tuff_slab": "å‡ç°å²©å°é˜¶", + "block.mineralogy.tuff_brick": "å‡ç°å²©ç –", + "block.mineralogy.tuff_brick_stairs": "å‡ç°å²©ç –楼梯", + "block.mineralogy.tuff_brick_slab": "å‡ç°å²©ç –å°é˜¶", + "block.mineralogy.tuff_smooth": "磨制å‡ç°å²©", + "block.mineralogy.tuff_smooth_stairs": "磨制å‡ç°å²©æ¥¼æ¢¯", + "block.mineralogy.tuff_smooth_slab": "磨制å‡ç°å²©å°é˜¶", + "block.mineralogy.tuff_smooth_brick": "磨制å‡ç°å²©ç –", + "block.mineralogy.tuff_smooth_brick_stairs": "磨制å‡ç°å²©ç –楼梯", + "block.mineralogy.tuff_smooth_brick_slab": "磨制å‡ç°å²©ç –å°é˜¶", + "block.mineralogy.tuff_wall": "å‡ç°å²©å¢™", + "block.mineralogy.tuff_brick_wall": "å‡ç°å²©ç –墙", + "block.mineralogy.tuff_smooth_wall": "磨制å‡ç°å²©å¢™", + "block.mineralogy.tuff_smooth_brick_wall": "磨制å‡ç°å²©ç –墙", + "block.mineralogy.tuff_furnace": "å‡ç°å²©ç†”炉", + "block.mineralogy.tuff_brick_furnace": "å‡ç°å²©ç –熔炉", + "block.mineralogy.tuff_smooth_furnace": "磨制å‡ç°å²©ç†”炉", + "block.mineralogy.tuff_smooth_brick_furnace": "磨制å‡ç°å²©ç –熔炉", "block.mineralogy.siltstone": "粉砂岩", - "block.mineralogy.siltstone_stairs": "粉砂岩 楼梯", - "block.mineralogy.siltstone_slab": "粉砂岩 æ¿", - "block.mineralogy.siltstone_brick": "粉砂岩 ç –", - "block.mineralogy.siltstone_brick_stairs": "粉砂岩 砖楼梯", - "block.mineralogy.siltstone_brick_slab": "粉砂岩 ç –æ¿", - "block.mineralogy.siltstone_smooth": "Polished 粉砂岩", - "block.mineralogy.siltstone_smooth_stairs": "粉砂岩 抛光楼梯", - "block.mineralogy.siltstone_smooth_slab": "粉砂岩 抛光æ¿", - "block.mineralogy.siltstone_smooth_brick": "粉砂岩 抛光砖", - "block.mineralogy.siltstone_smooth_brick_stairs": "粉砂岩 抛光砖楼梯", - "block.mineralogy.siltstone_smooth_brick_slab": "粉砂岩 抛光砖æ¿", - "block.mineralogy.siltstone_wall": "粉砂岩 Wall", - "block.mineralogy.siltstone_brick_wall": "粉砂岩 砖墙", - "block.mineralogy.siltstone_smooth_wall": "粉砂岩 抛光墙", - "block.mineralogy.siltstone_smooth_brick_wall": "粉砂岩 抛光砖墙", - "block.mineralogy.siltstone_furnace": "粉砂岩 炉", - "block.mineralogy.siltstone_brick_furnace": "粉砂岩 砖炉", - "block.mineralogy.siltstone_smooth_furnace": "粉砂岩 抛光炉", - "block.mineralogy.siltstone_smooth_brick_furnace": "粉砂岩 抛光砖炉", + "block.mineralogy.siltstone_stairs": "粉砂岩楼梯", + "block.mineralogy.siltstone_slab": "粉砂岩å°é˜¶", + "block.mineralogy.siltstone_brick": "粉砂岩砖", + "block.mineralogy.siltstone_brick_stairs": "粉砂岩砖楼梯", + "block.mineralogy.siltstone_brick_slab": "粉砂岩砖å°é˜¶", + "block.mineralogy.siltstone_smooth": "磨制粉砂岩", + "block.mineralogy.siltstone_smooth_stairs": "磨制粉砂岩楼梯", + "block.mineralogy.siltstone_smooth_slab": "磨制粉砂岩å°é˜¶", + "block.mineralogy.siltstone_smooth_brick": "磨制粉砂岩砖", + "block.mineralogy.siltstone_smooth_brick_stairs": "磨制粉砂岩砖楼梯", + "block.mineralogy.siltstone_smooth_brick_slab": "磨制粉砂岩砖å°é˜¶", + "block.mineralogy.siltstone_wall": "粉砂岩墙", + "block.mineralogy.siltstone_brick_wall": "粉砂岩砖墙", + "block.mineralogy.siltstone_smooth_wall": "磨制粉砂岩墙", + "block.mineralogy.siltstone_smooth_brick_wall": "磨制粉砂岩砖墙", + "block.mineralogy.siltstone_furnace": "粉砂岩熔炉", + "block.mineralogy.siltstone_brick_furnace": "粉砂岩砖熔炉", + "block.mineralogy.siltstone_smooth_furnace": "磨制粉砂岩熔炉", + "block.mineralogy.siltstone_smooth_brick_furnace": "磨制粉砂岩砖熔炉", "block.mineralogy.rock_salt": "岩ç›", - "block.mineralogy.rock_salt_stairs": "å²©ç› æ¥¼æ¢¯", - "block.mineralogy.rock_salt_slab": "å²©ç› æ¿", - "block.mineralogy.rock_salt_brick": "å²©ç› ç –", - "block.mineralogy.rock_salt_brick_stairs": "å²©ç› ç –æ¥¼æ¢¯", - "block.mineralogy.rock_salt_brick_slab": "å²©ç› ç –æ¿", - "block.mineralogy.rock_salt_smooth": "Polished 岩ç›", - "block.mineralogy.rock_salt_smooth_stairs": "å²©ç› æŠ›å…‰æ¥¼æ¢¯", - "block.mineralogy.rock_salt_smooth_slab": "å²©ç› æŠ›å…‰æ¿", - "block.mineralogy.rock_salt_smooth_brick": "å²©ç› æŠ›å…‰ç –", - "block.mineralogy.rock_salt_smooth_brick_stairs": "å²©ç› æŠ›å…‰ç –æ¥¼æ¢¯", - "block.mineralogy.rock_salt_smooth_brick_slab": "å²©ç› æŠ›å…‰ç –æ¿", - "block.mineralogy.rock_salt_wall": "å²©ç› Wall", - "block.mineralogy.rock_salt_brick_wall": "å²©ç› ç –å¢™", - "block.mineralogy.rock_salt_smooth_wall": "å²©ç› æŠ›å…‰å¢™", - "block.mineralogy.rock_salt_smooth_brick_wall": "å²©ç› æŠ›å…‰ç –å¢™", - "block.mineralogy.rock_salt_furnace": "å²©ç› ç‚‰", - "block.mineralogy.rock_salt_brick_furnace": "å²©ç› ç –ç‚‰", - "block.mineralogy.rock_salt_smooth_furnace": "å²©ç› æŠ›å…‰ç‚‰", - "block.mineralogy.rock_salt_smooth_brick_furnace": "å²©ç› æŠ›å…‰ç –ç‚‰", + "block.mineralogy.rock_salt_stairs": "岩ç›æ¥¼æ¢¯", + "block.mineralogy.rock_salt_slab": "岩ç›å°é˜¶", + "block.mineralogy.rock_salt_brick": "岩ç›ç –", + "block.mineralogy.rock_salt_brick_stairs": "岩ç›ç –楼梯", + "block.mineralogy.rock_salt_brick_slab": "岩ç›ç –å°é˜¶", + "block.mineralogy.rock_salt_smooth": "磨制岩ç›", + "block.mineralogy.rock_salt_smooth_stairs": "磨制岩ç›æ¥¼æ¢¯", + "block.mineralogy.rock_salt_smooth_slab": "磨制岩ç›å°é˜¶", + "block.mineralogy.rock_salt_smooth_brick": "磨制岩ç›ç –", + "block.mineralogy.rock_salt_smooth_brick_stairs": "磨制岩ç›ç –楼梯", + "block.mineralogy.rock_salt_smooth_brick_slab": "磨制岩ç›ç –å°é˜¶", + "block.mineralogy.rock_salt_wall": "岩ç›å¢™", + "block.mineralogy.rock_salt_brick_wall": "岩ç›ç –墙", + "block.mineralogy.rock_salt_smooth_wall": "磨制岩ç›å¢™", + "block.mineralogy.rock_salt_smooth_brick_wall": "磨制岩ç›ç –墙", + "block.mineralogy.rock_salt_furnace": "岩ç›ç†”炉", + "block.mineralogy.rock_salt_brick_furnace": "岩ç›ç –熔炉", + "block.mineralogy.rock_salt_smooth_furnace": "磨制岩ç›ç†”炉", + "block.mineralogy.rock_salt_smooth_brick_furnace": "磨制岩ç›ç –熔炉", "block.mineralogy.hornfels": "角岩", - "block.mineralogy.hornfels_stairs": "角岩 楼梯", - "block.mineralogy.hornfels_slab": "角岩 æ¿", - "block.mineralogy.hornfels_brick": "角岩 ç –", - "block.mineralogy.hornfels_brick_stairs": "角岩 砖楼梯", - "block.mineralogy.hornfels_brick_slab": "角岩 ç –æ¿", - "block.mineralogy.hornfels_smooth": "Polished 角岩", - "block.mineralogy.hornfels_smooth_stairs": "角岩 抛光楼梯", - "block.mineralogy.hornfels_smooth_slab": "角岩 抛光æ¿", - "block.mineralogy.hornfels_smooth_brick": "角岩 抛光砖", - "block.mineralogy.hornfels_smooth_brick_stairs": "角岩 抛光砖楼梯", - "block.mineralogy.hornfels_smooth_brick_slab": "角岩 抛光砖æ¿", - "block.mineralogy.hornfels_wall": "角岩 Wall", - "block.mineralogy.hornfels_brick_wall": "角岩 砖墙", - "block.mineralogy.hornfels_smooth_wall": "角岩 抛光墙", - "block.mineralogy.hornfels_smooth_brick_wall": "角岩 抛光砖墙", - "block.mineralogy.hornfels_furnace": "角岩 炉", - "block.mineralogy.hornfels_brick_furnace": "角岩 砖炉", - "block.mineralogy.hornfels_smooth_furnace": "角岩 抛光炉", - "block.mineralogy.hornfels_smooth_brick_furnace": "角岩 抛光砖炉", + "block.mineralogy.hornfels_stairs": "角岩楼梯", + "block.mineralogy.hornfels_slab": "角岩å°é˜¶", + "block.mineralogy.hornfels_brick": "角岩砖", + "block.mineralogy.hornfels_brick_stairs": "角岩砖楼梯", + "block.mineralogy.hornfels_brick_slab": "角岩砖å°é˜¶", + "block.mineralogy.hornfels_smooth": "磨制角岩", + "block.mineralogy.hornfels_smooth_stairs": "磨制角岩楼梯", + "block.mineralogy.hornfels_smooth_slab": "磨制角岩å°é˜¶", + "block.mineralogy.hornfels_smooth_brick": "磨制角岩砖", + "block.mineralogy.hornfels_smooth_brick_stairs": "磨制角岩砖楼梯", + "block.mineralogy.hornfels_smooth_brick_slab": "磨制角岩砖å°é˜¶", + "block.mineralogy.hornfels_wall": "角岩墙", + "block.mineralogy.hornfels_brick_wall": "角岩砖墙", + "block.mineralogy.hornfels_smooth_wall": "磨制角岩墙", + "block.mineralogy.hornfels_smooth_brick_wall": "磨制角岩砖墙", + "block.mineralogy.hornfels_furnace": "角岩熔炉", + "block.mineralogy.hornfels_brick_furnace": "角岩砖熔炉", + "block.mineralogy.hornfels_smooth_furnace": "磨制角岩熔炉", + "block.mineralogy.hornfels_smooth_brick_furnace": "磨制角岩砖熔炉", "block.mineralogy.quartzite": "石英岩", - "block.mineralogy.quartzite_stairs": "石英岩 楼梯", - "block.mineralogy.quartzite_slab": "石英岩 æ¿", - "block.mineralogy.quartzite_brick": "石英岩 ç –", - "block.mineralogy.quartzite_brick_stairs": "石英岩 砖楼梯", - "block.mineralogy.quartzite_brick_slab": "石英岩 ç –æ¿", - "block.mineralogy.quartzite_smooth": "Polished 石英岩", - "block.mineralogy.quartzite_smooth_stairs": "石英岩 抛光楼梯", - "block.mineralogy.quartzite_smooth_slab": "石英岩 抛光æ¿", - "block.mineralogy.quartzite_smooth_brick": "石英岩 抛光砖", - "block.mineralogy.quartzite_smooth_brick_stairs": "石英岩 抛光砖楼梯", - "block.mineralogy.quartzite_smooth_brick_slab": "石英岩 抛光砖æ¿", - "block.mineralogy.quartzite_wall": "石英岩 Wall", - "block.mineralogy.quartzite_brick_wall": "石英岩 砖墙", - "block.mineralogy.quartzite_smooth_wall": "石英岩 抛光墙", - "block.mineralogy.quartzite_smooth_brick_wall": "石英岩 抛光砖墙", - "block.mineralogy.quartzite_furnace": "石英岩 炉", - "block.mineralogy.quartzite_brick_furnace": "石英岩 砖炉", - "block.mineralogy.quartzite_smooth_furnace": "石英岩 抛光炉", - "block.mineralogy.quartzite_smooth_brick_furnace": "石英岩 抛光砖炉", + "block.mineralogy.quartzite_stairs": "石英岩楼梯", + "block.mineralogy.quartzite_slab": "石英岩å°é˜¶", + "block.mineralogy.quartzite_brick": "石英岩砖", + "block.mineralogy.quartzite_brick_stairs": "石英岩砖楼梯", + "block.mineralogy.quartzite_brick_slab": "石英岩砖å°é˜¶", + "block.mineralogy.quartzite_smooth": "磨制石英岩", + "block.mineralogy.quartzite_smooth_stairs": "磨制石英岩楼梯", + "block.mineralogy.quartzite_smooth_slab": "磨制石英岩å°é˜¶", + "block.mineralogy.quartzite_smooth_brick": "磨制石英岩砖", + "block.mineralogy.quartzite_smooth_brick_stairs": "磨制石英岩砖楼梯", + "block.mineralogy.quartzite_smooth_brick_slab": "磨制石英岩砖å°é˜¶", + "block.mineralogy.quartzite_wall": "石英岩墙", + "block.mineralogy.quartzite_brick_wall": "石英岩砖墙", + "block.mineralogy.quartzite_smooth_wall": "磨制石英岩墙", + "block.mineralogy.quartzite_smooth_brick_wall": "磨制石英岩砖墙", + "block.mineralogy.quartzite_furnace": "石英岩熔炉", + "block.mineralogy.quartzite_brick_furnace": "石英岩砖熔炉", + "block.mineralogy.quartzite_smooth_furnace": "磨制石英岩熔炉", + "block.mineralogy.quartzite_smooth_brick_furnace": "磨制石英岩砖熔炉", "block.mineralogy.novaculite": "å‡å¯†çŸ³è‹±å²©", - "block.mineralogy.novaculite_stairs": "å‡å¯†çŸ³è‹±å²© 楼梯", - "block.mineralogy.novaculite_slab": "å‡å¯†çŸ³è‹±å²© æ¿", - "block.mineralogy.novaculite_brick": "å‡å¯†çŸ³è‹±å²© ç –", - "block.mineralogy.novaculite_brick_stairs": "å‡å¯†çŸ³è‹±å²© 砖楼梯", - "block.mineralogy.novaculite_brick_slab": "å‡å¯†çŸ³è‹±å²© ç –æ¿", - "block.mineralogy.novaculite_smooth": "Polished å‡å¯†çŸ³è‹±å²©", - "block.mineralogy.novaculite_smooth_stairs": "å‡å¯†çŸ³è‹±å²© 抛光楼梯", - "block.mineralogy.novaculite_smooth_slab": "å‡å¯†çŸ³è‹±å²© 抛光æ¿", - "block.mineralogy.novaculite_smooth_brick": "å‡å¯†çŸ³è‹±å²© 抛光砖", - "block.mineralogy.novaculite_smooth_brick_stairs": "å‡å¯†çŸ³è‹±å²© 抛光砖楼梯", - "block.mineralogy.novaculite_smooth_brick_slab": "å‡å¯†çŸ³è‹±å²© 抛光砖æ¿", - "block.mineralogy.novaculite_wall": "å‡å¯†çŸ³è‹±å²© Wall", - "block.mineralogy.novaculite_brick_wall": "å‡å¯†çŸ³è‹±å²© 砖墙", - "block.mineralogy.novaculite_smooth_wall": "å‡å¯†çŸ³è‹±å²© 抛光墙", - "block.mineralogy.novaculite_smooth_brick_wall": "å‡å¯†çŸ³è‹±å²© 抛光砖墙", - "block.mineralogy.novaculite_furnace": "å‡å¯†çŸ³è‹±å²© 炉", - "block.mineralogy.novaculite_brick_furnace": "å‡å¯†çŸ³è‹±å²© 砖炉", - "block.mineralogy.novaculite_smooth_furnace": "å‡å¯†çŸ³è‹±å²© 抛光炉", - "block.mineralogy.novaculite_smooth_brick_furnace": "å‡å¯†çŸ³è‹±å²© 抛光砖炉", - "block.mineralogy.chalk": "粉笔", - "item.mineralogy.chalk_dust": "粉笔粉", + "block.mineralogy.novaculite_stairs": "å‡å¯†çŸ³è‹±å²©æ¥¼æ¢¯", + "block.mineralogy.novaculite_slab": "å‡å¯†çŸ³è‹±å²©å°é˜¶", + "block.mineralogy.novaculite_brick": "å‡å¯†çŸ³è‹±å²©ç –", + "block.mineralogy.novaculite_brick_stairs": "å‡å¯†çŸ³è‹±å²©ç –楼梯", + "block.mineralogy.novaculite_brick_slab": "å‡å¯†çŸ³è‹±å²©ç –å°é˜¶", + "block.mineralogy.novaculite_smooth": "磨制å‡å¯†çŸ³è‹±å²©", + "block.mineralogy.novaculite_smooth_stairs": "磨制å‡å¯†çŸ³è‹±å²©æ¥¼æ¢¯", + "block.mineralogy.novaculite_smooth_slab": "磨制å‡å¯†çŸ³è‹±å²©å°é˜¶", + "block.mineralogy.novaculite_smooth_brick": "磨制å‡å¯†çŸ³è‹±å²©ç –", + "block.mineralogy.novaculite_smooth_brick_stairs": "磨制å‡å¯†çŸ³è‹±å²©ç –楼梯", + "block.mineralogy.novaculite_smooth_brick_slab": "磨制å‡å¯†çŸ³è‹±å²©ç –å°é˜¶", + "block.mineralogy.novaculite_wall": "å‡å¯†çŸ³è‹±å²©å¢™", + "block.mineralogy.novaculite_brick_wall": "å‡å¯†çŸ³è‹±å²©ç –墙", + "block.mineralogy.novaculite_smooth_wall": "磨制å‡å¯†çŸ³è‹±å²©å¢™", + "block.mineralogy.novaculite_smooth_brick_wall": "磨制å‡å¯†çŸ³è‹±å²©ç –墙", + "block.mineralogy.novaculite_furnace": "å‡å¯†çŸ³è‹±å²©ç†”炉", + "block.mineralogy.novaculite_brick_furnace": "å‡å¯†çŸ³è‹±å²©ç –熔炉", + "block.mineralogy.novaculite_smooth_furnace": "磨制å‡å¯†çŸ³è‹±å²©ç†”炉", + "block.mineralogy.novaculite_smooth_brick_furnace": "磨制å‡å¯†çŸ³è‹±å²©ç –熔炉", + "block.mineralogy.chalk": "白垩", + "item.mineralogy.chalk_dust": "白垩粉", "item.mineralogy.salt_dust": "ç›", "item.mineralogy.rock_salt_dust": "岩ç›æ™¶ä½“", + "block.mineralogy.rocksaltlamp": "岩ç›ç¯", "block.mineralogy.rocksaltstreetlamp": "岩ç›è·¯ç¯", - "block.mineralogy.andesite_relief_axe": "安山岩 斧头救济", - "block.mineralogy.andesite_relief_blank": "安山岩 空白的救济", - "block.mineralogy.andesite_relief_cross": "安山岩 交å‰æ•‘济", - "block.mineralogy.andesite_relief_hammer": "安山岩 锤å­æ•‘济", - "block.mineralogy.andesite_relief_hoe": "安山岩 锄头救济", - "block.mineralogy.andesite_relief_horizontal": "安山岩 水平救济", - "block.mineralogy.andesite_relief_i": "安山岩 I 浮雕", - "block.mineralogy.andesite_relief_left": "安山岩 左救济", - "block.mineralogy.andesite_relief_pickaxe": "安山岩 é•æ•‘济", - "block.mineralogy.andesite_relief_plus": "安山岩 加上救济", - "block.mineralogy.andesite_relief_right": "安山岩 正确的救济", - "block.mineralogy.andesite_relief_sword": "安山岩 剑救济", - "block.mineralogy.andesite_relief_vertical": "安山岩 垂直救济", - "block.mineralogy.basalt_relief_axe": "玄武岩 斧头救济", - "block.mineralogy.basalt_relief_blank": "玄武岩 空白的救济", - "block.mineralogy.basalt_relief_cross": "玄武岩 交å‰æ•‘济", - "block.mineralogy.basalt_relief_hammer": "玄武岩 锤å­æ•‘济", - "block.mineralogy.basalt_relief_hoe": "玄武岩 锄头救济", - "block.mineralogy.basalt_relief_horizontal": "玄武岩 水平救济", - "block.mineralogy.basalt_relief_i": "玄武岩 I 浮雕", - "block.mineralogy.basalt_relief_left": "玄武岩 左救济", - "block.mineralogy.basalt_relief_pickaxe": "玄武岩 é•æ•‘济", - "block.mineralogy.basalt_relief_plus": "玄武岩 加上救济", - "block.mineralogy.basalt_relief_right": "玄武岩 正确的救济", - "block.mineralogy.basalt_relief_sword": "玄武岩 剑救济", - "block.mineralogy.basalt_relief_vertical": "玄武岩 垂直救济", - "block.mineralogy.diorite_relief_axe": "闪长岩 斧头救济", - "block.mineralogy.diorite_relief_blank": "闪长岩 空白的救济", - "block.mineralogy.diorite_relief_cross": "闪长岩 交å‰æ•‘济", - "block.mineralogy.diorite_relief_hammer": "闪长岩 锤å­æ•‘济", - "block.mineralogy.diorite_relief_hoe": "闪长岩 锄头救济", - "block.mineralogy.diorite_relief_horizontal": "闪长岩 水平救济", - "block.mineralogy.diorite_relief_i": "闪长岩 I 浮雕", - "block.mineralogy.diorite_relief_left": "闪长岩 左救济", - "block.mineralogy.diorite_relief_pickaxe": "闪长岩 é•æ•‘济", - "block.mineralogy.diorite_relief_plus": "闪长岩 加上救济", - "block.mineralogy.diorite_relief_right": "闪长岩 正确的救济", - "block.mineralogy.diorite_relief_sword": "闪长岩 剑救济", - "block.mineralogy.diorite_relief_vertical": "闪长岩 垂直救济", - "block.mineralogy.granite_relief_axe": "花岗岩 斧头救济", - "block.mineralogy.granite_relief_blank": "花岗岩 空白的救济", - "block.mineralogy.granite_relief_cross": "花岗岩 交å‰æ•‘济", - "block.mineralogy.granite_relief_hammer": "花岗岩 锤å­æ•‘济", - "block.mineralogy.granite_relief_hoe": "花岗岩 锄头救济", - "block.mineralogy.granite_relief_horizontal": "花岗岩 水平救济", - "block.mineralogy.granite_relief_i": "花岗岩 I 浮雕", - "block.mineralogy.granite_relief_left": "花岗岩 左救济", - "block.mineralogy.granite_relief_pickaxe": "花岗岩 é•æ•‘济", - "block.mineralogy.granite_relief_plus": "花岗岩 加上救济", - "block.mineralogy.granite_relief_right": "花岗岩 正确的救济", - "block.mineralogy.granite_relief_sword": "花岗岩 剑救济", - "block.mineralogy.granite_relief_vertical": "花岗岩 垂直救济", - "block.mineralogy.rhyolite_relief_axe": "æµçº¹å²© 斧头救济", - "block.mineralogy.rhyolite_relief_blank": "æµçº¹å²© 空白的救济", - "block.mineralogy.rhyolite_relief_cross": "æµçº¹å²© 交å‰æ•‘济", - "block.mineralogy.rhyolite_relief_hammer": "æµçº¹å²© 锤å­æ•‘济", - "block.mineralogy.rhyolite_relief_hoe": "æµçº¹å²© 锄头救济", - "block.mineralogy.rhyolite_relief_horizontal": "æµçº¹å²© 水平救济", - "block.mineralogy.rhyolite_relief_i": "æµçº¹å²© I 浮雕", - "block.mineralogy.rhyolite_relief_left": "æµçº¹å²© 左救济", - "block.mineralogy.rhyolite_relief_pickaxe": "æµçº¹å²© é•æ•‘济", - "block.mineralogy.rhyolite_relief_plus": "æµçº¹å²© 加上救济", - "block.mineralogy.rhyolite_relief_right": "æµçº¹å²© 正确的救济", - "block.mineralogy.rhyolite_relief_sword": "æµçº¹å²© 剑救济", - "block.mineralogy.rhyolite_relief_vertical": "æµçº¹å²© 垂直救济", - "block.mineralogy.pegmatite_relief_axe": "伟晶岩 斧头救济", - "block.mineralogy.pegmatite_relief_blank": "伟晶岩 空白的救济", - "block.mineralogy.pegmatite_relief_cross": "伟晶岩 交å‰æ•‘济", - "block.mineralogy.pegmatite_relief_hammer": "伟晶岩 锤å­æ•‘济", - "block.mineralogy.pegmatite_relief_hoe": "伟晶岩 锄头救济", - "block.mineralogy.pegmatite_relief_horizontal": "伟晶岩 水平救济", - "block.mineralogy.pegmatite_relief_i": "伟晶岩 I 浮雕", - "block.mineralogy.pegmatite_relief_left": "伟晶岩 左救济", - "block.mineralogy.pegmatite_relief_pickaxe": "伟晶岩 é•æ•‘济", - "block.mineralogy.pegmatite_relief_plus": "伟晶岩 加上救济", - "block.mineralogy.pegmatite_relief_right": "伟晶岩 正确的救济", - "block.mineralogy.pegmatite_relief_sword": "伟晶岩 剑救济", - "block.mineralogy.pegmatite_relief_vertical": "伟晶岩 垂直救济", - "block.mineralogy.shale_relief_axe": "页岩 斧头救济", - "block.mineralogy.shale_relief_blank": "页岩 空白的救济", - "block.mineralogy.shale_relief_cross": "页岩 交å‰æ•‘济", - "block.mineralogy.shale_relief_hammer": "页岩 锤å­æ•‘济", - "block.mineralogy.shale_relief_hoe": "页岩 锄头救济", - "block.mineralogy.shale_relief_horizontal": "页岩 水平救济", - "block.mineralogy.shale_relief_i": "页岩 I 浮雕", - "block.mineralogy.shale_relief_left": "页岩 左救济", - "block.mineralogy.shale_relief_pickaxe": "页岩 é•æ•‘济", - "block.mineralogy.shale_relief_plus": "页岩 加上救济", - "block.mineralogy.shale_relief_right": "页岩 正确的救济", - "block.mineralogy.shale_relief_sword": "页岩 剑救济", - "block.mineralogy.shale_relief_vertical": "页岩 垂直救济", - "block.mineralogy.conglomerate_relief_axe": "砾岩 斧头救济", - "block.mineralogy.conglomerate_relief_blank": "砾岩 空白的救济", - "block.mineralogy.conglomerate_relief_cross": "砾岩 交å‰æ•‘济", - "block.mineralogy.conglomerate_relief_hammer": "砾岩 锤å­æ•‘济", - "block.mineralogy.conglomerate_relief_hoe": "砾岩 锄头救济", - "block.mineralogy.conglomerate_relief_horizontal": "砾岩 水平救济", - "block.mineralogy.conglomerate_relief_i": "砾岩 I 浮雕", - "block.mineralogy.conglomerate_relief_left": "砾岩 左救济", - "block.mineralogy.conglomerate_relief_pickaxe": "砾岩 é•æ•‘济", - "block.mineralogy.conglomerate_relief_plus": "砾岩 加上救济", - "block.mineralogy.conglomerate_relief_right": "砾岩 正确的救济", - "block.mineralogy.conglomerate_relief_sword": "砾岩 剑救济", - "block.mineralogy.conglomerate_relief_vertical": "砾岩 垂直救济", - "block.mineralogy.dolomite_relief_axe": "白云石 斧头救济", - "block.mineralogy.dolomite_relief_blank": "白云石 空白的救济", - "block.mineralogy.dolomite_relief_cross": "白云石 交å‰æ•‘济", - "block.mineralogy.dolomite_relief_hammer": "白云石 锤å­æ•‘济", - "block.mineralogy.dolomite_relief_hoe": "白云石 锄头救济", - "block.mineralogy.dolomite_relief_horizontal": "白云石 水平救济", - "block.mineralogy.dolomite_relief_i": "白云石 I 浮雕", - "block.mineralogy.dolomite_relief_left": "白云石 左救济", - "block.mineralogy.dolomite_relief_pickaxe": "白云石 é•æ•‘济", - "block.mineralogy.dolomite_relief_plus": "白云石 加上救济", - "block.mineralogy.dolomite_relief_right": "白云石 正确的救济", - "block.mineralogy.dolomite_relief_sword": "白云石 剑救济", - "block.mineralogy.dolomite_relief_vertical": "白云石 垂直救济", - "block.mineralogy.limestone_relief_axe": "石ç°çŸ³ 斧头救济", - "block.mineralogy.limestone_relief_blank": "石ç°çŸ³ 空白的救济", - "block.mineralogy.limestone_relief_cross": "石ç°çŸ³ 交å‰æ•‘济", - "block.mineralogy.limestone_relief_hammer": "石ç°çŸ³ 锤å­æ•‘济", - "block.mineralogy.limestone_relief_hoe": "石ç°çŸ³ 锄头救济", - "block.mineralogy.limestone_relief_horizontal": "石ç°çŸ³ 水平救济", - "block.mineralogy.limestone_relief_i": "石ç°çŸ³ I 浮雕", - "block.mineralogy.limestone_relief_left": "石ç°çŸ³ 左救济", - "block.mineralogy.limestone_relief_pickaxe": "石ç°çŸ³ é•æ•‘济", - "block.mineralogy.limestone_relief_plus": "石ç°çŸ³ 加上救济", - "block.mineralogy.limestone_relief_right": "石ç°çŸ³ 正确的救济", - "block.mineralogy.limestone_relief_sword": "石ç°çŸ³ 剑救济", - "block.mineralogy.limestone_relief_vertical": "石ç°çŸ³ 垂直救济", - "block.mineralogy.marble_relief_axe": "大ç†çŸ³ 斧头救济", - "block.mineralogy.marble_relief_blank": "大ç†çŸ³ 空白的救济", - "block.mineralogy.marble_relief_cross": "大ç†çŸ³ 交å‰æ•‘济", - "block.mineralogy.marble_relief_hammer": "大ç†çŸ³ 锤å­æ•‘济", - "block.mineralogy.marble_relief_hoe": "大ç†çŸ³ 锄头救济", - "block.mineralogy.marble_relief_horizontal": "大ç†çŸ³ 水平救济", - "block.mineralogy.marble_relief_i": "大ç†çŸ³ I 浮雕", - "block.mineralogy.marble_relief_left": "大ç†çŸ³ 左救济", - "block.mineralogy.marble_relief_pickaxe": "大ç†çŸ³ é•æ•‘济", - "block.mineralogy.marble_relief_plus": "大ç†çŸ³ 加上救济", - "block.mineralogy.marble_relief_right": "大ç†çŸ³ 正确的救济", - "block.mineralogy.marble_relief_sword": "大ç†çŸ³ 剑救济", - "block.mineralogy.marble_relief_vertical": "大ç†çŸ³ 垂直救济", - "block.mineralogy.slate_relief_axe": "çŸ³æ¿ æ–§å¤´æ•‘æµŽ", - "block.mineralogy.slate_relief_blank": "çŸ³æ¿ ç©ºç™½çš„æ•‘æµŽ", - "block.mineralogy.slate_relief_cross": "çŸ³æ¿ äº¤å‰æ•‘济", - "block.mineralogy.slate_relief_hammer": "çŸ³æ¿ é”¤å­æ•‘济", - "block.mineralogy.slate_relief_hoe": "çŸ³æ¿ é”„å¤´æ•‘æµŽ", - "block.mineralogy.slate_relief_horizontal": "çŸ³æ¿ æ°´å¹³æ•‘æµŽ", - "block.mineralogy.slate_relief_i": "çŸ³æ¿ I 浮雕", - "block.mineralogy.slate_relief_left": "çŸ³æ¿ å·¦æ•‘æµŽ", - "block.mineralogy.slate_relief_pickaxe": "çŸ³æ¿ é•æ•‘济", - "block.mineralogy.slate_relief_plus": "çŸ³æ¿ åŠ ä¸Šæ•‘æµŽ", - "block.mineralogy.slate_relief_right": "çŸ³æ¿ æ­£ç¡®çš„æ•‘æµŽ", - "block.mineralogy.slate_relief_sword": "çŸ³æ¿ å‰‘æ•‘æµŽ", - "block.mineralogy.slate_relief_vertical": "çŸ³æ¿ åž‚ç›´æ•‘æµŽ", - "block.mineralogy.schist_relief_axe": "片岩 斧头救济", - "block.mineralogy.schist_relief_blank": "片岩 空白的救济", - "block.mineralogy.schist_relief_cross": "片岩 交å‰æ•‘济", - "block.mineralogy.schist_relief_hammer": "片岩 锤å­æ•‘济", - "block.mineralogy.schist_relief_hoe": "片岩 锄头救济", - "block.mineralogy.schist_relief_horizontal": "片岩 水平救济", - "block.mineralogy.schist_relief_i": "片岩 I 浮雕", - "block.mineralogy.schist_relief_left": "片岩 左救济", - "block.mineralogy.schist_relief_pickaxe": "片岩 é•æ•‘济", - "block.mineralogy.schist_relief_plus": "片岩 加上救济", - "block.mineralogy.schist_relief_right": "片岩 正确的救济", - "block.mineralogy.schist_relief_sword": "片岩 剑救济", - "block.mineralogy.schist_relief_vertical": "片岩 垂直救济", - "block.mineralogy.gneiss_relief_axe": "片麻岩 斧头救济", - "block.mineralogy.gneiss_relief_blank": "片麻岩 空白的救济", - "block.mineralogy.gneiss_relief_cross": "片麻岩 交å‰æ•‘济", - "block.mineralogy.gneiss_relief_hammer": "片麻岩 锤å­æ•‘济", - "block.mineralogy.gneiss_relief_hoe": "片麻岩 锄头救济", - "block.mineralogy.gneiss_relief_horizontal": "片麻岩 水平救济", - "block.mineralogy.gneiss_relief_i": "片麻岩 I 浮雕", - "block.mineralogy.gneiss_relief_left": "片麻岩 左救济", - "block.mineralogy.gneiss_relief_pickaxe": "片麻岩 é•æ•‘济", - "block.mineralogy.gneiss_relief_plus": "片麻岩 加上救济", - "block.mineralogy.gneiss_relief_right": "片麻岩 正确的救济", - "block.mineralogy.gneiss_relief_sword": "片麻岩 剑救济", - "block.mineralogy.gneiss_relief_vertical": "片麻岩 垂直救济", - "block.mineralogy.phyllite_relief_axe": "åƒæžšå²© 斧头救济", - "block.mineralogy.phyllite_relief_blank": "åƒæžšå²© 空白的救济", - "block.mineralogy.phyllite_relief_cross": "åƒæžšå²© 交å‰æ•‘济", - "block.mineralogy.phyllite_relief_hammer": "åƒæžšå²© 锤å­æ•‘济", - "block.mineralogy.phyllite_relief_hoe": "åƒæžšå²© 锄头救济", - "block.mineralogy.phyllite_relief_horizontal": "åƒæžšå²© 水平救济", - "block.mineralogy.phyllite_relief_i": "åƒæžšå²© I 浮雕", - "block.mineralogy.phyllite_relief_left": "åƒæžšå²© 左救济", - "block.mineralogy.phyllite_relief_pickaxe": "åƒæžšå²© é•æ•‘济", - "block.mineralogy.phyllite_relief_plus": "åƒæžšå²© 加上救济", - "block.mineralogy.phyllite_relief_right": "åƒæžšå²© 正确的救济", - "block.mineralogy.phyllite_relief_sword": "åƒæžšå²© 剑救济", - "block.mineralogy.phyllite_relief_vertical": "åƒæžšå²© 垂直救济", - "block.mineralogy.amphibolite_relief_axe": "闪岩 斧头救济", - "block.mineralogy.amphibolite_relief_blank": "闪岩 空白的救济", - "block.mineralogy.amphibolite_relief_cross": "闪岩 交å‰æ•‘济", - "block.mineralogy.amphibolite_relief_hammer": "闪岩 锤å­æ•‘济", - "block.mineralogy.amphibolite_relief_hoe": "闪岩 锄头救济", - "block.mineralogy.amphibolite_relief_horizontal": "闪岩 水平救济", - "block.mineralogy.amphibolite_relief_i": "闪岩 I 浮雕", - "block.mineralogy.amphibolite_relief_left": "闪岩 左救济", - "block.mineralogy.amphibolite_relief_pickaxe": "闪岩 é•æ•‘济", - "block.mineralogy.amphibolite_relief_plus": "闪岩 加上救济", - "block.mineralogy.amphibolite_relief_right": "闪岩 正确的救济", - "block.mineralogy.amphibolite_relief_sword": "闪岩 剑救济", - "block.mineralogy.amphibolite_relief_vertical": "闪岩 垂直救济", - "block.mineralogy.diabase_relief_axe": "辉绿岩 斧头救济", - "block.mineralogy.diabase_relief_blank": "辉绿岩 空白的救济", - "block.mineralogy.diabase_relief_cross": "辉绿岩 交å‰æ•‘济", - "block.mineralogy.diabase_relief_hammer": "辉绿岩 锤å­æ•‘济", - "block.mineralogy.diabase_relief_hoe": "辉绿岩 锄头救济", - "block.mineralogy.diabase_relief_horizontal": "辉绿岩 水平救济", - "block.mineralogy.diabase_relief_i": "辉绿岩 I 浮雕", - "block.mineralogy.diabase_relief_left": "辉绿岩 左救济", - "block.mineralogy.diabase_relief_pickaxe": "辉绿岩 é•æ•‘济", - "block.mineralogy.diabase_relief_plus": "辉绿岩 加上救济", - "block.mineralogy.diabase_relief_right": "辉绿岩 正确的救济", - "block.mineralogy.diabase_relief_sword": "辉绿岩 剑救济", - "block.mineralogy.diabase_relief_vertical": "辉绿岩 垂直救济", - "block.mineralogy.gabbro_relief_axe": "辉长岩 斧头救济", - "block.mineralogy.gabbro_relief_blank": "辉长岩 空白的救济", - "block.mineralogy.gabbro_relief_cross": "辉长岩 交å‰æ•‘济", - "block.mineralogy.gabbro_relief_hammer": "辉长岩 锤å­æ•‘济", - "block.mineralogy.gabbro_relief_hoe": "辉长岩 锄头救济", - "block.mineralogy.gabbro_relief_horizontal": "辉长岩 水平救济", - "block.mineralogy.gabbro_relief_i": "辉长岩 I 浮雕", - "block.mineralogy.gabbro_relief_left": "辉长岩 左救济", - "block.mineralogy.gabbro_relief_pickaxe": "辉长岩 é•æ•‘济", - "block.mineralogy.gabbro_relief_plus": "辉长岩 加上救济", - "block.mineralogy.gabbro_relief_right": "辉长岩 正确的救济", - "block.mineralogy.gabbro_relief_sword": "辉长岩 剑救济", - "block.mineralogy.gabbro_relief_vertical": "辉长岩 垂直救济", - "block.mineralogy.peridotite_relief_axe": "橄榄岩 斧头救济", - "block.mineralogy.peridotite_relief_blank": "橄榄岩 空白的救济", - "block.mineralogy.peridotite_relief_cross": "橄榄岩 交å‰æ•‘济", - "block.mineralogy.peridotite_relief_hammer": "橄榄岩 锤å­æ•‘济", - "block.mineralogy.peridotite_relief_hoe": "橄榄岩 锄头救济", - "block.mineralogy.peridotite_relief_horizontal": "橄榄岩 水平救济", - "block.mineralogy.peridotite_relief_i": "橄榄岩 I 浮雕", - "block.mineralogy.peridotite_relief_left": "橄榄岩 左救济", - "block.mineralogy.peridotite_relief_pickaxe": "橄榄岩 é•æ•‘济", - "block.mineralogy.peridotite_relief_plus": "橄榄岩 加上救济", - "block.mineralogy.peridotite_relief_right": "橄榄岩 正确的救济", - "block.mineralogy.peridotite_relief_sword": "橄榄岩 剑救济", - "block.mineralogy.peridotite_relief_vertical": "橄榄岩 垂直救济", - "block.mineralogy.basaltic_glass_relief_axe": "玄武玻璃 斧头救济", - "block.mineralogy.basaltic_glass_relief_blank": "玄武玻璃 空白的救济", - "block.mineralogy.basaltic_glass_relief_cross": "玄武玻璃 交å‰æ•‘济", - "block.mineralogy.basaltic_glass_relief_hammer": "玄武玻璃 锤å­æ•‘济", - "block.mineralogy.basaltic_glass_relief_hoe": "玄武玻璃 锄头救济", - "block.mineralogy.basaltic_glass_relief_horizontal": "玄武玻璃 水平救济", - "block.mineralogy.basaltic_glass_relief_i": "玄武玻璃 I 浮雕", - "block.mineralogy.basaltic_glass_relief_left": "玄武玻璃 左救济", - "block.mineralogy.basaltic_glass_relief_pickaxe": "玄武玻璃 é•æ•‘济", - "block.mineralogy.basaltic_glass_relief_plus": "玄武玻璃 加上救济", - "block.mineralogy.basaltic_glass_relief_right": "玄武玻璃 正确的救济", - "block.mineralogy.basaltic_glass_relief_sword": "玄武玻璃 剑救济", - "block.mineralogy.basaltic_glass_relief_vertical": "玄武玻璃 垂直救济", - "block.mineralogy.scoria_relief_axe": "矿渣 斧头救济", - "block.mineralogy.scoria_relief_blank": "矿渣 空白的救济", - "block.mineralogy.scoria_relief_cross": "矿渣 交å‰æ•‘济", - "block.mineralogy.scoria_relief_hammer": "矿渣 锤å­æ•‘济", - "block.mineralogy.scoria_relief_hoe": "矿渣 锄头救济", - "block.mineralogy.scoria_relief_horizontal": "矿渣 水平救济", - "block.mineralogy.scoria_relief_i": "矿渣 I 浮雕", - "block.mineralogy.scoria_relief_left": "矿渣 左救济", - "block.mineralogy.scoria_relief_pickaxe": "矿渣 é•æ•‘济", - "block.mineralogy.scoria_relief_plus": "矿渣 加上救济", - "block.mineralogy.scoria_relief_right": "矿渣 正确的救济", - "block.mineralogy.scoria_relief_sword": "矿渣 剑救济", - "block.mineralogy.scoria_relief_vertical": "矿渣 垂直救济", - "block.mineralogy.tuff_relief_axe": "å‡ç°å²© 斧头救济", - "block.mineralogy.tuff_relief_blank": "å‡ç°å²© 空白的救济", - "block.mineralogy.tuff_relief_cross": "å‡ç°å²© 交å‰æ•‘济", - "block.mineralogy.tuff_relief_hammer": "å‡ç°å²© 锤å­æ•‘济", - "block.mineralogy.tuff_relief_hoe": "å‡ç°å²© 锄头救济", - "block.mineralogy.tuff_relief_horizontal": "å‡ç°å²© 水平救济", - "block.mineralogy.tuff_relief_i": "å‡ç°å²© I 浮雕", - "block.mineralogy.tuff_relief_left": "å‡ç°å²© 左救济", - "block.mineralogy.tuff_relief_pickaxe": "å‡ç°å²© é•æ•‘济", - "block.mineralogy.tuff_relief_plus": "å‡ç°å²© 加上救济", - "block.mineralogy.tuff_relief_right": "å‡ç°å²© 正确的救济", - "block.mineralogy.tuff_relief_sword": "å‡ç°å²© 剑救济", - "block.mineralogy.tuff_relief_vertical": "å‡ç°å²© 垂直救济", - "block.mineralogy.siltstone_relief_axe": "粉砂岩 斧头救济", - "block.mineralogy.siltstone_relief_blank": "粉砂岩 空白的救济", - "block.mineralogy.siltstone_relief_cross": "粉砂岩 交å‰æ•‘济", - "block.mineralogy.siltstone_relief_hammer": "粉砂岩 锤å­æ•‘济", - "block.mineralogy.siltstone_relief_hoe": "粉砂岩 锄头救济", - "block.mineralogy.siltstone_relief_horizontal": "粉砂岩 水平救济", - "block.mineralogy.siltstone_relief_i": "粉砂岩 I 浮雕", - "block.mineralogy.siltstone_relief_left": "粉砂岩 左救济", - "block.mineralogy.siltstone_relief_pickaxe": "粉砂岩 é•æ•‘济", - "block.mineralogy.siltstone_relief_plus": "粉砂岩 加上救济", - "block.mineralogy.siltstone_relief_right": "粉砂岩 正确的救济", - "block.mineralogy.siltstone_relief_sword": "粉砂岩 剑救济", - "block.mineralogy.siltstone_relief_vertical": "粉砂岩 垂直救济", - "block.mineralogy.rock_salt_relief_axe": "å²©ç› æ–§å¤´æ•‘æµŽ", - "block.mineralogy.rock_salt_relief_blank": "å²©ç› ç©ºç™½çš„æ•‘æµŽ", - "block.mineralogy.rock_salt_relief_cross": "å²©ç› äº¤å‰æ•‘济", - "block.mineralogy.rock_salt_relief_hammer": "å²©ç› é”¤å­æ•‘济", - "block.mineralogy.rock_salt_relief_hoe": "å²©ç› é”„å¤´æ•‘æµŽ", - "block.mineralogy.rock_salt_relief_horizontal": "å²©ç› æ°´å¹³æ•‘æµŽ", - "block.mineralogy.rock_salt_relief_i": "å²©ç› I 浮雕", - "block.mineralogy.rock_salt_relief_left": "å²©ç› å·¦æ•‘æµŽ", - "block.mineralogy.rock_salt_relief_pickaxe": "å²©ç› é•æ•‘济", - "block.mineralogy.rock_salt_relief_plus": "å²©ç› åŠ ä¸Šæ•‘æµŽ", - "block.mineralogy.rock_salt_relief_right": "å²©ç› æ­£ç¡®çš„æ•‘æµŽ", - "block.mineralogy.rock_salt_relief_sword": "å²©ç› å‰‘æ•‘æµŽ", - "block.mineralogy.rock_salt_relief_vertical": "å²©ç› åž‚ç›´æ•‘æµŽ", - "block.mineralogy.hornfels_relief_axe": "角岩 斧头救济", - "block.mineralogy.hornfels_relief_blank": "角岩 空白的救济", - "block.mineralogy.hornfels_relief_cross": "角岩 交å‰æ•‘济", - "block.mineralogy.hornfels_relief_hammer": "角岩 锤å­æ•‘济", - "block.mineralogy.hornfels_relief_hoe": "角岩 锄头救济", - "block.mineralogy.hornfels_relief_horizontal": "角岩 水平救济", - "block.mineralogy.hornfels_relief_i": "角岩 I 浮雕", - "block.mineralogy.hornfels_relief_left": "角岩 左救济", - "block.mineralogy.hornfels_relief_pickaxe": "角岩 é•æ•‘济", - "block.mineralogy.hornfels_relief_plus": "角岩 加上救济", - "block.mineralogy.hornfels_relief_right": "角岩 正确的救济", - "block.mineralogy.hornfels_relief_sword": "角岩 剑救济", - "block.mineralogy.hornfels_relief_vertical": "角岩 垂直救济", - "block.mineralogy.quartzite_relief_axe": "石英岩 斧头救济", - "block.mineralogy.quartzite_relief_blank": "石英岩 空白的救济", - "block.mineralogy.quartzite_relief_cross": "石英岩 交å‰æ•‘济", - "block.mineralogy.quartzite_relief_hammer": "石英岩 锤å­æ•‘济", - "block.mineralogy.quartzite_relief_hoe": "石英岩 锄头救济", - "block.mineralogy.quartzite_relief_horizontal": "石英岩 水平救济", - "block.mineralogy.quartzite_relief_i": "石英岩 I 浮雕", - "block.mineralogy.quartzite_relief_left": "石英岩 左救济", - "block.mineralogy.quartzite_relief_pickaxe": "石英岩 é•æ•‘济", - "block.mineralogy.quartzite_relief_plus": "石英岩 加上救济", - "block.mineralogy.quartzite_relief_right": "石英岩 正确的救济", - "block.mineralogy.quartzite_relief_sword": "石英岩 剑救济", - "block.mineralogy.quartzite_relief_vertical": "石英岩 垂直救济", - "block.mineralogy.novaculite_relief_axe": "å‡å¯†çŸ³è‹±å²© 斧头救济", - "block.mineralogy.novaculite_relief_blank": "å‡å¯†çŸ³è‹±å²© 空白的救济", - "block.mineralogy.novaculite_relief_cross": "å‡å¯†çŸ³è‹±å²© 交å‰æ•‘济", - "block.mineralogy.novaculite_relief_hammer": "å‡å¯†çŸ³è‹±å²© 锤å­æ•‘济", - "block.mineralogy.novaculite_relief_hoe": "å‡å¯†çŸ³è‹±å²© 锄头救济", - "block.mineralogy.novaculite_relief_horizontal": "å‡å¯†çŸ³è‹±å²© 水平救济", - "block.mineralogy.novaculite_relief_i": "å‡å¯†çŸ³è‹±å²© I 浮雕", - "block.mineralogy.novaculite_relief_left": "å‡å¯†çŸ³è‹±å²© 左救济", - "block.mineralogy.novaculite_relief_pickaxe": "å‡å¯†çŸ³è‹±å²© é•æ•‘济", - "block.mineralogy.novaculite_relief_plus": "å‡å¯†çŸ³è‹±å²© 加上救济", - "block.mineralogy.novaculite_relief_right": "å‡å¯†çŸ³è‹±å²© 正确的救济", - "block.mineralogy.novaculite_relief_sword": "å‡å¯†çŸ³è‹±å²© 剑救济", - "block.mineralogy.novaculite_relief_vertical": "å‡å¯†çŸ³è‹±å²© 垂直救济", - "itemGroup.mineralogy.mineralogy": "我的地ç†" + "block.mineralogy.andesite_relief_axe": "安山岩浮雕（斧）", + "block.mineralogy.andesite_relief_blank": "安山岩浮雕（无图案）", + "block.mineralogy.andesite_relief_cross": "安山岩浮雕（å字）", + "block.mineralogy.andesite_relief_hammer": "安山岩浮雕（锤）", + "block.mineralogy.andesite_relief_hoe": "安山岩浮雕（锄）", + "block.mineralogy.andesite_relief_horizontal": "安山岩浮雕（横纹）", + "block.mineralogy.andesite_relief_i": "安山岩浮雕（I）", + "block.mineralogy.andesite_relief_left": "安山岩浮雕（左纹）", + "block.mineralogy.andesite_relief_pickaxe": "安山岩浮雕（é•ï¼‰", + "block.mineralogy.andesite_relief_plus": "安山岩浮雕（加å·ï¼‰", + "block.mineralogy.andesite_relief_right": "安山岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.andesite_relief_sword": "安山岩浮雕（剑）", + "block.mineralogy.andesite_relief_vertical": "安山岩浮雕（竖纹）", + "block.mineralogy.basalt_relief_axe": "玄武岩浮雕（斧）", + "block.mineralogy.basalt_relief_blank": "玄武岩浮雕（无图案）", + "block.mineralogy.basalt_relief_cross": "玄武岩浮雕（å字）", + "block.mineralogy.basalt_relief_hammer": "玄武岩浮雕（锤）", + "block.mineralogy.basalt_relief_hoe": "玄武岩浮雕（锄）", + "block.mineralogy.basalt_relief_horizontal": "玄武岩浮雕（横纹）", + "block.mineralogy.basalt_relief_i": "玄武岩浮雕（I）", + "block.mineralogy.basalt_relief_left": "玄武岩浮雕（左纹）", + "block.mineralogy.basalt_relief_pickaxe": "玄武岩浮雕（é•ï¼‰", + "block.mineralogy.basalt_relief_plus": "玄武岩浮雕（加å·ï¼‰", + "block.mineralogy.basalt_relief_right": "玄武岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.basalt_relief_sword": "玄武岩浮雕（剑）", + "block.mineralogy.basalt_relief_vertical": "玄武岩浮雕（竖纹）", + "block.mineralogy.diorite_relief_axe": "闪长岩浮雕（斧）", + "block.mineralogy.diorite_relief_blank": "闪长岩浮雕（无图案）", + "block.mineralogy.diorite_relief_cross": "闪长岩浮雕（å字）", + "block.mineralogy.diorite_relief_hammer": "闪长岩浮雕（锤）", + "block.mineralogy.diorite_relief_hoe": "闪长岩浮雕（锄）", + "block.mineralogy.diorite_relief_horizontal": "闪长岩浮雕（横纹）", + "block.mineralogy.diorite_relief_i": "闪长岩浮雕（I）", + "block.mineralogy.diorite_relief_left": "闪长岩浮雕（左纹）", + "block.mineralogy.diorite_relief_pickaxe": "闪长岩浮雕（é•ï¼‰", + "block.mineralogy.diorite_relief_plus": "闪长岩浮雕（加å·ï¼‰", + "block.mineralogy.diorite_relief_right": "闪长岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.diorite_relief_sword": "闪长岩浮雕（剑）", + "block.mineralogy.diorite_relief_vertical": "闪长岩浮雕（竖纹）", + "block.mineralogy.granite_relief_axe": "花岗岩浮雕（斧）", + "block.mineralogy.granite_relief_blank": "花岗岩浮雕（无图案）", + "block.mineralogy.granite_relief_cross": "花岗岩浮雕（å字）", + "block.mineralogy.granite_relief_hammer": "花岗岩浮雕（锤）", + "block.mineralogy.granite_relief_hoe": "花岗岩浮雕（锄）", + "block.mineralogy.granite_relief_horizontal": "花岗岩浮雕（横纹）", + "block.mineralogy.granite_relief_i": "花岗岩浮雕（I）", + "block.mineralogy.granite_relief_left": "花岗岩浮雕（左纹）", + "block.mineralogy.granite_relief_pickaxe": "花岗岩浮雕（é•ï¼‰", + "block.mineralogy.granite_relief_plus": "花岗岩浮雕（加å·ï¼‰", + "block.mineralogy.granite_relief_right": "花岗岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.granite_relief_sword": "花岗岩浮雕（剑）", + "block.mineralogy.granite_relief_vertical": "花岗岩浮雕（竖纹）", + "block.mineralogy.rhyolite_relief_axe": "æµçº¹å²©æµ®é›•ï¼ˆæ–§ï¼‰", + "block.mineralogy.rhyolite_relief_blank": "æµçº¹å²©æµ®é›•ï¼ˆæ— å›¾æ¡ˆï¼‰", + "block.mineralogy.rhyolite_relief_cross": "æµçº¹å²©æµ®é›•ï¼ˆå字）", + "block.mineralogy.rhyolite_relief_hammer": "æµçº¹å²©æµ®é›•ï¼ˆé”¤ï¼‰", + "block.mineralogy.rhyolite_relief_hoe": "æµçº¹å²©æµ®é›•ï¼ˆé”„）", + "block.mineralogy.rhyolite_relief_horizontal": "æµçº¹å²©æµ®é›•ï¼ˆæ¨ªçº¹ï¼‰", + "block.mineralogy.rhyolite_relief_i": "æµçº¹å²©æµ®é›•ï¼ˆI）", + "block.mineralogy.rhyolite_relief_left": "æµçº¹å²©æµ®é›•ï¼ˆå·¦çº¹ï¼‰", + "block.mineralogy.rhyolite_relief_pickaxe": "æµçº¹å²©æµ®é›•ï¼ˆé•ï¼‰", + "block.mineralogy.rhyolite_relief_plus": "æµçº¹å²©æµ®é›•ï¼ˆåŠ å·ï¼‰", + "block.mineralogy.rhyolite_relief_right": "æµçº¹å²©æµ®é›•ï¼ˆå³çº¹ï¼‰", + "block.mineralogy.rhyolite_relief_sword": "æµçº¹å²©æµ®é›•ï¼ˆå‰‘）", + "block.mineralogy.rhyolite_relief_vertical": "æµçº¹å²©æµ®é›•ï¼ˆç«–纹）", + "block.mineralogy.pegmatite_relief_axe": "伟晶岩浮雕（斧）", + "block.mineralogy.pegmatite_relief_blank": "伟晶岩浮雕（无图案）", + "block.mineralogy.pegmatite_relief_cross": "伟晶岩浮雕（å字）", + "block.mineralogy.pegmatite_relief_hammer": "伟晶岩浮雕（锤）", + "block.mineralogy.pegmatite_relief_hoe": "伟晶岩浮雕（锄）", + "block.mineralogy.pegmatite_relief_horizontal": "伟晶岩浮雕（横纹）", + "block.mineralogy.pegmatite_relief_i": "伟晶岩浮雕（I）", + "block.mineralogy.pegmatite_relief_left": "伟晶岩浮雕（左纹）", + "block.mineralogy.pegmatite_relief_pickaxe": "伟晶岩浮雕（é•ï¼‰", + "block.mineralogy.pegmatite_relief_plus": "伟晶岩浮雕（加å·ï¼‰", + "block.mineralogy.pegmatite_relief_right": "伟晶岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.pegmatite_relief_sword": "伟晶岩浮雕（剑）", + "block.mineralogy.pegmatite_relief_vertical": "伟晶岩浮雕（竖纹）", + "block.mineralogy.shale_relief_axe": "页岩浮雕（斧）", + "block.mineralogy.shale_relief_blank": "页岩浮雕（无图案）", + "block.mineralogy.shale_relief_cross": "页岩浮雕（å字）", + "block.mineralogy.shale_relief_hammer": "页岩浮雕（锤）", + "block.mineralogy.shale_relief_hoe": "页岩浮雕（锄）", + "block.mineralogy.shale_relief_horizontal": "页岩浮雕（横纹）", + "block.mineralogy.shale_relief_i": "页岩浮雕（I）", + "block.mineralogy.shale_relief_left": "页岩浮雕（左纹）", + "block.mineralogy.shale_relief_pickaxe": "页岩浮雕（é•ï¼‰", + "block.mineralogy.shale_relief_plus": "页岩浮雕（加å·ï¼‰", + "block.mineralogy.shale_relief_right": "页岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.shale_relief_sword": "页岩浮雕（剑）", + "block.mineralogy.shale_relief_vertical": "页岩浮雕（竖纹）", + "block.mineralogy.conglomerate_relief_axe": "砾岩浮雕（斧）", + "block.mineralogy.conglomerate_relief_blank": "砾岩浮雕（无图案）", + "block.mineralogy.conglomerate_relief_cross": "砾岩浮雕（å字）", + "block.mineralogy.conglomerate_relief_hammer": "砾岩浮雕（锤）", + "block.mineralogy.conglomerate_relief_hoe": "砾岩浮雕（锄）", + "block.mineralogy.conglomerate_relief_horizontal": "砾岩浮雕（横纹）", + "block.mineralogy.conglomerate_relief_i": "砾岩浮雕（I）", + "block.mineralogy.conglomerate_relief_left": "砾岩浮雕（左纹）", + "block.mineralogy.conglomerate_relief_pickaxe": "砾岩浮雕（é•ï¼‰", + "block.mineralogy.conglomerate_relief_plus": "砾岩浮雕（加å·ï¼‰", + "block.mineralogy.conglomerate_relief_right": "砾岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.conglomerate_relief_sword": "砾岩浮雕（剑）", + "block.mineralogy.conglomerate_relief_vertical": "砾岩浮雕（竖纹）", + "block.mineralogy.dolomite_relief_axe": "白云岩浮雕（斧）", + "block.mineralogy.dolomite_relief_blank": "白云岩浮雕（无图案）", + "block.mineralogy.dolomite_relief_cross": "白云岩浮雕（å字）", + "block.mineralogy.dolomite_relief_hammer": "白云岩浮雕（锤）", + "block.mineralogy.dolomite_relief_hoe": "白云岩浮雕（锄）", + "block.mineralogy.dolomite_relief_horizontal": "白云岩浮雕（横纹）", + "block.mineralogy.dolomite_relief_i": "白云岩浮雕（I）", + "block.mineralogy.dolomite_relief_left": "白云岩浮雕（左纹）", + "block.mineralogy.dolomite_relief_pickaxe": "白云岩浮雕（é•ï¼‰", + "block.mineralogy.dolomite_relief_plus": "白云岩浮雕（加å·ï¼‰", + "block.mineralogy.dolomite_relief_right": "白云岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.dolomite_relief_sword": "白云岩浮雕（剑）", + "block.mineralogy.dolomite_relief_vertical": "白云岩浮雕（竖纹）", + "block.mineralogy.limestone_relief_axe": "石ç°çŸ³æµ®é›•ï¼ˆæ–§ï¼‰", + "block.mineralogy.limestone_relief_blank": "石ç°çŸ³æµ®é›•ï¼ˆæ— å›¾æ¡ˆï¼‰", + "block.mineralogy.limestone_relief_cross": "石ç°çŸ³æµ®é›•ï¼ˆå字）", + "block.mineralogy.limestone_relief_hammer": "石ç°çŸ³æµ®é›•ï¼ˆé”¤ï¼‰", + "block.mineralogy.limestone_relief_hoe": "石ç°çŸ³æµ®é›•ï¼ˆé”„）", + "block.mineralogy.limestone_relief_horizontal": "石ç°çŸ³æµ®é›•ï¼ˆæ¨ªçº¹ï¼‰", + "block.mineralogy.limestone_relief_i": "石ç°çŸ³æµ®é›•ï¼ˆI）", + "block.mineralogy.limestone_relief_left": "石ç°çŸ³æµ®é›•ï¼ˆå·¦çº¹ï¼‰", + "block.mineralogy.limestone_relief_pickaxe": "石ç°çŸ³æµ®é›•ï¼ˆé•ï¼‰", + "block.mineralogy.limestone_relief_plus": "石ç°çŸ³æµ®é›•ï¼ˆåŠ å·ï¼‰", + "block.mineralogy.limestone_relief_right": "石ç°çŸ³æµ®é›•ï¼ˆå³çº¹ï¼‰", + "block.mineralogy.limestone_relief_sword": "石ç°çŸ³æµ®é›•ï¼ˆå‰‘）", + "block.mineralogy.limestone_relief_vertical": "石ç°çŸ³æµ®é›•ï¼ˆç«–纹）", + "block.mineralogy.marble_relief_axe": "大ç†çŸ³æµ®é›•ï¼ˆæ–§ï¼‰", + "block.mineralogy.marble_relief_blank": "大ç†çŸ³æµ®é›•ï¼ˆæ— å›¾æ¡ˆï¼‰", + "block.mineralogy.marble_relief_cross": "大ç†çŸ³æµ®é›•ï¼ˆå字）", + "block.mineralogy.marble_relief_hammer": "大ç†çŸ³æµ®é›•ï¼ˆé”¤ï¼‰", + "block.mineralogy.marble_relief_hoe": "大ç†çŸ³æµ®é›•ï¼ˆé”„）", + "block.mineralogy.marble_relief_horizontal": "大ç†çŸ³æµ®é›•ï¼ˆæ¨ªçº¹ï¼‰", + "block.mineralogy.marble_relief_i": "大ç†çŸ³æµ®é›•ï¼ˆI）", + "block.mineralogy.marble_relief_left": "大ç†çŸ³æµ®é›•ï¼ˆå·¦çº¹ï¼‰", + "block.mineralogy.marble_relief_pickaxe": "大ç†çŸ³æµ®é›•ï¼ˆé•ï¼‰", + "block.mineralogy.marble_relief_plus": "大ç†çŸ³æµ®é›•ï¼ˆåŠ å·ï¼‰", + "block.mineralogy.marble_relief_right": "大ç†çŸ³æµ®é›•ï¼ˆå³çº¹ï¼‰", + "block.mineralogy.marble_relief_sword": "大ç†çŸ³æµ®é›•ï¼ˆå‰‘）", + "block.mineralogy.marble_relief_vertical": "大ç†çŸ³æµ®é›•ï¼ˆç«–纹）", + "block.mineralogy.slate_relief_axe": "æ¿å²©æµ®é›•ï¼ˆæ–§ï¼‰", + "block.mineralogy.slate_relief_blank": "æ¿å²©æµ®é›•ï¼ˆæ— å›¾æ¡ˆï¼‰", + "block.mineralogy.slate_relief_cross": "æ¿å²©æµ®é›•ï¼ˆå字）", + "block.mineralogy.slate_relief_hammer": "æ¿å²©æµ®é›•ï¼ˆé”¤ï¼‰", + "block.mineralogy.slate_relief_hoe": "æ¿å²©æµ®é›•ï¼ˆé”„）", + "block.mineralogy.slate_relief_horizontal": "æ¿å²©æµ®é›•ï¼ˆæ¨ªçº¹ï¼‰", + "block.mineralogy.slate_relief_i": "æ¿å²©æµ®é›•ï¼ˆI）", + "block.mineralogy.slate_relief_left": "æ¿å²©æµ®é›•ï¼ˆå·¦çº¹ï¼‰", + "block.mineralogy.slate_relief_pickaxe": "æ¿å²©æµ®é›•ï¼ˆé•ï¼‰", + "block.mineralogy.slate_relief_plus": "æ¿å²©æµ®é›•ï¼ˆåŠ å·ï¼‰", + "block.mineralogy.slate_relief_right": "æ¿å²©æµ®é›•ï¼ˆå³çº¹ï¼‰", + "block.mineralogy.slate_relief_sword": "æ¿å²©æµ®é›•ï¼ˆå‰‘）", + "block.mineralogy.slate_relief_vertical": "æ¿å²©æµ®é›•ï¼ˆç«–纹）", + "block.mineralogy.schist_relief_axe": "片岩浮雕（斧）", + "block.mineralogy.schist_relief_blank": "片岩浮雕（无图案）", + "block.mineralogy.schist_relief_cross": "片岩浮雕（å字）", + "block.mineralogy.schist_relief_hammer": "片岩浮雕（锤）", + "block.mineralogy.schist_relief_hoe": "片岩浮雕（锄）", + "block.mineralogy.schist_relief_horizontal": "片岩浮雕（横纹）", + "block.mineralogy.schist_relief_i": "片岩浮雕（I）", + "block.mineralogy.schist_relief_left": "片岩浮雕（左纹）", + "block.mineralogy.schist_relief_pickaxe": "片岩浮雕（é•ï¼‰", + "block.mineralogy.schist_relief_plus": "片岩浮雕（加å·ï¼‰", + "block.mineralogy.schist_relief_right": "片岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.schist_relief_sword": "片岩浮雕（剑）", + "block.mineralogy.schist_relief_vertical": "片岩浮雕（竖纹）", + "block.mineralogy.gneiss_relief_axe": "片麻岩浮雕（斧）", + "block.mineralogy.gneiss_relief_blank": "片麻岩浮雕（无图案）", + "block.mineralogy.gneiss_relief_cross": "片麻岩浮雕（å字）", + "block.mineralogy.gneiss_relief_hammer": "片麻岩浮雕（锤）", + "block.mineralogy.gneiss_relief_hoe": "片麻岩浮雕（锄）", + "block.mineralogy.gneiss_relief_horizontal": "片麻岩浮雕（横纹）", + "block.mineralogy.gneiss_relief_i": "片麻岩浮雕（I）", + "block.mineralogy.gneiss_relief_left": "片麻岩浮雕（左纹）", + "block.mineralogy.gneiss_relief_pickaxe": "片麻岩浮雕（é•ï¼‰", + "block.mineralogy.gneiss_relief_plus": "片麻岩浮雕（加å·ï¼‰", + "block.mineralogy.gneiss_relief_right": "片麻岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.gneiss_relief_sword": "片麻岩浮雕（剑）", + "block.mineralogy.gneiss_relief_vertical": "片麻岩浮雕（竖纹）", + "block.mineralogy.phyllite_relief_axe": "åƒæžšå²©æµ®é›•ï¼ˆæ–§ï¼‰", + "block.mineralogy.phyllite_relief_blank": "åƒæžšå²©æµ®é›•ï¼ˆæ— å›¾æ¡ˆï¼‰", + "block.mineralogy.phyllite_relief_cross": "åƒæžšå²©æµ®é›•ï¼ˆå字）", + "block.mineralogy.phyllite_relief_hammer": "åƒæžšå²©æµ®é›•ï¼ˆé”¤ï¼‰", + "block.mineralogy.phyllite_relief_hoe": "åƒæžšå²©æµ®é›•ï¼ˆé”„）", + "block.mineralogy.phyllite_relief_horizontal": "åƒæžšå²©æµ®é›•ï¼ˆæ¨ªçº¹ï¼‰", + "block.mineralogy.phyllite_relief_i": "åƒæžšå²©æµ®é›•ï¼ˆI）", + "block.mineralogy.phyllite_relief_left": "åƒæžšå²©æµ®é›•ï¼ˆå·¦çº¹ï¼‰", + "block.mineralogy.phyllite_relief_pickaxe": "åƒæžšå²©æµ®é›•ï¼ˆé•ï¼‰", + "block.mineralogy.phyllite_relief_plus": "åƒæžšå²©æµ®é›•ï¼ˆåŠ å·ï¼‰", + "block.mineralogy.phyllite_relief_right": "åƒæžšå²©æµ®é›•ï¼ˆå³çº¹ï¼‰", + "block.mineralogy.phyllite_relief_sword": "åƒæžšå²©æµ®é›•ï¼ˆå‰‘）", + "block.mineralogy.phyllite_relief_vertical": "åƒæžšå²©æµ®é›•ï¼ˆç«–纹）", + "block.mineralogy.amphibolite_relief_axe": "角闪岩浮雕（斧）", + "block.mineralogy.amphibolite_relief_blank": "角闪岩浮雕（无图案）", + "block.mineralogy.amphibolite_relief_cross": "角闪岩浮雕（å字）", + "block.mineralogy.amphibolite_relief_hammer": "角闪岩浮雕（锤）", + "block.mineralogy.amphibolite_relief_hoe": "角闪岩浮雕（锄）", + "block.mineralogy.amphibolite_relief_horizontal": "角闪岩浮雕（横纹）", + "block.mineralogy.amphibolite_relief_i": "角闪岩浮雕（I）", + "block.mineralogy.amphibolite_relief_left": "角闪岩浮雕（左纹）", + "block.mineralogy.amphibolite_relief_pickaxe": "角闪岩浮雕（é•ï¼‰", + "block.mineralogy.amphibolite_relief_plus": "角闪岩浮雕（加å·ï¼‰", + "block.mineralogy.amphibolite_relief_right": "角闪岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.amphibolite_relief_sword": "角闪岩浮雕（剑）", + "block.mineralogy.amphibolite_relief_vertical": "角闪岩浮雕（竖纹）", + "block.mineralogy.diabase_relief_axe": "辉绿岩浮雕（斧）", + "block.mineralogy.diabase_relief_blank": "辉绿岩浮雕（无图案）", + "block.mineralogy.diabase_relief_cross": "辉绿岩浮雕（å字）", + "block.mineralogy.diabase_relief_hammer": "辉绿岩浮雕（锤）", + "block.mineralogy.diabase_relief_hoe": "辉绿岩浮雕（锄）", + "block.mineralogy.diabase_relief_horizontal": "辉绿岩浮雕（横纹）", + "block.mineralogy.diabase_relief_i": "辉绿岩浮雕（I）", + "block.mineralogy.diabase_relief_left": "辉绿岩浮雕（左纹）", + "block.mineralogy.diabase_relief_pickaxe": "辉绿岩浮雕（é•ï¼‰", + "block.mineralogy.diabase_relief_plus": "辉绿岩浮雕（加å·ï¼‰", + "block.mineralogy.diabase_relief_right": "辉绿岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.diabase_relief_sword": "辉绿岩浮雕（剑）", + "block.mineralogy.diabase_relief_vertical": "辉绿岩浮雕（竖纹）", + "block.mineralogy.gabbro_relief_axe": "辉长岩浮雕（斧）", + "block.mineralogy.gabbro_relief_blank": "辉长岩浮雕（无图案）", + "block.mineralogy.gabbro_relief_cross": "辉长岩浮雕（å字）", + "block.mineralogy.gabbro_relief_hammer": "辉长岩浮雕（锤）", + "block.mineralogy.gabbro_relief_hoe": "辉长岩浮雕（锄）", + "block.mineralogy.gabbro_relief_horizontal": "辉长岩浮雕（横纹）", + "block.mineralogy.gabbro_relief_i": "辉长岩浮雕（I）", + "block.mineralogy.gabbro_relief_left": "辉长岩浮雕（左纹）", + "block.mineralogy.gabbro_relief_pickaxe": "辉长岩浮雕（é•ï¼‰", + "block.mineralogy.gabbro_relief_plus": "辉长岩浮雕（加å·ï¼‰", + "block.mineralogy.gabbro_relief_right": "辉长岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.gabbro_relief_sword": "辉长岩浮雕（剑）", + "block.mineralogy.gabbro_relief_vertical": "辉长岩浮雕（竖纹）", + "block.mineralogy.peridotite_relief_axe": "橄榄岩浮雕（斧）", + "block.mineralogy.peridotite_relief_blank": "橄榄岩浮雕（无图案）", + "block.mineralogy.peridotite_relief_cross": "橄榄岩浮雕（å字）", + "block.mineralogy.peridotite_relief_hammer": "橄榄岩浮雕（锤）", + "block.mineralogy.peridotite_relief_hoe": "橄榄岩浮雕（锄）", + "block.mineralogy.peridotite_relief_horizontal": "橄榄岩浮雕（横纹）", + "block.mineralogy.peridotite_relief_i": "橄榄岩浮雕（I）", + "block.mineralogy.peridotite_relief_left": "橄榄岩浮雕（左纹）", + "block.mineralogy.peridotite_relief_pickaxe": "橄榄岩浮雕（é•ï¼‰", + "block.mineralogy.peridotite_relief_plus": "橄榄岩浮雕（加å·ï¼‰", + "block.mineralogy.peridotite_relief_right": "橄榄岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.peridotite_relief_sword": "橄榄岩浮雕（剑）", + "block.mineralogy.peridotite_relief_vertical": "橄榄岩浮雕（竖纹）", + "block.mineralogy.basaltic_glass_relief_axe": "玄武岩质玻璃浮雕（斧）", + "block.mineralogy.basaltic_glass_relief_blank": "玄武岩质玻璃浮雕（无图案）", + "block.mineralogy.basaltic_glass_relief_cross": "玄武岩质玻璃浮雕（å字）", + "block.mineralogy.basaltic_glass_relief_hammer": "玄武岩质玻璃浮雕（锤）", + "block.mineralogy.basaltic_glass_relief_hoe": "玄武岩质玻璃浮雕（锄）", + "block.mineralogy.basaltic_glass_relief_horizontal": "玄武岩质玻璃浮雕（横纹）", + "block.mineralogy.basaltic_glass_relief_i": "玄武岩质玻璃浮雕（I）", + "block.mineralogy.basaltic_glass_relief_left": "玄武岩质玻璃浮雕（左纹）", + "block.mineralogy.basaltic_glass_relief_pickaxe": "玄武岩质玻璃浮雕（é•ï¼‰", + "block.mineralogy.basaltic_glass_relief_plus": "玄武岩质玻璃浮雕（加å·ï¼‰", + "block.mineralogy.basaltic_glass_relief_right": "玄武岩质玻璃浮雕（å³çº¹ï¼‰", + "block.mineralogy.basaltic_glass_relief_sword": "玄武岩质玻璃浮雕（剑）", + "block.mineralogy.basaltic_glass_relief_vertical": "玄武岩质玻璃浮雕（竖纹）", + "block.mineralogy.scoria_relief_axe": "ç«å±±æ¸£æµ®é›•ï¼ˆæ–§ï¼‰", + "block.mineralogy.scoria_relief_blank": "ç«å±±æ¸£æµ®é›•ï¼ˆæ— å›¾æ¡ˆï¼‰", + "block.mineralogy.scoria_relief_cross": "ç«å±±æ¸£æµ®é›•ï¼ˆå字）", + "block.mineralogy.scoria_relief_hammer": "ç«å±±æ¸£æµ®é›•ï¼ˆé”¤ï¼‰", + "block.mineralogy.scoria_relief_hoe": "ç«å±±æ¸£æµ®é›•ï¼ˆé”„）", + "block.mineralogy.scoria_relief_horizontal": "ç«å±±æ¸£æµ®é›•ï¼ˆæ¨ªçº¹ï¼‰", + "block.mineralogy.scoria_relief_i": "ç«å±±æ¸£æµ®é›•ï¼ˆI）", + "block.mineralogy.scoria_relief_left": "ç«å±±æ¸£æµ®é›•ï¼ˆå·¦çº¹ï¼‰", + "block.mineralogy.scoria_relief_pickaxe": "ç«å±±æ¸£æµ®é›•ï¼ˆé•ï¼‰", + "block.mineralogy.scoria_relief_plus": "ç«å±±æ¸£æµ®é›•ï¼ˆåŠ å·ï¼‰", + "block.mineralogy.scoria_relief_right": "ç«å±±æ¸£æµ®é›•ï¼ˆå³çº¹ï¼‰", + "block.mineralogy.scoria_relief_sword": "ç«å±±æ¸£æµ®é›•ï¼ˆå‰‘）", + "block.mineralogy.scoria_relief_vertical": "ç«å±±æ¸£æµ®é›•ï¼ˆç«–纹）", + "block.mineralogy.tuff_relief_axe": "å‡ç°å²©æµ®é›•ï¼ˆæ–§ï¼‰", + "block.mineralogy.tuff_relief_blank": "å‡ç°å²©æµ®é›•ï¼ˆæ— å›¾æ¡ˆï¼‰", + "block.mineralogy.tuff_relief_cross": "å‡ç°å²©æµ®é›•ï¼ˆå字）", + "block.mineralogy.tuff_relief_hammer": "å‡ç°å²©æµ®é›•ï¼ˆé”¤ï¼‰", + "block.mineralogy.tuff_relief_hoe": "å‡ç°å²©æµ®é›•ï¼ˆé”„）", + "block.mineralogy.tuff_relief_horizontal": "å‡ç°å²©æµ®é›•ï¼ˆæ¨ªçº¹ï¼‰", + "block.mineralogy.tuff_relief_i": "å‡ç°å²©æµ®é›•ï¼ˆI）", + "block.mineralogy.tuff_relief_left": "å‡ç°å²©æµ®é›•ï¼ˆå·¦çº¹ï¼‰", + "block.mineralogy.tuff_relief_pickaxe": "å‡ç°å²©æµ®é›•ï¼ˆé•ï¼‰", + "block.mineralogy.tuff_relief_plus": "å‡ç°å²©æµ®é›•ï¼ˆåŠ å·ï¼‰", + "block.mineralogy.tuff_relief_right": "å‡ç°å²©æµ®é›•ï¼ˆå³çº¹ï¼‰", + "block.mineralogy.tuff_relief_sword": "å‡ç°å²©æµ®é›•ï¼ˆå‰‘）", + "block.mineralogy.tuff_relief_vertical": "å‡ç°å²©æµ®é›•ï¼ˆç«–纹）", + "block.mineralogy.siltstone_relief_axe": "粉砂岩浮雕（斧）", + "block.mineralogy.siltstone_relief_blank": "粉砂岩浮雕（无图案）", + "block.mineralogy.siltstone_relief_cross": "粉砂岩浮雕（å字）", + "block.mineralogy.siltstone_relief_hammer": "粉砂岩浮雕（锤）", + "block.mineralogy.siltstone_relief_hoe": "粉砂岩浮雕（锄）", + "block.mineralogy.siltstone_relief_horizontal": "粉砂岩浮雕（横纹）", + "block.mineralogy.siltstone_relief_i": "粉砂岩浮雕（I）", + "block.mineralogy.siltstone_relief_left": "粉砂岩浮雕（左纹）", + "block.mineralogy.siltstone_relief_pickaxe": "粉砂岩浮雕（é•ï¼‰", + "block.mineralogy.siltstone_relief_plus": "粉砂岩浮雕（加å·ï¼‰", + "block.mineralogy.siltstone_relief_right": "粉砂岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.siltstone_relief_sword": "粉砂岩浮雕（剑）", + "block.mineralogy.siltstone_relief_vertical": "粉砂岩浮雕（竖纹）", + "block.mineralogy.rock_salt_relief_axe": "岩ç›æµ®é›•ï¼ˆæ–§ï¼‰", + "block.mineralogy.rock_salt_relief_blank": "岩ç›æµ®é›•ï¼ˆæ— å›¾æ¡ˆï¼‰", + "block.mineralogy.rock_salt_relief_cross": "岩ç›æµ®é›•ï¼ˆå字）", + "block.mineralogy.rock_salt_relief_hammer": "岩ç›æµ®é›•ï¼ˆé”¤ï¼‰", + "block.mineralogy.rock_salt_relief_hoe": "岩ç›æµ®é›•ï¼ˆé”„）", + "block.mineralogy.rock_salt_relief_horizontal": "岩ç›æµ®é›•ï¼ˆæ¨ªçº¹ï¼‰", + "block.mineralogy.rock_salt_relief_i": "岩ç›æµ®é›•ï¼ˆI）", + "block.mineralogy.rock_salt_relief_left": "岩ç›æµ®é›•ï¼ˆå·¦çº¹ï¼‰", + "block.mineralogy.rock_salt_relief_pickaxe": "岩ç›æµ®é›•ï¼ˆé•ï¼‰", + "block.mineralogy.rock_salt_relief_plus": "岩ç›æµ®é›•ï¼ˆåŠ å·ï¼‰", + "block.mineralogy.rock_salt_relief_right": "岩ç›æµ®é›•ï¼ˆå³çº¹ï¼‰", + "block.mineralogy.rock_salt_relief_sword": "岩ç›æµ®é›•ï¼ˆå‰‘）", + "block.mineralogy.rock_salt_relief_vertical": "岩ç›æµ®é›•ï¼ˆç«–纹）", + "block.mineralogy.hornfels_relief_axe": "角岩浮雕（斧）", + "block.mineralogy.hornfels_relief_blank": "角岩浮雕（无图案）", + "block.mineralogy.hornfels_relief_cross": "角岩浮雕（å字）", + "block.mineralogy.hornfels_relief_hammer": "角岩浮雕（锤）", + "block.mineralogy.hornfels_relief_hoe": "角岩浮雕（锄）", + "block.mineralogy.hornfels_relief_horizontal": "角岩浮雕（横纹）", + "block.mineralogy.hornfels_relief_i": "角岩浮雕（I）", + "block.mineralogy.hornfels_relief_left": "角岩浮雕（左纹）", + "block.mineralogy.hornfels_relief_pickaxe": "角岩浮雕（é•ï¼‰", + "block.mineralogy.hornfels_relief_plus": "角岩浮雕（加å·ï¼‰", + "block.mineralogy.hornfels_relief_right": "角岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.hornfels_relief_sword": "角岩浮雕（剑）", + "block.mineralogy.hornfels_relief_vertical": "角岩浮雕（竖纹）", + "block.mineralogy.quartzite_relief_axe": "石英岩浮雕（斧）", + "block.mineralogy.quartzite_relief_blank": "石英岩浮雕（无图案）", + "block.mineralogy.quartzite_relief_cross": "石英岩浮雕（å字）", + "block.mineralogy.quartzite_relief_hammer": "石英岩浮雕（锤）", + "block.mineralogy.quartzite_relief_hoe": "石英岩浮雕（锄）", + "block.mineralogy.quartzite_relief_horizontal": "石英岩浮雕（横纹）", + "block.mineralogy.quartzite_relief_i": "石英岩浮雕（I）", + "block.mineralogy.quartzite_relief_left": "石英岩浮雕（左纹）", + "block.mineralogy.quartzite_relief_pickaxe": "石英岩浮雕（é•ï¼‰", + "block.mineralogy.quartzite_relief_plus": "石英岩浮雕（加å·ï¼‰", + "block.mineralogy.quartzite_relief_right": "石英岩浮雕（å³çº¹ï¼‰", + "block.mineralogy.quartzite_relief_sword": "石英岩浮雕（剑）", + "block.mineralogy.quartzite_relief_vertical": "石英岩浮雕（竖纹）", + "block.mineralogy.novaculite_relief_axe": "å‡å¯†çŸ³è‹±å²©æµ®é›•ï¼ˆæ–§ï¼‰", + "block.mineralogy.novaculite_relief_blank": "å‡å¯†çŸ³è‹±å²©æµ®é›•ï¼ˆæ— å›¾æ¡ˆï¼‰", + "block.mineralogy.novaculite_relief_cross": "å‡å¯†çŸ³è‹±å²©æµ®é›•ï¼ˆå字）", + "block.mineralogy.novaculite_relief_hammer": "å‡å¯†çŸ³è‹±å²©æµ®é›•ï¼ˆé”¤ï¼‰", + "block.mineralogy.novaculite_relief_hoe": "å‡å¯†çŸ³è‹±å²©æµ®é›•ï¼ˆé”„）", + "block.mineralogy.novaculite_relief_horizontal": "å‡å¯†çŸ³è‹±å²©æµ®é›•ï¼ˆæ¨ªçº¹ï¼‰", + "block.mineralogy.novaculite_relief_i": "å‡å¯†çŸ³è‹±å²©æµ®é›•ï¼ˆI）", + "block.mineralogy.novaculite_relief_left": "å‡å¯†çŸ³è‹±å²©æµ®é›•ï¼ˆå·¦çº¹ï¼‰", + "block.mineralogy.novaculite_relief_pickaxe": "å‡å¯†çŸ³è‹±å²©æµ®é›•ï¼ˆé•ï¼‰", + "block.mineralogy.novaculite_relief_plus": "å‡å¯†çŸ³è‹±å²©æµ®é›•ï¼ˆåŠ å·ï¼‰", + "block.mineralogy.novaculite_relief_right": "å‡å¯†çŸ³è‹±å²©æµ®é›•ï¼ˆå³çº¹ï¼‰", + "block.mineralogy.novaculite_relief_sword": "å‡å¯†çŸ³è‹±å²©æµ®é›•ï¼ˆå‰‘）", + "block.mineralogy.novaculite_relief_vertical": "å‡å¯†çŸ³è‹±å²©æµ®é›•ï¼ˆç«–纹）", + "itemGroup.mineralogy.mineralogy": "矿物学", + "itemGroup.mineralogy.rock": "矿物学岩石", + "itemGroup.mineralogy.stair": "矿物学楼梯", + "itemGroup.mineralogy.slab": "矿物学å°é˜¶", + "itemGroup.mineralogy.wall": "矿物学墙", + "itemGroup.mineralogy.item": "矿物学物å“", + "block.mineralogy.crude_oil": "原油", + "item.mineralogy.crude_oil_bucket": "原油桶", + "fluid.mineralogy.crude_oil": "原油", + "advancements.mineralogy.all_the_rocks.title": "岩石大全", + "advancements.mineralogy.all_the_rocks.description": "你已找到矿物学中的所有标准岩石类型ï¼" } diff --git a/src/main/resources/assets/mineralogy/models/block/crude_oil.json b/src/main/resources/assets/mineralogy/models/block/crude_oil.json new file mode 100644 index 000000000..0d803b02f --- /dev/null +++ b/src/main/resources/assets/mineralogy/models/block/crude_oil.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "mineralogy:blocks/crude_oil_still" + } +} diff --git a/src/main/resources/assets/mineralogy/models/item/crude_oil_bucket.json b/src/main/resources/assets/mineralogy/models/item/crude_oil_bucket.json new file mode 100644 index 000000000..7a732b4c1 --- /dev/null +++ b/src/main/resources/assets/mineralogy/models/item/crude_oil_bucket.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mineralogy:items/crude_oil_bucket" + } +} diff --git a/src/main/resources/assets/mineralogy/textures/blocks/crude_oil_flow.png b/src/main/resources/assets/mineralogy/textures/blocks/crude_oil_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..b5d5b166cfcfc5276cd51ad8b04408ece4454dff GIT binary patch literal 2924 zcmZ8jXHXN^77mDnUR9)+L_m=RM5H7XX+{vGiG>mYSwJj6k`*LbAc}#dH)$Fopdc&) zqV!%OgkF>;&5!^_%}NRaiJM1WcHYkDydQVYEi?Drd(L;h?2H$vlO05 zJHhQPVHUnVS!`N8CTDx(v9ry$^Y=)6f#Iy=C_YegvfpFug>jx*@RmiM>s=-P`(fHL zTxPdGoGo+-Qz#Au*a9&Sr5@##+iCkKu(!4Jc$iI07dKF*t*C-44v=NTC9g?AZ%rxxQm1Dw5GN=yB)lSm>WK= za^`uej$M%%p&$`^PBJ^~GwG{-eZ#c& zj@yyke55RT7T1OYi-3~q1K!^XP0_I`eqApxCAZ>_-38aGtn%3tt0Dk-I6S5fkJ$yz z`FjbV<5R7c$IhuAq@Ng>T5`e39f4P~o!H;PYZ_=q&EIYLsbP^sLvXJAFmN5u>2>6m zgdvqNnVaV?#zdRy&wY&8R<$SAD$_(xTpyF#OhMV20O(L35}Q|m@?#=h$_K>1n97(F` z>=#!vgHh!^i;7#1lUZd4POA2P*=AW3BTHH@6_LXm2+c8!ZR_FpFYh^D>iR6|eE|d= z;kaz&{%$)H*0ElQ+cx|)-^LMUO*wlN%t}(7n9ez9tV~TnEwM%V?DOrqI(IH958@i5 z!$KeYK!^_aK5^V>&Zj}&t)5-ln9~`Xz0Wmwr|Cvb)lPH?du*t5(#kU_Hhrm&=UM%L zGT)nn8fm&(bdFutL`KYlDrw_6Lbzz6K(psb>y$j0pch%QM{z1B(5HT!8 zYluY9OHKJyWXawYKR+ zmcGqO)~yUUtQgr8(~wHgpi)eEVST3T>-|#?tW2Bpn3|^fA3NJh_v+Pm=xXo+ z{9y+sH2tbIM!IN+51^5@xgF#Cz=A_6tF=IK_<6%jLG)Z(jxA6kVaY zmJJGLvXC5OgczeTcz|ZbcK5#ulLV#ZKQxIWh8XrwRYwE$WXATprXcwisBn@9z#bCP zqBWvNGS4j4=&W-wR9-72%NEnLc1XIoozOll^b} z-L1LWVA$MlGp`OeR~*|N0RdHO2@Iblnwfj0AZIgojJn|BWAibo{_*u=JHalWa%su* z%ISa?=LpvQo7s)|PDzpAdj4?@^Jcsu5rI?5NRxiDBe&~?hob!yy&&yIn*;6DygxgDzPTS@YLjxbs<`+8qh zrpSgw9R!??sU#({-X^JNYx%9fJ2Xjg0zX)ZWPB*qE9NY0IRmrI*-@-5O2b5&(zbw- zbomraz)9f^MX3Afk1`}2*O>|R%{ERy5)Y>C@i1f!TwbspcP>~f4eVGmm*KoM^0VrH zNE5EU75Usp)-{s{SmC-6?}8YcZK!FZ4(-MNNYqM|A%?V1!$6dIZIPAhZ+Rlgn`>8- z#RmA_JFGu?mQVi2s9Wxy&Bv(nNqis;eJPa#ZA^ zPVQoRg9xtpy7aUd$EVOE=AyLb3DRRal*A;>;{;cPNQm}OQtdriYOA`dPLBmLo(0Mt z2;!M7dNrQ)nmSJA?Q}4|C~8N4*nv={%a6jC(eVO4mZIJg_BgN*Qv7IVnJ~RX|Cv;7 zu$_A*#xUQb^-b)D5*+e_ZbG+R!-(zZr9*!HH-bi(OUF%UEV0?P`3<4yA)mjQe+cxn zxP%RUn*DTaVO`&Zwwa3J+UtCO;ar8%|1{l>w~`aXVt~2_JQ#JQs`Sq1vojlr zd?aq?#RTG7+O-7(ra_~1DukTx|_}=nekEBi#(iu@CG$yt(@|xuDxOdgh zXHV^J7WgnV9oE-63O-#+yLSq^AbMd>J$ly%> z3q8-d4!8HAD|MS}|4*mmwxBB;xtJ5ac?p!FP8Xf_MuM*OFGRcnK8GgRV4JmX@S+9< zLg9-&mODo7GgAaaYpp_%L>Gbikn0ZwOJ;VWqW2iI9__91IS3Ka(b_qLeme(#t#`ubhxs7t^SSedHTE20zB$)$5WPiczMvmo z%WXu%Y+#NxM`iH~(5F=rbGG*wVkW#k%?znOiV;)~!_NWU>zlWkf6mb7jPnN>gY1tg z1M~kr=RI0`Pi2`$=Mz7z5z#N*5-owuAH+O;?n<>pL`2=q-r6w*vW6F;zeMx_8H0m} z*z2UvEmIp!c$gLkrfZ>jwtY8jZA{jyrnp?p5D^h#bQmj!O&$`?S?t~(VFh^oi;#z z(?@Ha7rA7dc2?iq^o|Gd8^b)X=K*B+>Hc|0lx95y+&J(QlDGyZe!1fm>59Vd7#6xWf zT6oZRLuPV4odYD`K@2_P2@kxc{)`8kFDVZ|N;W>c6A!@6Tw*EWL)=3vBBYv-RPiAs zMRps!54)%JS3Ia8xIj2Ykm<$4<sNVq!f0 z>By@1Al~M&yRYJdCRj{qJVFU*$wP<_R42V8EBChF2;{*o1LsS|K#W)m9zs~cJlOxV zz(a7A*5E9ImsGMd%s#>KU^5jLAC?}X9gGJ&Ses|L;~`jQR|TnUduSg8hoC$t0?aEZ=fqmo@4!h6rvUj%Va-1Mf{OJ4KeNo=Lqpw)qm(JWRWqudx>3dmdarJln#N z-?uz)vZ7%Q0<1S+8*4HTu>IP8mxo93;T&umAFLJkP~eHTaJ9mp)q?4;-IIB6aaw!j zA!gbkoONo)k?VdUUwNzVS5^I!$ipke8_2`y1YrJls}sxvnX^mm?0}~jqpc&NGh}t6 zqYV#p9?)+MhApc$KQpr4+RICGtTRAH*=uhoS(+z<0(qE5^3&Se^Y9DtKx42VQEu>X z@qzA=+Z_*~zSm^5mj^l?i75%O0BJ8od}}Y_HDIlCamUgN zZR>}V2bc|4n(0(E3Sj}RnSj8PL7y*m>t^;mXa^Vbz$iXk=b~KMDdIswe`(Ld*+=_` z2b$@RAY}Oo4>&ga7}qNWWrdh}`i=+d=5Bb%d+VIOvT1B^p*;IbkcaX_!k+hhz(cz` zR^*R(NCAcJKiXDc*vQSezE*yNd4NG)vb(RYD_E;xLNSJmLy4z6xcpm6LjIl5&{OISzlJKlaI2)g=6e2ZsF*_J<+vfql#@d7v#1zC;9=XSL-p)kV@G%b~86s6YP{9M+ z+Y~USz{DU`DCVXan?HO3RtO{AK;7>iP7BCiSIt#c54qvqkx{-^`498J$+lUwo)ca1 z*HgkFP~<_r;6Wbp5c=pFH*?zJr5(cq?|HBXR^RX->o_aM(v7QpnQJt>KjGliM;919 zu0MD4JRJUymOz3vwmi^=humn730Bst)G*$M427F-D{jjJ?|I;*b^3@0G6%blcz6dM zdaCX|h!5gxj?6>LJjj-Z@&DkV${!=mRY%zAA^f@9VVmLMPXPiC+2@J9sRntdA{`UD ny1c0d8Fsn9;enHroKyV`^JrV3#24}^00000NkvXXu0mjfL5or4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mineralogy/textures/blocks/crude_oil_still.png.mcmeta b/src/main/resources/assets/mineralogy/textures/blocks/crude_oil_still.png.mcmeta new file mode 100644 index 000000000..0645f48c6 --- /dev/null +++ b/src/main/resources/assets/mineralogy/textures/blocks/crude_oil_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/mineralogy/textures/items/crude_oil_bucket.png b/src/main/resources/assets/mineralogy/textures/items/crude_oil_bucket.png new file mode 100644 index 0000000000000000000000000000000000000000..0464fc589dafb3af801e6b64818cffc2cd43f72a GIT binary patch literal 416 zcmV;R0bl-!P)H zK~y-)#gi>h13?gmpFNt8kRyfip)LeN7J23pOn*dwKrODSrWXvTt3jbq6=!hEFQ_?1 zYAQLhh6ECVSOgeC$RWyY?xR3MNEkKy?#wf@lUew06Z6C%2(sMwJkRP%De)~JPkgx7 zI8HfsXYYW`wdEQ}6qE06uK`$H5r|4H$AR~3254^VGMP*SK%?5~)8h=1Wz--`;uW_g z%i!W6j$_uh_i1j)+Fab0#BE91?RH6TR0HEU2B6#Rmh=~setJIu0Hl<>J>M`mKDXM* z(ILJ55Uut6Cn%*v7>4%Z;_|8n)>@M!i5*~V2Dznaij)%H_W>}*(CZK9E|Rn8#+{uG z7Td&5r;|ldWY5#-6k`kkqtU3;{+At$$7Ac~$-n*!MXOf-6Z-&9Yg&SZ#0kX!0000< KMNUMnLSTYkC9Ws{ literal 0 HcmV?d00001 diff --git a/src/main/resources/coremods/mineralogy_legacy_world_fix.js b/src/main/resources/coremods/mineralogy_legacy_world_fix.js index a83a78ccd..bc46d5ff9 100644 --- a/src/main/resources/coremods/mineralogy_legacy_world_fix.js +++ b/src/main/resources/coremods/mineralogy_legacy_world_fix.js @@ -70,7 +70,7 @@ function initializeCoreMod() { prefix.add(new VarInsnNode(Opcodes.ALOAD, 3)); prefix.add(new MethodInsnNode( Opcodes.INVOKESTATIC, - 'com/mcmoddev/mineralogy/patching/LegacyWorldDataHook', + 'zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook', 'prepareLegacyChunk', '(Lnet/minecraft/nbt/CompoundTag;)V', false)); @@ -81,7 +81,7 @@ function initializeCoreMod() { if (instruction.getOpcode() === Opcodes.ARETURN) { method.instructions.insertBefore(instruction, new MethodInsnNode( Opcodes.INVOKESTATIC, - 'com/mcmoddev/mineralogy/patching/LegacyWorldDataHook', + 'zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook', 'finalizeLegacyChunk', '(Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag;', false)); diff --git a/src/main/resources/data/forge/tags/blocks/cobblestone.json b/src/main/resources/data/forge/tags/blocks/cobblestone.json index eccd4a778..4a747bf9a 100644 --- a/src/main/resources/data/forge/tags/blocks/cobblestone.json +++ b/src/main/resources/data/forge/tags/blocks/cobblestone.json @@ -1,32 +1,7 @@ { "replace": false, "values": [ - "mineralogy:andesite", - "mineralogy:basalt", - "mineralogy:diorite", - "mineralogy:granite", - "mineralogy:rhyolite", - "mineralogy:pegmatite", - "mineralogy:diabase", - "mineralogy:gabbro", - "mineralogy:peridotite", - "mineralogy:basaltic_glass", - "mineralogy:scoria", - "mineralogy:tuff", - "mineralogy:shale", - "mineralogy:conglomerate", - "mineralogy:dolomite", - "mineralogy:limestone", - "mineralogy:siltstone", - "mineralogy:marble", - "mineralogy:rock_salt", - "mineralogy:slate", - "mineralogy:schist", - "mineralogy:gneiss", - "mineralogy:phyllite", - "mineralogy:amphibolite", - "mineralogy:hornfels", - "mineralogy:quartzite", - "mineralogy:novaculite" + "mineralogy:chert", + "mineralogy:pumice" ] } diff --git a/src/main/resources/data/forge/tags/fluids/crude_oil.json b/src/main/resources/data/forge/tags/fluids/crude_oil.json new file mode 100644 index 000000000..e80854f75 --- /dev/null +++ b/src/main/resources/data/forge/tags/fluids/crude_oil.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:crude_oil", + "mineralogy:flowing_crude_oil" + ] +} diff --git a/src/main/resources/data/forge/tags/items/buckets/crude_oil.json b/src/main/resources/data/forge/tags/items/buckets/crude_oil.json new file mode 100644 index 000000000..8dd22b7c7 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/buckets/crude_oil.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:crude_oil_bucket" + ] +} diff --git a/src/main/resources/data/forge/tags/items/cobblestone.json b/src/main/resources/data/forge/tags/items/cobblestone.json index eccd4a778..4a747bf9a 100644 --- a/src/main/resources/data/forge/tags/items/cobblestone.json +++ b/src/main/resources/data/forge/tags/items/cobblestone.json @@ -1,32 +1,7 @@ { "replace": false, "values": [ - "mineralogy:andesite", - "mineralogy:basalt", - "mineralogy:diorite", - "mineralogy:granite", - "mineralogy:rhyolite", - "mineralogy:pegmatite", - "mineralogy:diabase", - "mineralogy:gabbro", - "mineralogy:peridotite", - "mineralogy:basaltic_glass", - "mineralogy:scoria", - "mineralogy:tuff", - "mineralogy:shale", - "mineralogy:conglomerate", - "mineralogy:dolomite", - "mineralogy:limestone", - "mineralogy:siltstone", - "mineralogy:marble", - "mineralogy:rock_salt", - "mineralogy:slate", - "mineralogy:schist", - "mineralogy:gneiss", - "mineralogy:phyllite", - "mineralogy:amphibolite", - "mineralogy:hornfels", - "mineralogy:quartzite", - "mineralogy:novaculite" + "mineralogy:chert", + "mineralogy:pumice" ] } diff --git a/src/main/resources/data/forge/tags/items/dusts/coal.json b/src/main/resources/data/forge/tags/items/dusts/coal.json new file mode 100644 index 000000000..5d341ba24 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dusts/coal.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} diff --git a/src/main/resources/data/forge/tags/items/paper.json b/src/main/resources/data/forge/tags/items/paper.json new file mode 100644 index 000000000..521196bf4 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/paper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:paper" + ] +} diff --git a/src/main/resources/data/forge/tags/items/sand.json b/src/main/resources/data/forge/tags/items/sand.json new file mode 100644 index 000000000..c2b982eea --- /dev/null +++ b/src/main/resources/data/forge/tags/items/sand.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:sand", + "minecraft:red_sand" + ] +} diff --git a/src/main/resources/data/minecraft/recipes/andesite.json b/src/main/resources/data/minecraft/recipes/andesite.json deleted file mode 100644 index 915a7f1cd..000000000 --- a/src/main/resources/data/minecraft/recipes/andesite.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:diorite" - }, - { - "tag": "forge:cobblestone" - } - ], - "result": { - "item": "minecraft:andesite", - "count": 2 - } -} diff --git a/src/main/resources/data/minecraft/recipes/diorite.json b/src/main/resources/data/minecraft/recipes/diorite.json deleted file mode 100644 index c736018d3..000000000 --- a/src/main/resources/data/minecraft/recipes/diorite.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "CQ", - "QC" - ], - "key": { - "Q": { - "item": "minecraft:quartz" - }, - "C": { - "tag": "forge:cobblestone" - } - }, - "result": { - "item": "minecraft:diorite", - "count": 2 - } -} diff --git a/src/main/resources/data/minecraft/recipes/dispenser.json b/src/main/resources/data/minecraft/recipes/dispenser.json deleted file mode 100644 index e010879a3..000000000 --- a/src/main/resources/data/minecraft/recipes/dispenser.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#X#", - "#R#" - ], - "key": { - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "forge:cobblestone" - }, - "X": { - "item": "minecraft:bow" - } - }, - "result": { - "item": "minecraft:dispenser" - } -} diff --git a/src/main/resources/data/minecraft/recipes/dropper.json b/src/main/resources/data/minecraft/recipes/dropper.json deleted file mode 100644 index 437c22cf6..000000000 --- a/src/main/resources/data/minecraft/recipes/dropper.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "# #", - "#R#" - ], - "key": { - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "forge:cobblestone" - } - }, - "result": { - "item": "minecraft:dropper" - } -} diff --git a/src/main/resources/data/minecraft/recipes/furnace.json b/src/main/resources/data/minecraft/recipes/furnace.json deleted file mode 100644 index 69998c5fd..000000000 --- a/src/main/resources/data/minecraft/recipes/furnace.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "# #", - "###" - ], - "key": { - "#": { - "tag": "mineralogy:vanilla_furnace_materials" - } - }, - "result": { - "item": "minecraft:furnace" - } -} diff --git a/src/main/resources/data/minecraft/recipes/lever.json b/src/main/resources/data/minecraft/recipes/lever.json deleted file mode 100644 index 2d346f1d9..000000000 --- a/src/main/resources/data/minecraft/recipes/lever.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "#" - ], - "key": { - "#": { - "tag": "forge:cobblestone" - }, - "X": { - "item": "minecraft:stick" - } - }, - "result": { - "item": "minecraft:lever" - } -} diff --git a/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json b/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json deleted file mode 100644 index aaa7ff7be..000000000 --- a/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "mossy_cobblestone", - "ingredients": [ - { - "tag": "forge:cobblestone" - }, - { - "item": "minecraft:vine" - } - ], - "result": { - "item": "minecraft:mossy_cobblestone" - } -} diff --git a/src/main/resources/data/minecraft/recipes/observer.json b/src/main/resources/data/minecraft/recipes/observer.json deleted file mode 100644 index 462665e45..000000000 --- a/src/main/resources/data/minecraft/recipes/observer.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "RRQ", - "###" - ], - "key": { - "Q": { - "item": "minecraft:quartz" - }, - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "forge:cobblestone" - } - }, - "result": { - "item": "minecraft:observer" - } -} diff --git a/src/main/resources/data/minecraft/recipes/piston.json b/src/main/resources/data/minecraft/recipes/piston.json deleted file mode 100644 index a76f23df6..000000000 --- a/src/main/resources/data/minecraft/recipes/piston.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "TTT", - "#X#", - "#R#" - ], - "key": { - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "forge:cobblestone" - }, - "T": { - "tag": "minecraft:planks" - }, - "X": { - "item": "minecraft:iron_ingot" - } - }, - "result": { - "item": "minecraft:piston" - } -} diff --git a/src/main/resources/data/minecraft/recipes/stone.json b/src/main/resources/data/minecraft/recipes/stone.json deleted file mode 100644 index 7d64bde64..000000000 --- a/src/main/resources/data/minecraft/recipes/stone.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "tag": "forge:cobblestone" - }, - "result": "minecraft:stone", - "experience": 0.1, - "cookingtime": 200 -} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json index 8d9676560..260dcfa02 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_block_polishing.json new file mode 100644 index 000000000..87f8e4105 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json index 1b184ce18..cc057b192 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:amphibolite_brick" + "item": "mineralogy:amphibolite_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab.json index a7644bac4..84efde99e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:amphibolite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_polishing.json new file mode 100644 index 000000000..92cbad4eb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_recombination.json new file mode 100644 index 000000000..23a2d2ab8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json index 1247f9680..16e65cb2f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:amphibolite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs_polishing.json new file mode 100644 index 000000000..3cd6e4cd2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json index e2e0b0383..ce8198578 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:amphibolite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall_polishing.json new file mode 100644 index 000000000..321d91277 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json new file mode 100644 index 000000000..5134c2ab2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json index 09a1d9933..e2f4e34c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite" - ] + "item": "mineralogy:amphibolite_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..7c8892582 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slab_recombination.json new file mode 100644 index 000000000..3a72d8df1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slabs_to_brick.json new file mode 100644 index 000000000..1b0d83fc1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_stairs_to_brick.json new file mode 100644 index 000000000..40f71fb52 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_walls_to_brick.json new file mode 100644 index 000000000..37c0b8563 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_polishing.json new file mode 100644 index 000000000..877a75c5a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_recombination.json new file mode 100644 index 000000000..dc26d5dd8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slabs_to_brick.json new file mode 100644 index 000000000..842a4722e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_polishing.json new file mode 100644 index 000000000..828993833 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_to_brick.json new file mode 100644 index 000000000..0069aa19d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_wall_polishing.json new file mode 100644 index 000000000..14b8436f4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_walls_to_brick.json new file mode 100644 index 000000000..5c468f626 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_axe.json index 323262aa9..5067c94e0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" + "item": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_blank.json index 04362210b..e8a914569 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:amphibolite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_cross.json index 50e6905e0..e6d5e9066 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" + "item": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hammer.json index 7126bc991..33d4e9773 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" + "item": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hoe.json index ac2aa25d6..df6ddf675 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" + "item": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_horizontal.json index a585125bb..366c28607 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" + "item": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_i.json index 27bbbd821..ca5e555af 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" + "item": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_left.json index 6e94b26c6..c782338bf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" + "item": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_pickaxe.json index fa4e75d26..3777a75b5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" + "item": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_plus.json index 68f7949b1..3aecb465f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" + "item": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_right.json index 0315f2c7f..fd7f9b09c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" + "item": "mineralogy:amphibolite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_sword.json index 51b1852a4..904b9718d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" + "item": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_vertical.json index 721400da9..6d3ed93e6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" + "item": "mineralogy:amphibolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_slab.json index f052be64e..1932499d4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json index 6de5e19b4..22ddf3690 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json index 5f7feb7f7..bbe632bfb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:amphibolite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json index c534f493c..7c7b70295 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:amphibolite_smooth_brick" + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_slab.json index 14a9e5e73..b50184c56 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:amphibolite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json index 51155dddc..07174f01e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:amphibolite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json index 853220680..b32eb6d2d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:amphibolite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json index ffc08031d..daaef571d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:amphibolite_smooth" + "item": "mineralogy:amphibolite_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_slab.json index b65791635..30148e7e0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:amphibolite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json index 581c76fe2..86d897285 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:amphibolite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json index b0cfbc3ae..b5652cbe4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:amphibolite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json index 1d2d0977f..809fc3df7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_to_stone.json new file mode 100644 index 000000000..c42d37152 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:amphibolite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:amphibolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json index 1d0de6bd1..a5284c2eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + } + ], "rewards": { "recipes": [ "mineralogy:amphibolite_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json index 158e32221..df87171f3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_block_polishing.json new file mode 100644 index 000000000..f26e7481b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json index 353cbbe4c..01e51bbe0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:andesite_brick" + "item": "mineralogy:andesite_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab.json index 901cb7842..f4dffb46e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:andesite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_polishing.json new file mode 100644 index 000000000..3bb833e12 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_recombination.json new file mode 100644 index 000000000..0b457994c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json index 6c766a9d8..92c2c2b31 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:andesite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs_polishing.json new file mode 100644 index 000000000..9188c0655 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json index 13ff88985..99153df04 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:andesite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall_polishing.json new file mode 100644 index 000000000..03a1fb15a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json new file mode 100644 index 000000000..d79fcae34 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:andesite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json index f6df95a18..76f4c1359 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_furnace" @@ -16,7 +22,17 @@ "conditions": { "items": [ { - "tag": "mineralogy:crafting_materials/andesite" + "item": "mineralogy:andesite_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -26,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..6529081d9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slab_recombination.json new file mode 100644 index 000000000..1743c81f5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slabs_to_brick.json new file mode 100644 index 000000000..54ff75d9a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_stairs_to_brick.json new file mode 100644 index 000000000..6616bfdcd --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_walls_to_brick.json new file mode 100644 index 000000000..efeae447e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_polishing.json new file mode 100644 index 000000000..ddc7536af --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_recombination.json new file mode 100644 index 000000000..ca6fe0a24 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slabs_to_brick.json new file mode 100644 index 000000000..27ced5dbc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_polishing.json new file mode 100644 index 000000000..3abbd19d4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_to_brick.json new file mode 100644 index 000000000..e20dd9bbf --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_wall_polishing.json new file mode 100644 index 000000000..e7d0466b7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_walls_to_brick.json new file mode 100644 index 000000000..7b9645965 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_axe.json index b2256859e..466a2a77e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" + "item": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json index cb57e0387..b8b4f01ef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:andesite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_cross.json index ccfc33bc2..2ef51c77d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" + "item": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hammer.json index 8dadfb579..df2fecf41 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" + "item": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hoe.json index 2e422bfb5..6f6646e6b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" + "item": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_horizontal.json index 50d4e2c0c..859c57b2d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" + "item": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_i.json index 7362d062f..5e128bfa5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" + "item": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_left.json index 7441a6a1f..3a891c4e6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" + "item": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_pickaxe.json index 2f9ebd123..abf33761d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" + "item": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_plus.json index 9ef3c95eb..231f0c54b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" + "item": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_right.json index fa5b7488b..8d835eb21 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" + "item": "mineralogy:andesite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_sword.json index 6d135dfc1..1fc256647 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" + "item": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_vertical.json index ba48997ec..8258451f3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" + "item": "mineralogy:andesite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab.json index 9da88f5d8..2c409801d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth.json index e16f0a1cd..22daa0960 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_smooth" @@ -20,12 +26,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json index 5ab2ebcfc..8050e7231 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:andesite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json index 7e742af52..fcf7b64de 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:andesite_smooth_brick" + "item": "mineralogy:andesite_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_slab.json index 629c493f5..ff8705cda 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:andesite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json index f5cf7e7cf..fdd419b30 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:andesite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json index 8ee512a65..9c06e29e7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:andesite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json index b5961e633..db82c35bb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:andesite_smooth" + "item": "mineralogy:andesite_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab.json index b872071aa..c0a26e442 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:andesite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_stairs.json index 372fd72ab..99a8b2c3b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:andesite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json index 9a2528370..ef2a0684a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:andesite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_stairs.json index 68d1e3ef9..532e9aa23 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_to_stone.json new file mode 100644 index 000000000..c73e2d651 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:andesite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_wall.json index 9972efc56..e6f85bb46 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + } + ], "rewards": { "recipes": [ "mineralogy:andesite_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json index 1f4e56e75..af8924a24 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_block_polishing.json new file mode 100644 index 000000000..51c95df57 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json index cb9e93215..e0860685c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:basalt_brick" + "item": "mineralogy:basalt_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab.json index b4bdefbd0..dd60c508d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:basalt_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_polishing.json new file mode 100644 index 000000000..89be8cf51 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_recombination.json new file mode 100644 index 000000000..bbc43b3a5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json index 8c4b69e6a..5d487117d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:basalt_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs_polishing.json new file mode 100644 index 000000000..5641a1236 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json index 1b7943e59..e1beb5f9f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:basalt_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall_polishing.json new file mode 100644 index 000000000..8fbd587b5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json new file mode 100644 index 000000000..39ca21a76 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:basalt_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json index b30dbb82b..51869233e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_furnace" @@ -16,7 +22,17 @@ "conditions": { "items": [ { - "tag": "mineralogy:crafting_materials/basalt" + "item": "mineralogy:basalt_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -26,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_brick_slab_recombination.json new file mode 100644 index 000000000..19fcc951d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slab_recombination.json new file mode 100644 index 000000000..8d62c08f6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slabs_to_brick.json new file mode 100644 index 000000000..ff293ad66 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_stairs_to_brick.json new file mode 100644 index 000000000..7fedb5116 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_walls_to_brick.json new file mode 100644 index 000000000..2ceb39669 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_polishing.json new file mode 100644 index 000000000..ae09d7ce2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_recombination.json new file mode 100644 index 000000000..7616e4ad7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slabs_to_brick.json new file mode 100644 index 000000000..247164e81 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_polishing.json new file mode 100644 index 000000000..ffaf8968e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_to_brick.json new file mode 100644 index 000000000..17b41634b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_wall_polishing.json new file mode 100644 index 000000000..b0ef38112 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_walls_to_brick.json new file mode 100644 index 000000000..440ff2a71 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_axe.json index 3b04680c8..1bf9a7773 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" + "item": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json index ee98a2e05..aa3403abc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:basalt_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_cross.json index 8b56b1ba3..7e965112a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" + "item": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hammer.json index f3813531e..8c9fb9112 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" + "item": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hoe.json index d5c5f1fae..b3da2dca4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" + "item": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_horizontal.json index 65bef0b89..c551ae4ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" + "item": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_i.json index 889192489..58c652393 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" + "item": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_left.json index b0de801c6..440af66b6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" + "item": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_pickaxe.json index 41a97512c..534f15b6b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" + "item": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_plus.json index dd586fbae..5a6899d08 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" + "item": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_right.json index ad0f49e25..231fc3a1e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" + "item": "mineralogy:basalt_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_sword.json index 61546e3e1..4a9594dec 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" + "item": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_vertical.json index 57233be6e..4ffd824d6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" + "item": "mineralogy:basalt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json index 1bff5cd88..9852d30cf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth.json index 073e271b7..63930f7cb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_smooth" @@ -20,12 +26,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json index 82974b53f..b5165fcae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:basalt_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json index a0d4b7ab2..0100b8938 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:basalt_smooth_brick" + "item": "mineralogy:basalt_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_slab.json index 94bd7f4c3..22cea8773 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:basalt_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json index c93a36155..258d648ec 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:basalt_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json index abbaee0f5..7f558444f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:basalt_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json index c1c4fd074..656cc90f0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basalt_smooth" + "item": "mineralogy:basalt_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json index 481476792..cbfe6c693 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:basalt_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json index f106b6b1f..aeabf91da 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:basalt_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json index e6b8241a2..f91092a2b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:basalt_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json index 98ee5afcd..ef04e7ee7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_to_stone.json new file mode 100644 index 000000000..c10bf4c34 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:basalt_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basalt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json index 472ab6913..4259b1cac 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + } + ], "rewards": { "recipes": [ "mineralogy:basalt_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json index 8b1a4444b..f716c3d22 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_block_polishing.json new file mode 100644 index 000000000..aad208da8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json index 9aa82fe07..81cfbc7e1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:basaltic_glass_brick" + "item": "mineralogy:basaltic_glass_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab.json index 2b3189e75..d64fab656 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:basaltic_glass_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_polishing.json new file mode 100644 index 000000000..ad5290a13 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_recombination.json new file mode 100644 index 000000000..fc9656a7c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json index 2ec98c6c5..104bd3ca6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:basaltic_glass_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs_polishing.json new file mode 100644 index 000000000..25d19596a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json index 4f5720c63..cf60191c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:basaltic_glass_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall_polishing.json new file mode 100644 index 000000000..20834b33b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json new file mode 100644 index 000000000..bbcf92bee --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json index 863a7d2e9..d2bb5af1b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass" - ] + "item": "mineralogy:basaltic_glass_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_brick_slab_recombination.json new file mode 100644 index 000000000..af58fb62d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slab_recombination.json new file mode 100644 index 000000000..a9d0d3d6c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slabs_to_brick.json new file mode 100644 index 000000000..ff632a327 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_stairs_to_brick.json new file mode 100644 index 000000000..2e94a5040 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_walls_to_brick.json new file mode 100644 index 000000000..6fa0ccf31 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_polishing.json new file mode 100644 index 000000000..62315f680 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_recombination.json new file mode 100644 index 000000000..b01108356 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slabs_to_brick.json new file mode 100644 index 000000000..35d06c3f0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_polishing.json new file mode 100644 index 000000000..79e01b73f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_to_brick.json new file mode 100644 index 000000000..374e2330f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_wall_polishing.json new file mode 100644 index 000000000..70c40dfb9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_walls_to_brick.json new file mode 100644 index 000000000..ba92f63b3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_axe.json index 013dedde6..da7f26e3f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" + "item": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_blank.json index 7646f6ed3..8e97dda6c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:basaltic_glass_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_cross.json index fae1a6df1..411a6c2c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" + "item": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hammer.json index 7c975a05d..c5807c15b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" + "item": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hoe.json index a6382ecea..5fc28cc32 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" + "item": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_horizontal.json index 40abf6f38..71eba8222 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" + "item": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_i.json index 4b25f78c4..aa2dd821c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" + "item": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_left.json index 01a71093e..bee659da1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" + "item": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_pickaxe.json index c615fc148..a66e5ba57 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" + "item": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_plus.json index e4fb3ae27..7bcd776cd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" + "item": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_right.json index 35767b313..7b19f57dc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" + "item": "mineralogy:basaltic_glass_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_sword.json index 1d900c931..61eb0eb62 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" + "item": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_vertical.json index e0bb5429a..be849dc8a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" + "item": "mineralogy:basaltic_glass_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_slab.json index 0c77843ae..2b72a71be 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json index 42f5df951..5f9f20f0f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json index 1ba455534..1734794c7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:basaltic_glass_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json index b78306a4a..2d3ed7119 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:basaltic_glass_smooth_brick" + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_slab.json index 50b4a48c0..868c0831f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:basaltic_glass_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json index aee697972..558660305 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:basaltic_glass_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json index bdb85af22..e50201b38 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:basaltic_glass_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json index 8392ef825..579a0304f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:basaltic_glass_smooth" + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_slab.json index beb9b7f08..d9314ec36 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:basaltic_glass_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json index f8b2c89b7..971bfecc3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:basaltic_glass_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json index 4b98b11df..991978015 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:basaltic_glass_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json index eb0109941..7f4917c6f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_to_stone.json new file mode 100644 index 000000000..078fac403 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:basaltic_glass" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json index f43b6e5a8..40a6c592f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + } + ], "rewards": { "recipes": [ "mineralogy:basaltic_glass_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/chalk.json b/src/main/resources/data/mineralogy/advancements/recipes/chalk.json new file mode 100644 index 000000000..7557370ae --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/chalk.json @@ -0,0 +1,37 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:chalk" + } + ], + "rewards": { + "recipes": [ + "mineralogy:chalk" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:chalk" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:chalk_dust" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json new file mode 100644 index 000000000..9b2a54977 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json @@ -0,0 +1,37 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:chalk_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:chalk_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:chalk_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:chalk" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json new file mode 100644 index 000000000..7b88bb8f8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:stone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json index 8918e8a7d..6bc2f156a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_block_polishing.json new file mode 100644 index 000000000..b2acec48b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json index 4b9a53fb6..1fca06527 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:conglomerate_brick" + "item": "mineralogy:conglomerate_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab.json index a8847515b..c7649584b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:conglomerate_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_polishing.json new file mode 100644 index 000000000..d5c38f5ff --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_recombination.json new file mode 100644 index 000000000..e23eca089 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json index f26f13d8c..b68c2eab8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:conglomerate_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs_polishing.json new file mode 100644 index 000000000..d64d75c4d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json index 023faf7f7..acb83ada6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:conglomerate_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall_polishing.json new file mode 100644 index 000000000..6a8ce486c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json new file mode 100644 index 000000000..893c43b81 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json index 66e0579d5..945927081 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate" - ] + "item": "mineralogy:conglomerate_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_brick_slab_recombination.json new file mode 100644 index 000000000..0f16514da --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slab_recombination.json new file mode 100644 index 000000000..316166068 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slabs_to_brick.json new file mode 100644 index 000000000..fe263f40d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_stairs_to_brick.json new file mode 100644 index 000000000..6c9cc8d37 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_walls_to_brick.json new file mode 100644 index 000000000..c3053b7d2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_polishing.json new file mode 100644 index 000000000..5f9c43260 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_recombination.json new file mode 100644 index 000000000..3afd26c81 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slabs_to_brick.json new file mode 100644 index 000000000..649b98233 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_polishing.json new file mode 100644 index 000000000..97c70cbdb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_to_brick.json new file mode 100644 index 000000000..40707b0dc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_wall_polishing.json new file mode 100644 index 000000000..61de10dc4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_walls_to_brick.json new file mode 100644 index 000000000..228c230cd --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_axe.json index 5c96cccd9..619fb1c52 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" + "item": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_blank.json index fdbd68487..0a616329a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:conglomerate_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_cross.json index de30bf39b..615eddddc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" + "item": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hammer.json index 6c035851b..7a975357c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" + "item": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hoe.json index 3ef7b3dfe..32fd1b0ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" + "item": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_horizontal.json index 6f7e040d2..b7dc52501 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" + "item": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_i.json index 5504d8af3..2bd48b45d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" + "item": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_left.json index 69ca1ff53..7af16a384 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" + "item": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_pickaxe.json index 9faa30149..63866ef3f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" + "item": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_plus.json index 38fbb2c87..619b30b0e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" + "item": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_right.json index e893e6c79..9aac059c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" + "item": "mineralogy:conglomerate_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_sword.json index c217fc623..55a7e05ec 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" + "item": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_vertical.json index 802daece1..3e91706db 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" + "item": "mineralogy:conglomerate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_slab.json index aa45a5243..23d7bc638 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json index ad22c853c..e64d22ea5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json index 9c5415808..0c1601bf2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:conglomerate_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json index a52ae250e..c4d25d86f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:conglomerate_smooth_brick" + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_slab.json index 16336f112..61c49841a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:conglomerate_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json index bd8097fd6..f2f97015c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:conglomerate_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json index a695f5d42..5283005ce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:conglomerate_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json index 087aedc46..05e19732d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:conglomerate_smooth" + "item": "mineralogy:conglomerate_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_slab.json index e9fda4933..9dc689a90 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:conglomerate_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json index 51605d051..b109fe0c7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:conglomerate_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json index 8b90cd0b7..467f57e05 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:conglomerate_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json index 0b871cf6c..7f6367e1e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_to_stone.json new file mode 100644 index 000000000..b7476cc37 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:conglomerate_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:conglomerate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json index 2e5cfd547..7210c1528 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + } + ], "rewards": { "recipes": [ "mineralogy:conglomerate_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json index 7216bd271..3bb94021d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_block_polishing.json new file mode 100644 index 000000000..2905f599c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json index 7614dbdbe..aa524c8e4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:diabase_brick" + "item": "mineralogy:diabase_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab.json index 31e8eaa3f..ae7653a0d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:diabase_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_polishing.json new file mode 100644 index 000000000..0dc53e002 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_recombination.json new file mode 100644 index 000000000..ae0c86c43 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json index 37e3a0a99..55bbc2aeb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:diabase_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs_polishing.json new file mode 100644 index 000000000..bfc3443cc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json index 274a85cf2..3c9448ba9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:diabase_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall_polishing.json new file mode 100644 index 000000000..45f18be79 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json new file mode 100644 index 000000000..94f6da355 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:diabase_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json index 9fa2a9636..ae887d7ec 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase" - ] + "item": "mineralogy:diabase_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_brick_slab_recombination.json new file mode 100644 index 000000000..5a592dfda --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slab_recombination.json new file mode 100644 index 000000000..97dc6d581 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slabs_to_brick.json new file mode 100644 index 000000000..d99f55ac4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_stairs_to_brick.json new file mode 100644 index 000000000..94cf37cb6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_walls_to_brick.json new file mode 100644 index 000000000..3080c5575 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_polishing.json new file mode 100644 index 000000000..e0e27f842 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_recombination.json new file mode 100644 index 000000000..b46991970 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slabs_to_brick.json new file mode 100644 index 000000000..8477d7782 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_polishing.json new file mode 100644 index 000000000..103b54e7e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_to_brick.json new file mode 100644 index 000000000..312045ced --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_wall_polishing.json new file mode 100644 index 000000000..e4647f357 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_walls_to_brick.json new file mode 100644 index 000000000..13a75b0ea --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_axe.json index ab63e15a2..70f4b46c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" + "item": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_blank.json index 400dda161..f4cf0f039 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:diabase_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_cross.json index 60ef903a2..57f95e9b0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" + "item": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hammer.json index 6bb77f1fe..dabd92f14 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" + "item": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hoe.json index 473f532f4..ae66c6fa7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" + "item": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_horizontal.json index 014083053..7e49f5395 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" + "item": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_i.json index bf784564b..49f6b21c3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" + "item": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_left.json index 0c2fb1f2e..3548af06b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" + "item": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_pickaxe.json index 78301bfcf..924fd581c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" + "item": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_plus.json index 6231e8162..a71e42159 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" + "item": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_right.json index 985156ae0..a71acce28 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" + "item": "mineralogy:diabase_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_sword.json index 504109a54..559b2d9ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" + "item": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_vertical.json index 3a86999f0..fc30b5659 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" + "item": "mineralogy:diabase_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_slab.json index 57940d978..a2fc88828 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json index 6200ae1d8..aecebea10 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json index 9de658506..7ceff6117 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:diabase_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json index fe7b3f483..c063fc666 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:diabase_smooth_brick" + "item": "mineralogy:diabase_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_slab.json index 65d2e8a12..44bf288ee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:diabase_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json index 914745830..026803b1f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:diabase_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json index f5b7e5017..75ef202f0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:diabase_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json index 2f8801041..739ed87fc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diabase_smooth" + "item": "mineralogy:diabase_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_slab.json index a49ecc480..06ea805c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:diabase_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json index d884cbdda..83e04941e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:diabase_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json index d2d1c8d47..3d257fc32 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:diabase_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json index 7425729ba..1eca79346 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_to_stone.json new file mode 100644 index 000000000..5b0b71ff2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:diabase_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diabase" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json index 84c4566bd..21035b0ed 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + } + ], "rewards": { "recipes": [ "mineralogy:diabase_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json index e70964551..ddbee2916 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_block_polishing.json new file mode 100644 index 000000000..6a1716775 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json index 02be2c429..f72875313 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:diorite_brick" + "item": "mineralogy:diorite_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab.json index a40e8b23c..9f7297db5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:diorite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_polishing.json new file mode 100644 index 000000000..96b49fd53 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_recombination.json new file mode 100644 index 000000000..ee99a5ac2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json index 28825352b..de65fa8c9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:diorite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs_polishing.json new file mode 100644 index 000000000..bff8bc1b7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json index c878ced3d..222718a33 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:diorite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall_polishing.json new file mode 100644 index 000000000..4d1e50aee --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json new file mode 100644 index 000000000..901a5e320 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:diorite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json index 71bea0fe8..0112fb748 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_furnace" @@ -16,7 +22,17 @@ "conditions": { "items": [ { - "tag": "mineralogy:crafting_materials/diorite" + "item": "mineralogy:diorite_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -26,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..bf60d5b1c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slab_recombination.json new file mode 100644 index 000000000..5a78fa6bc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slabs_to_brick.json new file mode 100644 index 000000000..96b9275b5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_stairs_to_brick.json new file mode 100644 index 000000000..b8d29fc1b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_walls_to_brick.json new file mode 100644 index 000000000..de75862af --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_polishing.json new file mode 100644 index 000000000..9b71fbaf6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_recombination.json new file mode 100644 index 000000000..a9298b8bf --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slabs_to_brick.json new file mode 100644 index 000000000..cee254ee7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_polishing.json new file mode 100644 index 000000000..a6810bdf6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_to_brick.json new file mode 100644 index 000000000..e40a6cdff --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_wall_polishing.json new file mode 100644 index 000000000..37e48ce44 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_walls_to_brick.json new file mode 100644 index 000000000..13dbfa81b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_axe.json index 370332359..34a40ecd2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" + "item": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json index 04503141a..33cf1e5d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:diorite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_cross.json index 49203ea3a..f0117ded1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" + "item": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hammer.json index f87c9e4c3..edb7880a1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" + "item": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hoe.json index fdd8e8914..a99a3c284 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" + "item": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_horizontal.json index d9a16177e..234be745d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" + "item": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_i.json index b05541769..303ea7f07 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" + "item": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_left.json index 38b007421..118153a63 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" + "item": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_pickaxe.json index 889528443..69a07301d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" + "item": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_plus.json index f05531b61..15ce4b897 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" + "item": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_right.json index b5f3f1cc3..6974baf44 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" + "item": "mineralogy:diorite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_sword.json index 787f42c80..43db06dc5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" + "item": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_vertical.json index 8b2f88b87..40f3884ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" + "item": "mineralogy:diorite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab.json index 06ce27b94..ff86c1062 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth.json index 2d4b7eabd..8cdd07c17 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_smooth" @@ -20,12 +26,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json index 71a6e2a22..286b2b822 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:diorite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json index cc87ad776..ff15ee07b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:diorite_smooth_brick" + "item": "mineralogy:diorite_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_slab.json index 15bdc32f9..4cf44f932 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:diorite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json index 588036d7d..fe77da3b2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:diorite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json index 9dc3b4796..96d61824d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:diorite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json index ed5312375..6ada70f46 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:diorite_smooth" + "item": "mineralogy:diorite_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab.json index 6624a5c8d..ce993e35d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:diorite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_stairs.json index 5a6afceed..85de00798 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:diorite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json index 3873ad2c7..37cbc9a81 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:diorite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_stairs.json index f5a46389b..6f2b32d25 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_to_stone.json new file mode 100644 index 000000000..e40a0e09c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:diorite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_wall.json index b706992bc..65c76fa57 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + } + ], "rewards": { "recipes": [ "mineralogy:diorite_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json index f0ce37ad6..8a427cf67 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_block_polishing.json new file mode 100644 index 000000000..31aa867ff --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json index ecb58858c..db1c25573 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:dolomite_brick" + "item": "mineralogy:dolomite_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab.json index d9685d37b..14e044760 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:dolomite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_polishing.json new file mode 100644 index 000000000..62ec21794 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_recombination.json new file mode 100644 index 000000000..94f734c8e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json index bc3cb4318..a368c350d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:dolomite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs_polishing.json new file mode 100644 index 000000000..30ee23acd --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json index 5f5baed43..c02d755ce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:dolomite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall_polishing.json new file mode 100644 index 000000000..e3bfcdc56 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json new file mode 100644 index 000000000..a6c5f0ecb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:dolomite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json index 83536f798..6f2535cbb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite" - ] + "item": "mineralogy:dolomite_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..113d07668 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slab_recombination.json new file mode 100644 index 000000000..992eb8d87 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slabs_to_brick.json new file mode 100644 index 000000000..f64be5a3e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_stairs_to_brick.json new file mode 100644 index 000000000..cfef33679 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_walls_to_brick.json new file mode 100644 index 000000000..27f5a1c87 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_polishing.json new file mode 100644 index 000000000..862183c5e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_recombination.json new file mode 100644 index 000000000..33dbe86c7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slabs_to_brick.json new file mode 100644 index 000000000..e1598d722 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_polishing.json new file mode 100644 index 000000000..4df14b22e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_to_brick.json new file mode 100644 index 000000000..fd6d84f30 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_wall_polishing.json new file mode 100644 index 000000000..03cb2ef80 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_walls_to_brick.json new file mode 100644 index 000000000..9083d8a2f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_axe.json index e5f6e685f..a8a895c48 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" + "item": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_blank.json index 529184e88..af18deb2a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:dolomite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_cross.json index 28d14c336..d51b2ef59 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" + "item": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hammer.json index f25cce443..61d9cfc90 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" + "item": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hoe.json index f305bf749..98e1885bf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" + "item": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_horizontal.json index a6fc52663..c4fd4a419 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" + "item": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_i.json index e221aaa7b..93285b297 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" + "item": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_left.json index 76153db6d..14dd4b8e5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" + "item": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_pickaxe.json index fa37dd73a..f8c7b1a00 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" + "item": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_plus.json index 9943303db..6251d62a1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" + "item": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_right.json index 63ee742b5..b1155f220 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" + "item": "mineralogy:dolomite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_sword.json index a230440f7..01c281329 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" + "item": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_vertical.json index 21528d629..3e8de8487 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" + "item": "mineralogy:dolomite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_slab.json index b092f3013..1bebaedc6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json index d0894ee02..a08b827a4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json index c0dc33ae0..543ba5003 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:dolomite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json index 8ec634183..ef78baa44 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:dolomite_smooth_brick" + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_slab.json index f7739c494..95fcb0a1f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:dolomite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json index 45245d1f0..7888757c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:dolomite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json index 614f7130b..8607a2cc6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:dolomite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json index 5a7e9b627..5b6b31280 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:dolomite_smooth" + "item": "mineralogy:dolomite_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_slab.json index 49d859a2e..414097713 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:dolomite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json index 91ca22396..c60c3a47d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:dolomite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json index 75e061d25..2d06ba0c9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:dolomite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json index beda24aa1..a6a3d2d27 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_to_stone.json new file mode 100644 index 000000000..98a93984c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:dolomite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:dolomite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json index 0660eb134..56e67f770 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + } + ], "rewards": { "recipes": [ "mineralogy:dolomite_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall.json new file mode 100644 index 000000000..3e66ad5d4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gypsum_dust" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json new file mode 100644 index 000000000..b8bf94571 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_black" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_black" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_black" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json new file mode 100644 index 000000000..5404518dc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_blue" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_blue" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_blue" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json new file mode 100644 index 000000000..85c27bd49 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_brown" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_brown" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_brown" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json new file mode 100644 index 000000000..1f5a21353 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_cyan" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_cyan" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_cyan" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json new file mode 100644 index 000000000..134a6c196 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_gray" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_gray" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_gray" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json new file mode 100644 index 000000000..77765b765 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_green" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_green" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_green" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_light_blue.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_light_blue.json new file mode 100644 index 000000000..845261908 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_light_blue.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_light_blue" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_light_blue" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_light_blue" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json new file mode 100644 index 000000000..93b61802c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_lime" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_lime" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_lime" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json new file mode 100644 index 000000000..27aa4db53 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_magenta" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_magenta" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_magenta" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json new file mode 100644 index 000000000..96c8363b5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_orange" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_orange" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_orange" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json new file mode 100644 index 000000000..cc1466cea --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_pink" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_pink" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_pink" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json new file mode 100644 index 000000000..927200387 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_purple" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_purple" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_purple" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json new file mode 100644 index 000000000..6d6b8f22b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_red" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_red" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_red" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json new file mode 100644 index 000000000..0e37241be --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_silver" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_silver" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_silver" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json new file mode 100644 index 000000000..9fddd8d2d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_white" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_white" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json new file mode 100644 index 000000000..259cc6ab9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_yellow" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_yellow" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_yellow" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:drywall_white" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json index 5a04e150a..8b238beb7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_block_polishing.json new file mode 100644 index 000000000..4d8b9e21d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json index 8d2d580c2..3ff00717f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:gabbro_brick" + "item": "mineralogy:gabbro_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab.json index bdefec475..2863738db 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:gabbro_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_polishing.json new file mode 100644 index 000000000..06890eee0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_recombination.json new file mode 100644 index 000000000..191bbc2cc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json index 03e0a7782..9740a99d4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:gabbro_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs_polishing.json new file mode 100644 index 000000000..333c67380 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json index 7be49016c..16f4d2566 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:gabbro_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall_polishing.json new file mode 100644 index 000000000..7a4710f28 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json new file mode 100644 index 000000000..8ea15f0cc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:gabbro_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json index 803aaa7a7..95b12f7ce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro" - ] + "item": "mineralogy:gabbro_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_brick_slab_recombination.json new file mode 100644 index 000000000..fab6377d3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slab_recombination.json new file mode 100644 index 000000000..ecb4df710 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slabs_to_brick.json new file mode 100644 index 000000000..3b057cb4d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_stairs_to_brick.json new file mode 100644 index 000000000..296bc4cee --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_walls_to_brick.json new file mode 100644 index 000000000..402b134ca --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_polishing.json new file mode 100644 index 000000000..bfe7474a6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_recombination.json new file mode 100644 index 000000000..0f5c5f89c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slabs_to_brick.json new file mode 100644 index 000000000..d4e5c3a62 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_polishing.json new file mode 100644 index 000000000..861abc370 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_to_brick.json new file mode 100644 index 000000000..d590a247d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_wall_polishing.json new file mode 100644 index 000000000..4936c5c83 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_walls_to_brick.json new file mode 100644 index 000000000..f95331045 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_axe.json index 433d3af85..c323d976b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" + "item": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_blank.json index 6d6d3e0ac..91dc040e3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:gabbro_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_cross.json index bab921518..84b824317 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" + "item": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hammer.json index bc81e4a88..f5696162d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" + "item": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hoe.json index 6a593099c..19e62fdff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" + "item": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_horizontal.json index eab5a0689..52992fc3d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" + "item": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_i.json index 4abbc7fcd..df3454352 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" + "item": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_left.json index ede3701b8..9174417ce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" + "item": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_pickaxe.json index 62c32754f..7ef8e86b9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" + "item": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_plus.json index f6be1a178..0280071eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" + "item": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_right.json index d4484a052..0207d96fd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" + "item": "mineralogy:gabbro_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_sword.json index 0dc8201ae..c77640ce0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" + "item": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_vertical.json index e152b2d32..cc02aafa7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" + "item": "mineralogy:gabbro_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_slab.json index f45892520..a4e76b50e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json index 9c3699c84..216a177c3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json index 997a76b54..0cd862edc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:gabbro_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json index 6b7cff9f6..47e57cf43 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:gabbro_smooth_brick" + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_slab.json index 243d83d49..20cf30990 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:gabbro_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json index f1acf0ec2..b637a85ac 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:gabbro_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json index 22efc3bde..1cd1a1478 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:gabbro_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json index 6a2f6a62d..0ace44b9b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gabbro_smooth" + "item": "mineralogy:gabbro_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_slab.json index 7354b3d88..0cfee4357 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:gabbro_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json index a5ad1293e..904b21bd3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:gabbro_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json index bacbb57be..b23152f83 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:gabbro_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json index 637c9fa35..29edc326b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_to_stone.json new file mode 100644 index 000000000..1ee023339 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:gabbro_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gabbro" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json index 3a1feed1b..a51395292 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + } + ], "rewards": { "recipes": [ "mineralogy:gabbro_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json index 85f7fcfdc..19a85a6ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_block_polishing.json new file mode 100644 index 000000000..8ee805f3e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json index c8fc0da5f..26869f4df 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:gneiss_brick" + "item": "mineralogy:gneiss_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab.json index 8cb529b9f..67c6110e9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:gneiss_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_polishing.json new file mode 100644 index 000000000..02467afaf --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_recombination.json new file mode 100644 index 000000000..15c13418e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json index 28117b261..7ae9454e0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:gneiss_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs_polishing.json new file mode 100644 index 000000000..a5d926efa --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json index a859e1df4..52b724944 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:gneiss_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall_polishing.json new file mode 100644 index 000000000..16d5f8d42 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json new file mode 100644 index 000000000..ce9f4016a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:gneiss_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json index 86647abbc..1442b6d67 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss" - ] + "item": "mineralogy:gneiss_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_brick_slab_recombination.json new file mode 100644 index 000000000..89816830c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slab_recombination.json new file mode 100644 index 000000000..23e3680c4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slabs_to_brick.json new file mode 100644 index 000000000..59be57d37 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_stairs_to_brick.json new file mode 100644 index 000000000..f732c5686 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_walls_to_brick.json new file mode 100644 index 000000000..8f90d7154 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_polishing.json new file mode 100644 index 000000000..df7a3f02a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_recombination.json new file mode 100644 index 000000000..77e577e29 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slabs_to_brick.json new file mode 100644 index 000000000..5485a2645 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_polishing.json new file mode 100644 index 000000000..a4012951e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_to_brick.json new file mode 100644 index 000000000..f80108958 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_wall_polishing.json new file mode 100644 index 000000000..2c1bd2ef3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_walls_to_brick.json new file mode 100644 index 000000000..8afcf7bbd --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_axe.json index 7978d361f..e09855c87 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" + "item": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_blank.json index 437c8c877..d7625dc4e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:gneiss_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_cross.json index 9bf0c2465..f26eb3cd5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" + "item": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hammer.json index 6b5d46613..93cb22956 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" + "item": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hoe.json index 89fc7aebc..e67663d76 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" + "item": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_horizontal.json index 1f3d61984..6ba391ef6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" + "item": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_i.json index 1e9539763..605256272 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" + "item": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_left.json index d06bfcd01..2263559c5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" + "item": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_pickaxe.json index dd91ae901..ce9869d48 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" + "item": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_plus.json index e00fd7645..6b4ba4411 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" + "item": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_right.json index 215b6cd1f..ffb201267 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" + "item": "mineralogy:gneiss_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_sword.json index 9d32ca546..9bc4e81a3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" + "item": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_vertical.json index 7d6de48c4..e81b8b662 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" + "item": "mineralogy:gneiss_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_slab.json index 7328bfcf5..d1aa539fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json index db5df90ad..8a942ac4d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json index 3de8e20d3..d6af54f0c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:gneiss_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json index 550abda0d..ea0766225 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:gneiss_smooth_brick" + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_slab.json index 125c5ddca..d9dcbaf57 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:gneiss_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json index 115aa2ce1..435293a43 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:gneiss_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json index 5527cc34c..1213e8922 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:gneiss_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json index d40a1cf41..78a496eb7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:gneiss_smooth" + "item": "mineralogy:gneiss_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_slab.json index 4c16dd7ec..fbf9c08fe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:gneiss_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json index 3d07f56e7..4a93bcff3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:gneiss_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json index d06909b85..4c2a17399 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:gneiss_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json index cd9eedec5..e6810b0cd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_to_stone.json new file mode 100644 index 000000000..ac9b1beff --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:gneiss_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gneiss" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json index 1537e428d..d844ffe21 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + } + ], "rewards": { "recipes": [ "mineralogy:gneiss_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json index b1a1202a5..4e6484e50 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + } + ], "rewards": { "recipes": [ "mineralogy:granite_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_block_polishing.json new file mode 100644 index 000000000..94dc5c263 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json index 18a5a82a5..b08d3d814 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:granite_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:granite_brick" + "item": "mineralogy:granite_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab.json index 6155f3fb9..0ffb91a25 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:granite_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:granite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_polishing.json new file mode 100644 index 000000000..ab3388eb1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_recombination.json new file mode 100644 index 000000000..549487790 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json index 5d3856822..7e77c6daf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:granite_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:granite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs_polishing.json new file mode 100644 index 000000000..08cf8f2f4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json index 3e3dcf12e..e5164a19c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:granite_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:granite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall_polishing.json new file mode 100644 index 000000000..8649442bb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json new file mode 100644 index 000000000..d1b29ab79 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:granite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json index 2a1dea18c..a3e11b118 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:granite_furnace" @@ -16,7 +22,17 @@ "conditions": { "items": [ { - "tag": "mineralogy:crafting_materials/granite" + "item": "mineralogy:granite_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -26,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..d9fb56919 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slab_recombination.json new file mode 100644 index 000000000..06702f3f1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slabs_to_brick.json new file mode 100644 index 000000000..ded37a0b5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_stairs_to_brick.json new file mode 100644 index 000000000..09cbaebab --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_walls_to_brick.json new file mode 100644 index 000000000..142bf829c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_polishing.json new file mode 100644 index 000000000..2060f2a3f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_recombination.json new file mode 100644 index 000000000..9e257eaca --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slabs_to_brick.json new file mode 100644 index 000000000..2c189b81a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_polishing.json new file mode 100644 index 000000000..cd5b7d8e7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_to_brick.json new file mode 100644 index 000000000..ba0703ff3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_wall_polishing.json new file mode 100644 index 000000000..57183f3b8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_walls_to_brick.json new file mode 100644 index 000000000..af25409ab --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_axe.json index c959b9e62..c16a2a49b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:granite_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" + "item": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json index 1ef424f02..40d9a280e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:granite_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:granite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_cross.json index 84f7bf34c..351111c28 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:granite_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" + "item": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hammer.json index eb58d903c..c609c73b9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:granite_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" + "item": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hoe.json index 5a1c2fe6e..beb07923b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:granite_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" + "item": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_horizontal.json index d9fca36fe..73a582680 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:granite_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" + "item": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_i.json index 94817c490..3f4623d09 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:granite_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" + "item": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_left.json index d0554db03..09e1973b5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:granite_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" + "item": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_pickaxe.json index 9c2ee2bff..f275f9e67 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:granite_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" + "item": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_plus.json index a532e86e8..833f6d496 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:granite_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" + "item": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_right.json index fad29666f..97ec01ea0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:granite_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" + "item": "mineralogy:granite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_sword.json index e821d9922..ca1ed8c2b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:granite_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" + "item": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_vertical.json index 49a456a24..6845dba7d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:granite_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" + "item": "mineralogy:granite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab.json index 3f00709a1..1de6167c9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + ], "rewards": { "recipes": [ "mineralogy:granite_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth.json index c474178cb..666fcf37e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:granite_smooth" @@ -20,12 +26,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json index 3cd5cdf51..14b179b97 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:granite_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:granite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json index 8673bbf0f..4b9030331 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:granite_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:granite_smooth_brick" + "item": "mineralogy:granite_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_slab.json index 583da25ca..f5908de3d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:granite_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:granite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json index 07e85bff4..ab9b82d1a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:granite_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:granite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json index f3deaf778..3b739b86a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:granite_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:granite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json index a905bc27b..3a6cfb596 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:granite_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:granite_smooth" + "item": "mineralogy:granite_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab.json index 989f26650..eefb9b999 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:granite_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:granite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_stairs.json index d85c992c8..b0aa90470 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:granite_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:granite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json index 423ff1fee..53c48776a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:granite_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:granite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_stairs.json index 88cae8836..d8a3aace9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:granite_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_to_stone.json new file mode 100644 index 000000000..30724de41 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:granite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_wall.json index f905f49f4..dd008913a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + } + ], "rewards": { "recipes": [ "mineralogy:granite_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gravel_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/gravel_to_stone.json new file mode 100644 index 000000000..a53dec6b2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gravel_to_stone.json @@ -0,0 +1,37 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "SMELTABLE_GRAVEL" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gravel_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gravel_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:gravel" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_carbon_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_carbon_dust.json new file mode 100644 index 000000000..bbaaf8901 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_carbon_dust.json @@ -0,0 +1,44 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/carbon" + } + } + ], + "rewards": { + "recipes": [ + "mineralogy:gunpowder_from_carbon_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gunpowder_from_carbon_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:nitrate_dust" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_charcoal.json b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_charcoal.json new file mode 100644 index 000000000..125507e8f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_charcoal.json @@ -0,0 +1,37 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gunpowder_from_charcoal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gunpowder_from_charcoal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:nitrate_dust" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_coal_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_coal_dust.json new file mode 100644 index 000000000..2568d2f8c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_coal_dust.json @@ -0,0 +1,44 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/coal" + } + } + ], + "rewards": { + "recipes": [ + "mineralogy:gunpowder_from_coal_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gunpowder_from_coal_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:nitrate_dust" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_sugar.json b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_sugar.json new file mode 100644 index 000000000..0df22bfa5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_sugar.json @@ -0,0 +1,37 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gunpowder_from_sugar" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gunpowder_from_sugar" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:nitrate_dust" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gypsum.json b/src/main/resources/data/mineralogy/advancements/recipes/gypsum.json new file mode 100644 index 000000000..91ccfeba0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gypsum.json @@ -0,0 +1,37 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gypsum" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gypsum" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gypsum" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gypsum_dust" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json new file mode 100644 index 000000000..3632e6878 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json @@ -0,0 +1,37 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gypsum_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gypsum_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gypsum_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:gypsum" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json index d547dc6ca..06a721f36 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_block_polishing.json new file mode 100644 index 000000000..94e48eeef --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json index abe2e5478..0b08cc9a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:hornfels_brick" + "item": "mineralogy:hornfels_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab.json index 1df9bc543..a3c0a12b6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:hornfels_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_polishing.json new file mode 100644 index 000000000..7393def23 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_recombination.json new file mode 100644 index 000000000..bd4676b29 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json index 8322a8b89..e5f6569e6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:hornfels_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs_polishing.json new file mode 100644 index 000000000..5345195d3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json index 259c4b6d7..2681d9228 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:hornfels_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall_polishing.json new file mode 100644 index 000000000..af52923b7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json new file mode 100644 index 000000000..cff58e805 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:hornfels_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json index 9e7d2a75e..bd4cde9d0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels" - ] + "item": "mineralogy:hornfels_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_brick_slab_recombination.json new file mode 100644 index 000000000..29d2c3f69 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slab_recombination.json new file mode 100644 index 000000000..9505b3610 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slabs_to_brick.json new file mode 100644 index 000000000..5b937707d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_stairs_to_brick.json new file mode 100644 index 000000000..b7a540154 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_walls_to_brick.json new file mode 100644 index 000000000..950794803 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_polishing.json new file mode 100644 index 000000000..a2df23068 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_recombination.json new file mode 100644 index 000000000..617c25be2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slabs_to_brick.json new file mode 100644 index 000000000..04a3152c7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_polishing.json new file mode 100644 index 000000000..c1467a8c6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_to_brick.json new file mode 100644 index 000000000..bf7e09473 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_wall_polishing.json new file mode 100644 index 000000000..3d2534d08 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_walls_to_brick.json new file mode 100644 index 000000000..206083583 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_axe.json index 44b14279d..8dd24e58c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" + "item": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_blank.json index 5fff89458..b4a3b8838 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:hornfels_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_cross.json index 0d55cbab2..1228de4e1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" + "item": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hammer.json index 9d89f7a19..ef8349974 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" + "item": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hoe.json index e2ff46400..1023b1dae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" + "item": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_horizontal.json index c1cebeef6..231d8adb3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" + "item": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_i.json index 5ff3a9a60..7eaddf601 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" + "item": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_left.json index 87dfa6691..6f85a1eb3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" + "item": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_pickaxe.json index 1bd252165..a3aba0b1a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" + "item": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_plus.json index e154e4fdb..303e56445 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" + "item": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_right.json index 7f1b516a6..059043f8c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" + "item": "mineralogy:hornfels_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_sword.json index fe11cc976..14e5f6152 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" + "item": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_vertical.json index a627e1ecd..4432e60ef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" + "item": "mineralogy:hornfels_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_slab.json index 0a7188feb..ea1a2c16a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json index 42efdf269..920148bf2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json index e771af2e0..f42a1c9b5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:hornfels_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json index d2c36ebb6..d25ba8a4a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:hornfels_smooth_brick" + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_slab.json index 268bca891..a71961d81 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:hornfels_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json index 9c3ffaf6b..3b30ce5cb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:hornfels_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json index 6430e3bc8..b17711114 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:hornfels_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json index a709374d6..ca5828120 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:hornfels_smooth" + "item": "mineralogy:hornfels_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_slab.json index ea7fac865..61516d775 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:hornfels_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json index 081bf5851..d3fae40d4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:hornfels_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json index 67f62b91f..da15087df 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:hornfels_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json index 0c26f9e8c..fb80d5c7f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_to_stone.json new file mode 100644 index 000000000..cadf42149 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:hornfels_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:hornfels" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json index fa3e45f31..afc47e251 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + } + ], "rewards": { "recipes": [ "mineralogy:hornfels_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json index e30471bc1..fd50bb2e1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_block_polishing.json new file mode 100644 index 000000000..c475cadb2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json index 541456dc5..ba99dc1f5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:limestone_brick" + "item": "mineralogy:limestone_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab.json index e8edeaa9a..2f79a8947 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:limestone_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_polishing.json new file mode 100644 index 000000000..c84f0c334 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_recombination.json new file mode 100644 index 000000000..ca81f42b3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json index ba0220943..ebd998bb2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:limestone_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs_polishing.json new file mode 100644 index 000000000..a1a4b8c5d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json index d90b9a912..0da7ab05a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:limestone_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall_polishing.json new file mode 100644 index 000000000..cd965d3cb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json new file mode 100644 index 000000000..b53f84021 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:limestone_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json index eda561dc6..9c946cfe6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone" - ] + "item": "mineralogy:limestone_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_brick_slab_recombination.json new file mode 100644 index 000000000..39f02022f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slab_recombination.json new file mode 100644 index 000000000..a775195ae --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slabs_to_brick.json new file mode 100644 index 000000000..f7f1dc2d4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_stairs_to_brick.json new file mode 100644 index 000000000..c341c0ebf --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_walls_to_brick.json new file mode 100644 index 000000000..f5009b2b0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_polishing.json new file mode 100644 index 000000000..db2565d4b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_recombination.json new file mode 100644 index 000000000..8735b6cdf --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slabs_to_brick.json new file mode 100644 index 000000000..b8180ee8c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_polishing.json new file mode 100644 index 000000000..9a90c12f7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_to_brick.json new file mode 100644 index 000000000..a7093d816 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_wall_polishing.json new file mode 100644 index 000000000..33af21646 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_walls_to_brick.json new file mode 100644 index 000000000..ab594b0af --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_axe.json index 81e0df21c..bbb92f36b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" + "item": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_blank.json index 402e71b2b..83a87f885 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:limestone_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_cross.json index 018216db6..80b7f9634 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" + "item": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hammer.json index f7a32c371..cbdf1ad1d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" + "item": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hoe.json index 0113783b1..ba45b64b6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" + "item": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_horizontal.json index 20c1b0b0a..beee09a2d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" + "item": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_i.json index 683b4da23..cb6252521 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" + "item": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_left.json index eab7cc5fb..87dddb6f6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" + "item": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_pickaxe.json index e15bd21cd..a08201461 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" + "item": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_plus.json index b17fee696..f7ae9ee20 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" + "item": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_right.json index eb58698ce..abb8240c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" + "item": "mineralogy:limestone_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_sword.json index b6d12e2b9..cb18e322a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" + "item": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_vertical.json index 477c11969..dcee61c85 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" + "item": "mineralogy:limestone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_slab.json index 42a2b7998..f236e3df8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json index 3ffd510cf..d4b154d9e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json index b2e8b47f2..d25c2c794 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:limestone_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json index 4e2d2cd98..20320430a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:limestone_smooth_brick" + "item": "mineralogy:limestone_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_slab.json index 012d24e8f..4b60e0210 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:limestone_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json index 0a8166cfb..6205d15a7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:limestone_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json index 7e32d086e..e5fa8b40d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:limestone_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json index f2f32a598..7d389e2c3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:limestone_smooth" + "item": "mineralogy:limestone_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_slab.json index 60b459a45..5e4294581 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:limestone_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json index 304fee0a3..14c5ae49a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:limestone_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json index ac6638224..456cd1081 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:limestone_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json index 5c92836ae..a961df1c8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_to_stone.json new file mode 100644 index 000000000..2558789ff --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:limestone_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:limestone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json index ebb4cd56e..317e3e089 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + } + ], "rewards": { "recipes": [ "mineralogy:limestone_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json index d329f8901..aeca1c185 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + } + ], "rewards": { "recipes": [ "mineralogy:marble_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_block_polishing.json new file mode 100644 index 000000000..54650265c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json index 77fdc8726..125a84293 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:marble_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:marble_brick" + "item": "mineralogy:marble_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab.json index 47c73c073..82e7b63cc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:marble_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:marble_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_polishing.json new file mode 100644 index 000000000..6d54ff00f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_recombination.json new file mode 100644 index 000000000..7ca2aac85 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json index 7bee1207d..0b5276827 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:marble_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:marble_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs_polishing.json new file mode 100644 index 000000000..da6d56efd --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json index 5985d45a3..fd2209acf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:marble_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:marble_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall_polishing.json new file mode 100644 index 000000000..98a425cfe --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json new file mode 100644 index 000000000..690706b0a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:marble_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json index f042a16c1..707846cd2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:marble_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble" - ] + "item": "mineralogy:marble_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_brick_slab_recombination.json new file mode 100644 index 000000000..f25da8208 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slab_recombination.json new file mode 100644 index 000000000..36cc8b216 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slabs_to_brick.json new file mode 100644 index 000000000..052984f13 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_stairs_to_brick.json new file mode 100644 index 000000000..64de57e6d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_walls_to_brick.json new file mode 100644 index 000000000..07f2e4dee --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_polishing.json new file mode 100644 index 000000000..eb4b19d20 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_recombination.json new file mode 100644 index 000000000..455fe99a0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slabs_to_brick.json new file mode 100644 index 000000000..03e4e752f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_polishing.json new file mode 100644 index 000000000..82777a562 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_to_brick.json new file mode 100644 index 000000000..d05f6b1db --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_wall_polishing.json new file mode 100644 index 000000000..97ec399ce --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_walls_to_brick.json new file mode 100644 index 000000000..796f0d57d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_axe.json index c3c391950..31917c783 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:marble_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" + "item": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_blank.json index f1741690a..ef2092bf9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:marble_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:marble_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_cross.json index 307833afc..60ad5660d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:marble_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" + "item": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hammer.json index a121db4d4..b49d1a00f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:marble_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" + "item": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hoe.json index 5b54dccb4..04370d144 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:marble_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" + "item": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_horizontal.json index 474b42608..aae701ff7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:marble_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" + "item": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_i.json index 97788fa8d..d729b3300 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:marble_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" + "item": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_left.json index 7c7552c5a..cb77e5792 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:marble_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" + "item": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_pickaxe.json index 7e7ed8efe..b46fa53a5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:marble_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" + "item": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_plus.json index 886edc46f..490c780bd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:marble_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" + "item": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_right.json index ac7336b9c..3f5a1cc59 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:marble_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" + "item": "mineralogy:marble_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_sword.json index 7a5fdc983..66925674b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:marble_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" + "item": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_vertical.json index e26c3bb61..dcdcc9bbb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:marble_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" + "item": "mineralogy:marble_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_slab.json index 7e9c80fee..8da0d9b78 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + } + ], "rewards": { "recipes": [ "mineralogy:marble_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json index 2f7828fb4..cf6c28b18 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:marble_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json index d4a7f3086..8756da174 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:marble_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:marble_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json index 7aa63e750..fa7c1751e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:marble_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:marble_smooth_brick" + "item": "mineralogy:marble_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_slab.json index f545ff9ce..f1f9d2237 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:marble_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:marble_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json index e993f5de9..9dcd408bc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:marble_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:marble_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json index 5f43f8ddd..7ea3aa50b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:marble_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:marble_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json index b20343d10..192befe06 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:marble_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:marble_smooth" + "item": "mineralogy:marble_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_slab.json index 75aef38f7..0a874713d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:marble_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:marble_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json index 55b8c650d..d52f6dac9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:marble_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:marble_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json index 2304dd01e..7d7390e7d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:marble_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:marble_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json index a9f0079c4..8ee18ef83 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:marble_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_to_stone.json new file mode 100644 index 000000000..96dfd9a84 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:marble_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:marble" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json index 2d8154247..d0b65bdd4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + } + ], "rewards": { "recipes": [ "mineralogy:marble_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json b/src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json new file mode 100644 index 000000000..72655fc7b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_FERTILIZER" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:mineral_fertilizer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:mineralfertilizer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:mineralfertilizer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:nitrate_dust" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json new file mode 100644 index 000000000..00738d0b2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_block" + } + ], + "rewards": { + "recipes": [ + "mineralogy:nitrate_block" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:nitrate_block" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:nitrate_dust" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json new file mode 100644 index 000000000..b6ae4c0eb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:nitrate_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:nitrate_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:nitrate_block" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json index cf87bea26..c29f9f704 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_block_polishing.json new file mode 100644 index 000000000..5f740bc4e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json index dd120aa0c..d7ce13a0b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:novaculite_brick" + "item": "mineralogy:novaculite_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab.json index ed358c9bd..77eb8ab9c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:novaculite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_polishing.json new file mode 100644 index 000000000..65a580c8f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_recombination.json new file mode 100644 index 000000000..61ff39d8a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json index b8905bfb2..29265513b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:novaculite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs_polishing.json new file mode 100644 index 000000000..1dc6761db --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json index 898284b06..8ff8e4ab1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:novaculite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall_polishing.json new file mode 100644 index 000000000..99e2159b7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json new file mode 100644 index 000000000..5d5bc6afd --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:novaculite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json index 09653a509..42d5e023e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite" - ] + "item": "mineralogy:novaculite_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..1a18069d7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slab_recombination.json new file mode 100644 index 000000000..3a626ef1d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slabs_to_brick.json new file mode 100644 index 000000000..2aa98b3a1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_stairs_to_brick.json new file mode 100644 index 000000000..91ab714da --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_walls_to_brick.json new file mode 100644 index 000000000..643f3f808 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_polishing.json new file mode 100644 index 000000000..878e2763e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_recombination.json new file mode 100644 index 000000000..9374b1ffb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slabs_to_brick.json new file mode 100644 index 000000000..0a7d87fa3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_polishing.json new file mode 100644 index 000000000..c18699553 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_to_brick.json new file mode 100644 index 000000000..4bf1cb76c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_wall_polishing.json new file mode 100644 index 000000000..78d7b0440 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_walls_to_brick.json new file mode 100644 index 000000000..b5eae281b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_axe.json index ca7eae3c5..8d554cae4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" + "item": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_blank.json index bcb74c5c7..a8c6b208a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:novaculite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_cross.json index b88b17e0b..2642aa3f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" + "item": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hammer.json index f40c1b8c0..cd0f075a7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" + "item": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hoe.json index f346dcb83..2928a248f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" + "item": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_horizontal.json index 82fc15150..e4560a197 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" + "item": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_i.json index 3307f06d0..d68991f29 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" + "item": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_left.json index 346c3e17f..ab3eb616e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" + "item": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_pickaxe.json index baaa62d3e..bd6a1da09 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" + "item": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_plus.json index 577c3f156..2f4c7afc4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" + "item": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_right.json index f702fcee0..85dcd78d0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" + "item": "mineralogy:novaculite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_sword.json index 8058c72b0..57fbc52f8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" + "item": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_vertical.json index be6c32ecf..1a1e72e85 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" + "item": "mineralogy:novaculite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_slab.json index 0eadc8505..5341036e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json index 05b889bab..4b1a34950 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json index cc8d16cdb..a4f7c9187 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:novaculite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json index a533e3f85..e5eabd323 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:novaculite_smooth_brick" + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_slab.json index 565723f03..cf7540a25 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:novaculite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json index be26cd305..ca7740af8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:novaculite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json index ce5bf8e83..8e0f1889f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:novaculite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json index dc58cc3ac..b129e6f4e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:novaculite_smooth" + "item": "mineralogy:novaculite_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_slab.json index af5fd82df..806b3bdb5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:novaculite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json index 99306bd64..e28fe3b6c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:novaculite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json index 72bd1efee..bcc019542 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:novaculite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json index 7a13a9654..13b668f80 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_to_stone.json new file mode 100644 index 000000000..ccabcdad7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:novaculite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:novaculite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json index 9768874d3..5a14145b8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + } + ], "rewards": { "recipes": [ "mineralogy:novaculite_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json index 25e2e71f7..c1b37622e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_block_polishing.json new file mode 100644 index 000000000..4e903a82a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json index bd7b20380..d9384dc84 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:pegmatite_brick" + "item": "mineralogy:pegmatite_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab.json index 3e934bb9f..44f2f3122 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:pegmatite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_polishing.json new file mode 100644 index 000000000..f3bc20947 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_recombination.json new file mode 100644 index 000000000..16c7a1963 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json index f5e82bbc6..a9e15dc0f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:pegmatite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs_polishing.json new file mode 100644 index 000000000..7ea8726e0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json index a933ee773..c5f9d090b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:pegmatite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall_polishing.json new file mode 100644 index 000000000..016db45a5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json new file mode 100644 index 000000000..32f038b98 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json index 55fdbb6ad..9578279a3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite" - ] + "item": "mineralogy:pegmatite_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..ed3e8b85e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slab_recombination.json new file mode 100644 index 000000000..23c5f7f41 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slabs_to_brick.json new file mode 100644 index 000000000..42d1e4b5c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_stairs_to_brick.json new file mode 100644 index 000000000..4c370be87 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_walls_to_brick.json new file mode 100644 index 000000000..bb4732b0b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_polishing.json new file mode 100644 index 000000000..55976c35a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_recombination.json new file mode 100644 index 000000000..1d93b49be --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slabs_to_brick.json new file mode 100644 index 000000000..3c591f35d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_polishing.json new file mode 100644 index 000000000..9cc1fc52c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_to_brick.json new file mode 100644 index 000000000..c7bfae06a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_wall_polishing.json new file mode 100644 index 000000000..45c6208ec --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_walls_to_brick.json new file mode 100644 index 000000000..710173b32 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_axe.json index e5c2c5f33..d2f5dd5da 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" + "item": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_blank.json index aefb9028b..d28450460 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:pegmatite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_cross.json index 5beccd5ef..126e73e6a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" + "item": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hammer.json index 28ddb2604..00db0ec8a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" + "item": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hoe.json index f3d9c860e..c1106665d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" + "item": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_horizontal.json index c78448e34..bfe398476 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" + "item": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_i.json index efa55f1f7..4e90178a1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" + "item": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_left.json index 05e2d0dee..2a476aa42 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" + "item": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_pickaxe.json index 2352e7e56..6f3bfea76 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" + "item": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_plus.json index a70be4816..af37e5d79 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" + "item": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_right.json index 4aaed7f76..14dd115eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" + "item": "mineralogy:pegmatite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_sword.json index d5e67c1eb..e1d7b5dc9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" + "item": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_vertical.json index 9da8365d7..6747f311f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" + "item": "mineralogy:pegmatite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_slab.json index a2b8955fd..c5e31e8d0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json index b61c27be2..62fb8eca3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json index 12458f24b..a93782b2d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:pegmatite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json index 27001579c..c799123b9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:pegmatite_smooth_brick" + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_slab.json index 619f4153c..0343b2fc9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:pegmatite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json index 0b233a2cd..bb18e8379 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:pegmatite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json index 0b256ec4d..861bdbbfd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:pegmatite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json index 899cd4a42..5dd3c182a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:pegmatite_smooth" + "item": "mineralogy:pegmatite_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_slab.json index 0e2326e1e..f16713f33 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:pegmatite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json index 797c771d2..d7f037990 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:pegmatite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json index e63b7d3c6..e588aa437 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:pegmatite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json index 9affac732..b86cd8cba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_to_stone.json new file mode 100644 index 000000000..8e84baa0c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:pegmatite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:pegmatite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json index 811ad7329..6282e684a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + } + ], "rewards": { "recipes": [ "mineralogy:pegmatite_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json index 833766c69..10f4a79ef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_block_polishing.json new file mode 100644 index 000000000..1faf69934 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json index 74fb271f7..3a2f93025 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:peridotite_brick" + "item": "mineralogy:peridotite_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab.json index 4baea32bd..e497cbea0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:peridotite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_polishing.json new file mode 100644 index 000000000..da2693fb0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_recombination.json new file mode 100644 index 000000000..45453befc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json index 7ba568656..e177d5dbf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:peridotite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs_polishing.json new file mode 100644 index 000000000..a8f38b06d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json index 8f9b479bd..0ffd55abf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:peridotite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall_polishing.json new file mode 100644 index 000000000..82075481d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json new file mode 100644 index 000000000..58e09414c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:peridotite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json index 8cf7aa37e..4f063168b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite" - ] + "item": "mineralogy:peridotite_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..9fa6f723e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slab_recombination.json new file mode 100644 index 000000000..744424379 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slabs_to_brick.json new file mode 100644 index 000000000..fa45765d0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_stairs_to_brick.json new file mode 100644 index 000000000..f5ccd74e8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_walls_to_brick.json new file mode 100644 index 000000000..777cfb040 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_polishing.json new file mode 100644 index 000000000..fe2781f0e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_recombination.json new file mode 100644 index 000000000..178538753 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slabs_to_brick.json new file mode 100644 index 000000000..1cefd1261 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_polishing.json new file mode 100644 index 000000000..17519091e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_to_brick.json new file mode 100644 index 000000000..2486740d6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_wall_polishing.json new file mode 100644 index 000000000..e43c7f88e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_walls_to_brick.json new file mode 100644 index 000000000..ed87bdf81 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_axe.json index b44215100..5e9d8f198 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" + "item": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_blank.json index b74a7b0be..eee95e6d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:peridotite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_cross.json index 4daf6e896..3dc29c10e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" + "item": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hammer.json index 6dc945990..b7ebede43 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" + "item": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hoe.json index f61095dda..604941978 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" + "item": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_horizontal.json index 91e770259..52c9d94ae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" + "item": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_i.json index c2b4025d0..66742ab1d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" + "item": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_left.json index e81994567..6b50804f1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" + "item": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_pickaxe.json index 5dcdf63ca..b5c9cef1c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" + "item": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_plus.json index 0d435eedd..108abf8c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" + "item": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_right.json index b66b3f281..932c15e2b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" + "item": "mineralogy:peridotite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_sword.json index 2e77760bc..2314df32b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" + "item": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_vertical.json index a6418d1d0..843acc42a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" + "item": "mineralogy:peridotite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_slab.json index c8c355e43..7a861bc48 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json index c9f17c025..1183b0896 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json index 97c4c3b41..f776a16a0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:peridotite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json index 9d879ee9d..1b3486fc1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:peridotite_smooth_brick" + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_slab.json index 0f22e03ad..9f3e268c5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:peridotite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json index b4a697384..4d3e25c35 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:peridotite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json index f398d068f..f6948b978 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:peridotite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json index ce444ee13..d52182012 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:peridotite_smooth" + "item": "mineralogy:peridotite_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_slab.json index e0a177766..1fcc171eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:peridotite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json index f8354a114..fcb5aab4f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:peridotite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json index 652fafdcb..31c9d7b70 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:peridotite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json index b59fad9d5..061e84d3a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_to_stone.json new file mode 100644 index 000000000..68e5a2e94 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:peridotite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:peridotite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json index 8be02fc56..9df43657e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + } + ], "rewards": { "recipes": [ "mineralogy:peridotite_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json new file mode 100644 index 000000000..dd566af16 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_block" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phosphorous_block" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phosphorous_block" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phosphorous_dust" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json new file mode 100644 index 000000000..e2a1a975d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phosphorous_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phosphorous_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phosphorous_block" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json index d4fe09369..dca9c7a90 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_block_polishing.json new file mode 100644 index 000000000..7d7251ac6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json index 262229b38..1e268c61f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:phyllite_brick" + "item": "mineralogy:phyllite_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab.json index 3328d3bf8..93c358ed9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:phyllite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_polishing.json new file mode 100644 index 000000000..7978c14ee --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_recombination.json new file mode 100644 index 000000000..9e4199275 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json index 88684b2fc..e9b0ab080 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:phyllite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs_polishing.json new file mode 100644 index 000000000..49a3039e9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json index 8210339e2..3422f098e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:phyllite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall_polishing.json new file mode 100644 index 000000000..379d3f3f4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json new file mode 100644 index 000000000..45fdf0ab4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:phyllite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json index 36bc3812a..a8e366eb3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite" - ] + "item": "mineralogy:phyllite_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..6bfa4a6f1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slab_recombination.json new file mode 100644 index 000000000..94a667b5d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slabs_to_brick.json new file mode 100644 index 000000000..35053e666 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_stairs_to_brick.json new file mode 100644 index 000000000..2554e324c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_walls_to_brick.json new file mode 100644 index 000000000..0f29f985c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_polishing.json new file mode 100644 index 000000000..934164b1d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_recombination.json new file mode 100644 index 000000000..b6c9c9e76 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slabs_to_brick.json new file mode 100644 index 000000000..45c923ea4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_polishing.json new file mode 100644 index 000000000..365251381 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_to_brick.json new file mode 100644 index 000000000..0018e52ac --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_wall_polishing.json new file mode 100644 index 000000000..27bb97d4f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_walls_to_brick.json new file mode 100644 index 000000000..fa12d1c9d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_axe.json index 60564ac2f..f1122543c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" + "item": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_blank.json index 4d2fe2179..67b189366 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:phyllite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_cross.json index 2625cf9e3..29d5cc50d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" + "item": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hammer.json index 9e99be6a8..f97a4dca9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" + "item": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hoe.json index 2e88edf2d..c9922c311 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" + "item": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_horizontal.json index 5fb2686ac..49d13f63e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" + "item": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_i.json index af2133918..c6fa350eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" + "item": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_left.json index e95cc7ca0..ad32cfb5d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" + "item": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_pickaxe.json index 7fe848a7a..86087554d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" + "item": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_plus.json index f73252fcb..2acb2caf6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" + "item": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_right.json index 375201f7b..fdc62a7ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" + "item": "mineralogy:phyllite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_sword.json index b9fcc5bb6..02b9021a0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" + "item": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_vertical.json index 26053b260..69b9e73d5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" + "item": "mineralogy:phyllite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_slab.json index 2c3cb5a60..062848bfb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json index f44e96560..42ddb82e1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json index 42b19de8e..960088d08 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:phyllite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json index 55e1c32fe..a24fedfa3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:phyllite_smooth_brick" + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_slab.json index 7590d6ec0..9916ad485 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:phyllite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json index 0f6bae581..f40c94c78 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:phyllite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json index e6865bffb..976eacf1f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:phyllite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json index 34db3b6a2..7f7f119ed 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:phyllite_smooth" + "item": "mineralogy:phyllite_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_slab.json index 37df7e282..400274ed0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:phyllite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json index 95ff1f7e9..89abe779c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:phyllite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json index 066c2e3fc..73a1ec94c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:phyllite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json index 977dc585d..e6a90f99f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_to_stone.json new file mode 100644 index 000000000..fe9aa765f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:phyllite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:phyllite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json index 7913c7f1a..95277e922 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + } + ], "rewards": { "recipes": [ "mineralogy:phyllite_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json index ebb843a82..f6339d24e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_block_polishing.json new file mode 100644 index 000000000..57518a452 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json index 648a00968..9f8a0733d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:quartzite_brick" + "item": "mineralogy:quartzite_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab.json index d5ff175e7..0b18be43d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:quartzite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_polishing.json new file mode 100644 index 000000000..febc3b0dc --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_recombination.json new file mode 100644 index 000000000..7eaeeb747 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json index 8282e17ba..32180ccbd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:quartzite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs_polishing.json new file mode 100644 index 000000000..a3990d494 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json index 5ac901dbe..6e8a50afa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:quartzite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall_polishing.json new file mode 100644 index 000000000..06008c18b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json new file mode 100644 index 000000000..07d9acabb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:quartzite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json index de9e27ad7..f7430c3fc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite" - ] + "item": "mineralogy:quartzite_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..48f5a794e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slab_recombination.json new file mode 100644 index 000000000..e2b5f6eed --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slabs_to_brick.json new file mode 100644 index 000000000..60c199c5b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_stairs_to_brick.json new file mode 100644 index 000000000..130b87504 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_walls_to_brick.json new file mode 100644 index 000000000..506226d5b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_polishing.json new file mode 100644 index 000000000..fd416e996 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_recombination.json new file mode 100644 index 000000000..58e944c21 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slabs_to_brick.json new file mode 100644 index 000000000..e8f64a4f9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_polishing.json new file mode 100644 index 000000000..a30a1d15c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_to_brick.json new file mode 100644 index 000000000..7acaa44b0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_wall_polishing.json new file mode 100644 index 000000000..ab1fd71f2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_walls_to_brick.json new file mode 100644 index 000000000..fcf1afbcb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_axe.json index c5fa2a671..b8092fb56 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" + "item": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_blank.json index 212807b28..9531c3613 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:quartzite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_cross.json index 56024f09a..ca8758f56 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" + "item": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hammer.json index 8713bca85..72afdf074 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" + "item": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hoe.json index 428735a39..a5bc50b10 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" + "item": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_horizontal.json index 7884c0f50..0172e28ae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" + "item": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_i.json index 859966a81..d14f7958f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" + "item": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_left.json index 7086b7963..0ac996dc7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" + "item": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_pickaxe.json index 96ead05a8..3752651d4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" + "item": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_plus.json index 697348213..d9fbfd27e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" + "item": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_right.json index c4e911a48..5c5057ca7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" + "item": "mineralogy:quartzite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_sword.json index e1c9b9fed..3aea15deb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" + "item": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_vertical.json index b94e7befb..315b53c75 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" + "item": "mineralogy:quartzite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_slab.json index d8fba7287..7240336f7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json index 1d037a0da..4f323310f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json index d0836e280..9ce00226f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:quartzite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json index 6c1ff09af..cf284cb5b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:quartzite_smooth_brick" + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_slab.json index 9c6873c2c..056cc3a85 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:quartzite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json index 4a74647d6..fe9e1071d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:quartzite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json index ef3ec8db3..c78b550ae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:quartzite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json index 2b754f6de..6d97fa2eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:quartzite_smooth" + "item": "mineralogy:quartzite_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_slab.json index 524170879..d94b88879 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:quartzite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json index 0f0400adc..ef4637b9e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:quartzite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json index ec169e4eb..c1a6e6527 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:quartzite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json index 0815f2d00..4f3238af8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_to_stone.json new file mode 100644 index 000000000..1b83f18d6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:quartzite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:quartzite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json index 3bf375f17..d39dc5c22 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + } + ], "rewards": { "recipes": [ "mineralogy:quartzite_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json index 88a294fe4..7b23a73e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_block_polishing.json new file mode 100644 index 000000000..002bb879d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json index 3a9626919..80a46423a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:rhyolite_brick" + "item": "mineralogy:rhyolite_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab.json index f764aac8a..401df0bc6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:rhyolite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_polishing.json new file mode 100644 index 000000000..b22a0fa63 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_recombination.json new file mode 100644 index 000000000..d991cf7b2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json index fdf7e0d58..581cb998f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:rhyolite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs_polishing.json new file mode 100644 index 000000000..87ad545f7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json index 2ba1b7d2c..952a4efc0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:rhyolite_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall_polishing.json new file mode 100644 index 000000000..5aca93620 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json new file mode 100644 index 000000000..5826eaab8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json index 61d07ba77..da747f8ec 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite" - ] + "item": "mineralogy:rhyolite_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..8574b64e8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slab_recombination.json new file mode 100644 index 000000000..49cd86407 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slabs_to_brick.json new file mode 100644 index 000000000..9e0c374ff --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_stairs_to_brick.json new file mode 100644 index 000000000..b057ba7c3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_walls_to_brick.json new file mode 100644 index 000000000..048e368de --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_polishing.json new file mode 100644 index 000000000..d8e51c1bf --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_recombination.json new file mode 100644 index 000000000..49fc801bd --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slabs_to_brick.json new file mode 100644 index 000000000..028dfd394 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_polishing.json new file mode 100644 index 000000000..260b381af --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_to_brick.json new file mode 100644 index 000000000..09c33aa6d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_wall_polishing.json new file mode 100644 index 000000000..429d15837 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_walls_to_brick.json new file mode 100644 index 000000000..7d3fe9219 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_axe.json index 680982f90..ff343c7e5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" + "item": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_blank.json index a8134fe8d..7324f3dcb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:rhyolite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_cross.json index f3dd2e866..50a26d732 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" + "item": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hammer.json index 444a29a7c..018ff3058 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" + "item": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hoe.json index a0378bc25..16b3966b9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" + "item": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_horizontal.json index fba17d61c..fe145d204 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" + "item": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_i.json index 9154e2322..525c22f09 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" + "item": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_left.json index 4b1e39c0e..6ab182ee0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" + "item": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_pickaxe.json index bfbaf0f0e..8bbdd4243 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" + "item": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_plus.json index 2818b3cfe..88f52aeea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" + "item": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_right.json index ccab2fc32..0f9855472 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" + "item": "mineralogy:rhyolite_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_sword.json index 7fa553076..725495ad6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" + "item": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_vertical.json index afcae8bbf..ddc6b879f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" + "item": "mineralogy:rhyolite_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_slab.json index fb3566bba..2fada40a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json index 884ba7d31..bd0cf29d2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json index f3c6c2d7e..1647728af 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:rhyolite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json index ff2e148c6..067ec87ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:rhyolite_smooth_brick" + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_slab.json index 92796d15f..7d5279e79 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:rhyolite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json index 0998a32a7..8e80faf0c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:rhyolite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json index 0890eb119..f4fcac8b4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:rhyolite_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json index 4573a347c..b6b1521e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rhyolite_smooth" + "item": "mineralogy:rhyolite_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_slab.json index 5c1baca8d..12153ce30 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:rhyolite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json index e842e9d81..c935aeeed 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:rhyolite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json index a24ad8989..ee1708101 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:rhyolite_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json index fb8de3987..bfcd75fb0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_to_stone.json new file mode 100644 index 000000000..92f6357c0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:rhyolite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rhyolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json index dc7072c9c..0f60d1d2e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + } + ], "rewards": { "recipes": [ "mineralogy:rhyolite_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json new file mode 100644 index 000000000..be39fdb6e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json @@ -0,0 +1,37 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_dust" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json index e6c1dbf60..00c4f4f1b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_block_polishing.json new file mode 100644 index 000000000..e123d72c3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json index 7a15858fc..52707d17a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:rock_salt_brick" + "item": "mineralogy:rock_salt_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab.json index eb16a887c..0ed78932e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:rock_salt_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_polishing.json new file mode 100644 index 000000000..f6268b615 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_recombination.json new file mode 100644 index 000000000..9594a7f60 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json index 24b3efc5d..beba5e757 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:rock_salt_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs_polishing.json new file mode 100644 index 000000000..efcf7736e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json index 5a2a4bc5c..4f23e6ae4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:rock_salt_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall_polishing.json new file mode 100644 index 000000000..f25665689 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json new file mode 100644 index 000000000..99e1dbcad --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_dust.json new file mode 100644 index 000000000..b0d750d6b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_dust.json @@ -0,0 +1,37 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json index cf96a2e74..e2d718306 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt" - ] + "item": "mineralogy:rock_salt_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_brick_slab_recombination.json new file mode 100644 index 000000000..436788348 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slab_recombination.json new file mode 100644 index 000000000..5dbb2bb22 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slabs_to_brick.json new file mode 100644 index 000000000..31d79e2bf --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_stairs_to_brick.json new file mode 100644 index 000000000..2b87a8ae9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_walls_to_brick.json new file mode 100644 index 000000000..f4be2e6d7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_polishing.json new file mode 100644 index 000000000..2076da9d1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_recombination.json new file mode 100644 index 000000000..dad818513 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slabs_to_brick.json new file mode 100644 index 000000000..62eedb5e3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_polishing.json new file mode 100644 index 000000000..e6c5b3fe7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_to_brick.json new file mode 100644 index 000000000..2d0335ef3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_wall_polishing.json new file mode 100644 index 000000000..e011ca8d4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_walls_to_brick.json new file mode 100644 index 000000000..fd1db5621 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_axe.json index 9d8e61384..a1581be52 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" + "item": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_blank.json index 1dc27276d..08c8f5680 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:rock_salt_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_cross.json index 1eacbb2c9..1e0334106 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" + "item": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hammer.json index bd9e99704..5e8bda79e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" + "item": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hoe.json index 826647baf..2b7aff4e8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" + "item": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_horizontal.json index 8a32c677c..674414635 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" + "item": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_i.json index 18688685e..113f8bc69 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" + "item": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_left.json index 4896126cb..792da0658 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" + "item": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_pickaxe.json index f5999c334..2d8fc626f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" + "item": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_plus.json index 8356ff3c3..90de97cb0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" + "item": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_right.json index 3d6637f78..564867950 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" + "item": "mineralogy:rock_salt_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_sword.json index 31d6bd8be..c2d2d0acf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" + "item": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_vertical.json index bb60ad305..1bad3a017 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" + "item": "mineralogy:rock_salt_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_slab.json index f6faa0ef7..17608b4c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json index 7f66adec4..dd2497b5a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json index fb38c8e7b..a58092081 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:rock_salt_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json index d874f45a1..1b7062b34 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:rock_salt_smooth_brick" + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_slab.json index 16d81080c..d656cc7e0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:rock_salt_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json index 9e86fee04..476a80552 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:rock_salt_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json index ceaad0c6d..6eb588c2b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:rock_salt_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json index 56b82fb37..24ff8589e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:rock_salt_smooth" + "item": "mineralogy:rock_salt_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_slab.json index 0c1eb7bc2..36fb6a2ca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:rock_salt_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json index ec33abaaf..4044d60cb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:rock_salt_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json index 872d224d0..4f0a189a3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:rock_salt_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json index 1d8ac691c..63a161fb9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_to_stone.json new file mode 100644 index 000000000..bbda548f6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:rock_salt_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:rock_salt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json index 9fc85860e..e2e300771 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + } + ], "rewards": { "recipes": [ "mineralogy:rock_salt_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json index 02501417f..38e2e9bd8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltlamp" + } + ], "rewards": { "recipes": [ "mineralogy:rocksaltlamp" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json index e61ec9947..1b3cbf024 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltstreetlamp" + } + ], "rewards": { "recipes": [ "mineralogy:rocksaltstreetlamp" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json index 4caca83c8..7eda8b001 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + } + ], "rewards": { "recipes": [ "mineralogy:schist_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_block_polishing.json new file mode 100644 index 000000000..51b6fd6b0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json index 2400c75f6..18c197281 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:schist_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:schist_brick" + "item": "mineralogy:schist_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab.json index 6be1edb38..a51acfe42 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:schist_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:schist_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_polishing.json new file mode 100644 index 000000000..9ed45991a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_recombination.json new file mode 100644 index 000000000..60fa2d680 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json index f3df51fcc..5e096cf0f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:schist_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:schist_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs_polishing.json new file mode 100644 index 000000000..40d899fa1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json index ec9011c44..cb7d4a239 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:schist_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:schist_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall_polishing.json new file mode 100644 index 000000000..29bbd1fbb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json new file mode 100644 index 000000000..7cc9e53e4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:schist_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json index c911253cc..e0b07a0dd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:schist_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist" - ] + "item": "mineralogy:schist_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_brick_slab_recombination.json new file mode 100644 index 000000000..f85cc9643 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slab_recombination.json new file mode 100644 index 000000000..f0b048dd6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slabs_to_brick.json new file mode 100644 index 000000000..1c93a8c2f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_stairs_to_brick.json new file mode 100644 index 000000000..9de0995b5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_walls_to_brick.json new file mode 100644 index 000000000..e36ab4ecb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_polishing.json new file mode 100644 index 000000000..a424f8d18 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_recombination.json new file mode 100644 index 000000000..a42b33aeb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slabs_to_brick.json new file mode 100644 index 000000000..ca713f8ab --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_polishing.json new file mode 100644 index 000000000..0485fcdeb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_to_brick.json new file mode 100644 index 000000000..9d8c27132 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_wall_polishing.json new file mode 100644 index 000000000..58714fd73 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_walls_to_brick.json new file mode 100644 index 000000000..3895611cb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_axe.json index 8a1210a28..51fa2873d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:schist_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" + "item": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_blank.json index d962e5caf..4d5bcff5f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:schist_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:schist_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_cross.json index ac9b621dd..fe89215e4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:schist_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" + "item": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hammer.json index ef32959a6..fe7296333 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:schist_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" + "item": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hoe.json index 178324209..875e457cb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:schist_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" + "item": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_horizontal.json index 0ac4a5354..521a83b8b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:schist_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" + "item": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_i.json index a8cf4f03a..b6b459f4e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:schist_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" + "item": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_left.json index 6bf80314f..0c473adce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:schist_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" + "item": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_pickaxe.json index 6b088d54d..4e4067572 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:schist_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" + "item": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_plus.json index 3d63c9ca2..2efcdd874 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:schist_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" + "item": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_right.json index 533f1fdeb..22bb755bd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:schist_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" + "item": "mineralogy:schist_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_sword.json index 86fb9ef71..9c30cbf7c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:schist_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" + "item": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_vertical.json index a4ebdf6ea..68fb3176d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:schist_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" + "item": "mineralogy:schist_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_slab.json index 407d29001..ef1966a05 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + } + ], "rewards": { "recipes": [ "mineralogy:schist_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json index e06f0d4fb..bef51b95a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:schist_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json index f08e9e00d..26207b5f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:schist_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:schist_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json index 9df29a39b..b2849147f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:schist_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:schist_smooth_brick" + "item": "mineralogy:schist_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_slab.json index 21c996419..3d117c0c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:schist_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:schist_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json index e764c783f..1856c1d99 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:schist_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:schist_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json index 4cd807668..69c1c52f1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:schist_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:schist_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json index 5ad45374c..03caaa243 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:schist_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:schist_smooth" + "item": "mineralogy:schist_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_slab.json index d6be4599f..8842feb86 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:schist_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:schist_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json index cbb189eeb..d2978d8a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:schist_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:schist_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json index 298c5c2ff..2fa5b66ec 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:schist_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:schist_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json index 820805085..79b7548bd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:schist_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_to_stone.json new file mode 100644 index 000000000..5048a02be --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:schist_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:schist" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json index d31342ab2..c8c4f119d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + } + ], "rewards": { "recipes": [ "mineralogy:schist_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json index 99dfc1660..eec5e099e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_block_polishing.json new file mode 100644 index 000000000..80c3093c9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json index 9204d0dc3..9e9a6eb2c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:scoria_brick" + "item": "mineralogy:scoria_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab.json index 20ca4ed46..0d3eef40d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:scoria_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_polishing.json new file mode 100644 index 000000000..967a5e5d1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_recombination.json new file mode 100644 index 000000000..bb582053e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json index ca71f2815..1821043ef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:scoria_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs_polishing.json new file mode 100644 index 000000000..e343cf279 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json index a115adeda..f3fc58daf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:scoria_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall_polishing.json new file mode 100644 index 000000000..7d8f58b77 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json new file mode 100644 index 000000000..7c54ebb5d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:scoria_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json index d5b6119d1..a782d060e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria" - ] + "item": "mineralogy:scoria_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_brick_slab_recombination.json new file mode 100644 index 000000000..beae1a9ce --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slab_recombination.json new file mode 100644 index 000000000..12afba7b8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slabs_to_brick.json new file mode 100644 index 000000000..f8078f91a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_stairs_to_brick.json new file mode 100644 index 000000000..7426adcac --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_walls_to_brick.json new file mode 100644 index 000000000..37ba142bb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_polishing.json new file mode 100644 index 000000000..8d3f59898 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_recombination.json new file mode 100644 index 000000000..ecc4182f0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slabs_to_brick.json new file mode 100644 index 000000000..b52735483 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_polishing.json new file mode 100644 index 000000000..37c0effd9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_to_brick.json new file mode 100644 index 000000000..e275d790e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_wall_polishing.json new file mode 100644 index 000000000..1087c522a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_walls_to_brick.json new file mode 100644 index 000000000..e296923e6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_axe.json index b8a15eaa7..eaa2d11ef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" + "item": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_blank.json index f4965292a..58055373b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:scoria_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_cross.json index 368c00b06..9bf35b672 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" + "item": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hammer.json index ef110939c..257954335 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" + "item": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hoe.json index b28b6011e..3bf378d96 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" + "item": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_horizontal.json index 5726956a3..df6eac6a9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" + "item": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_i.json index 07da1e979..dc58695a9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" + "item": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_left.json index 265ec0778..9dbcdf6cd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" + "item": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_pickaxe.json index 38712a67b..54a13daf5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" + "item": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_plus.json index 3e21fd62f..ae4c61409 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" + "item": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_right.json index a108cfc95..6169eba46 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" + "item": "mineralogy:scoria_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_sword.json index 1f82fa4d3..9e71c6556 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" + "item": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_vertical.json index c5ea52e25..89a000da6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" + "item": "mineralogy:scoria_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_slab.json index 57d8e4b71..4e7d0912c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json index e7b6fd611..a5a673c4d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json index e7632d9f8..8dd9a141d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:scoria_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json index 4b78b14d2..3e97a9ad1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:scoria_smooth_brick" + "item": "mineralogy:scoria_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_slab.json index 51b2b2382..0ced9f040 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:scoria_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json index 2c7d10228..aae20c93d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:scoria_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json index 689624ce6..107a24e0b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:scoria_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json index 6bc4e390c..2490f9329 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:scoria_smooth" + "item": "mineralogy:scoria_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_slab.json index 73292f91e..3f0480c3d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:scoria_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json index f82d488ff..e48555d03 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:scoria_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json index 263f30c5f..233bad47c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:scoria_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json index 41c1a28a1..38aab7072 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_to_stone.json new file mode 100644 index 000000000..4414f3e4a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:scoria_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:scoria" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json index 70bd6e10e..26995a825 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + } + ], "rewards": { "recipes": [ "mineralogy:scoria_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json index b19f01012..861bf363d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + } + ], "rewards": { "recipes": [ "mineralogy:shale_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_block_polishing.json new file mode 100644 index 000000000..2e60eb085 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json index 7ab8a5eef..734db2fca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:shale_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:shale_brick" + "item": "mineralogy:shale_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab.json index 1df129dc1..9e48f73e8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:shale_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:shale_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_polishing.json new file mode 100644 index 000000000..06454ef36 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_recombination.json new file mode 100644 index 000000000..05604cf04 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json index 1da7ba327..950bd10c5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:shale_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:shale_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs_polishing.json new file mode 100644 index 000000000..f968db796 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json index 7144628ee..4cfe6133f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:shale_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:shale_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall_polishing.json new file mode 100644 index 000000000..54281bbd0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json new file mode 100644 index 000000000..ccefcc9f1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:shale_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json index 91aa114ca..267e1748f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:shale_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale" - ] + "item": "mineralogy:shale_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_brick_slab_recombination.json new file mode 100644 index 000000000..7639d4366 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slab_recombination.json new file mode 100644 index 000000000..780954af0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slabs_to_brick.json new file mode 100644 index 000000000..25ba554b3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_stairs_to_brick.json new file mode 100644 index 000000000..675eb742f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_walls_to_brick.json new file mode 100644 index 000000000..77ff6aeca --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_polishing.json new file mode 100644 index 000000000..1b15eae25 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_recombination.json new file mode 100644 index 000000000..8475d27e7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slabs_to_brick.json new file mode 100644 index 000000000..5b4bf660f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_polishing.json new file mode 100644 index 000000000..92cf7ea85 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_to_brick.json new file mode 100644 index 000000000..ea86b616f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_wall_polishing.json new file mode 100644 index 000000000..3e168c00d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_walls_to_brick.json new file mode 100644 index 000000000..20bb901cf --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_axe.json index e5c853eff..373a9fbf8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:shale_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" + "item": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_blank.json index 20143b55a..63628f600 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:shale_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:shale_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_cross.json index 44e8f7dc5..0d2b6ff62 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:shale_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" + "item": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hammer.json index 1f671e8cb..e0189c840 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:shale_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" + "item": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hoe.json index bc7dd0754..fcc06860f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:shale_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" + "item": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_horizontal.json index 4a1f831a3..17be58e97 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:shale_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" + "item": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_i.json index 3ede26a98..5279a3d27 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:shale_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" + "item": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_left.json index 792463509..f38e49bf6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:shale_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" + "item": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_pickaxe.json index ff0591a66..90765b7d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:shale_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" + "item": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_plus.json index 514ab9503..73656356d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:shale_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" + "item": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_right.json index b3282fcfd..63c50fda2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:shale_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" + "item": "mineralogy:shale_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_sword.json index 7bf1cfade..e40e7df08 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:shale_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" + "item": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_vertical.json index 50c2fa38b..52505e3da 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:shale_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" + "item": "mineralogy:shale_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_slab.json index b81f534cf..f1cc21ed6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + } + ], "rewards": { "recipes": [ "mineralogy:shale_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json index f96fe49cb..a795ef935 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:shale_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json index eec00464b..c9bfdc1fc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:shale_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:shale_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json index da39262cb..552d76b84 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:shale_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:shale_smooth_brick" + "item": "mineralogy:shale_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_slab.json index fe37d12c2..8beadc1bb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:shale_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:shale_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json index 1151995b6..9a21d59b0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:shale_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:shale_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json index 59fca3da5..0cac1a5f2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:shale_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:shale_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json index d3407476b..f2e360f2c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:shale_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:shale_smooth" + "item": "mineralogy:shale_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_slab.json index 784acace0..b60cbe6c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:shale_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:shale_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json index d8f3c258f..f4657aea2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:shale_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:shale_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json index 3a07b99bd..c2927dff0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:shale_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:shale_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json index fe9515a95..0503df50a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:shale_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_to_stone.json new file mode 100644 index 000000000..2878e95da --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:shale_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:shale" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json index 7bd38a282..e745dda47 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + } + ], "rewards": { "recipes": [ "mineralogy:shale_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json index 552737a7e..191a7c11d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_block_polishing.json new file mode 100644 index 000000000..be3993c89 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json index d4b0807d1..281f53bf2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:siltstone_brick" + "item": "mineralogy:siltstone_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab.json index 9ef6dae36..262d29f71 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:siltstone_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_polishing.json new file mode 100644 index 000000000..7ff946e4a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_recombination.json new file mode 100644 index 000000000..6f597cffd --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json index f894f52fc..5c495bb87 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:siltstone_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs_polishing.json new file mode 100644 index 000000000..1cfef2b82 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json index 3379098ad..c9bc0781a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:siltstone_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall_polishing.json new file mode 100644 index 000000000..9571b3252 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json new file mode 100644 index 000000000..b2b7db64f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:siltstone_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json index 678cc8bab..58c18677f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone" - ] + "item": "mineralogy:siltstone_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_brick_slab_recombination.json new file mode 100644 index 000000000..b84c8c470 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slab_recombination.json new file mode 100644 index 000000000..96080cc3d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slabs_to_brick.json new file mode 100644 index 000000000..b480107a0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_stairs_to_brick.json new file mode 100644 index 000000000..ca9bd0ffb --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_walls_to_brick.json new file mode 100644 index 000000000..9a83c1613 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_polishing.json new file mode 100644 index 000000000..0f3864ea0 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_recombination.json new file mode 100644 index 000000000..9d49d88d7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slabs_to_brick.json new file mode 100644 index 000000000..b8ee6680e --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_polishing.json new file mode 100644 index 000000000..82ec33408 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_to_brick.json new file mode 100644 index 000000000..16a4c1a8c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_wall_polishing.json new file mode 100644 index 000000000..adfd5b7b4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_walls_to_brick.json new file mode 100644 index 000000000..43fce9948 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_axe.json index 2fd816d0d..f1389ad21 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" + "item": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_blank.json index cc5447cac..f41b50774 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:siltstone_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_cross.json index e143b63f1..49515980e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" + "item": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hammer.json index 5a1aa35d9..722badf43 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" + "item": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hoe.json index 92ff8efef..06a9fb0b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" + "item": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_horizontal.json index d60b45d78..78b707d4a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" + "item": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_i.json index 4f3e86ee5..3fbaa6c07 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" + "item": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_left.json index 8eec2685b..30d5c07cf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" + "item": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_pickaxe.json index 2b5fc1356..406ca9686 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" + "item": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_plus.json index 335260668..cda06dfc5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" + "item": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_right.json index f29a6d920..bf760229d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" + "item": "mineralogy:siltstone_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_sword.json index 7914371b9..14fc65fe3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" + "item": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_vertical.json index c849fe1f1..73fc46ce3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" + "item": "mineralogy:siltstone_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_slab.json index 2972d96a3..0d61f7de5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json index f5e0929ad..32e7a47c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json index ac5c5b3b5..2b086071f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:siltstone_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json index c0e2ff3de..4e79e144c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:siltstone_smooth_brick" + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_slab.json index 119708ebc..c44fa4e47 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:siltstone_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json index 28fbd8b66..0789ca42f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:siltstone_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json index 6af42f8e2..29d38fc88 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:siltstone_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json index 940efc9ad..dda88531f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:siltstone_smooth" + "item": "mineralogy:siltstone_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_slab.json index 762b6a381..0c5018a7a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:siltstone_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json index 7f6fb5126..7c3d9fd76 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:siltstone_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json index 468a773c8..e7d75f532 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:siltstone_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json index 8ac19cc71..5e14200c3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_to_stone.json new file mode 100644 index 000000000..19276846f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:siltstone_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:siltstone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json index db395dea1..b747f1082 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + } + ], "rewards": { "recipes": [ "mineralogy:siltstone_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json index e23db8e7c..5b0021b58 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + } + ], "rewards": { "recipes": [ "mineralogy:slate_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_block_polishing.json new file mode 100644 index 000000000..d0023677f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json index b8382355d..fd16de3a4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:slate_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:slate_brick" + "item": "mineralogy:slate_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab.json index 5de2f61f4..4aab05080 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:slate_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:slate_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_polishing.json new file mode 100644 index 000000000..5f61c8492 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_recombination.json new file mode 100644 index 000000000..3dbe2f923 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json index 039126202..ecae4df55 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:slate_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:slate_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs_polishing.json new file mode 100644 index 000000000..237fc90c5 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json index 7d3e54e04..6dc28618e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:slate_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:slate_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall_polishing.json new file mode 100644 index 000000000..141e01e15 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json new file mode 100644 index 000000000..0b57f8988 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:slate_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json index 868abeacc..9c683e289 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:slate_furnace" @@ -16,9 +22,17 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate" - ] + "item": "mineralogy:slate_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -28,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_brick_slab_recombination.json new file mode 100644 index 000000000..b5ce2eaf4 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slab_recombination.json new file mode 100644 index 000000000..e17d6a8f9 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slabs_to_brick.json new file mode 100644 index 000000000..638822025 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_stairs_to_brick.json new file mode 100644 index 000000000..1402d7537 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_walls_to_brick.json new file mode 100644 index 000000000..a7c3e5845 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_polishing.json new file mode 100644 index 000000000..e7bef8f49 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_recombination.json new file mode 100644 index 000000000..fd4091e46 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slabs_to_brick.json new file mode 100644 index 000000000..ed5df22b8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_polishing.json new file mode 100644 index 000000000..a601ebc43 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_to_brick.json new file mode 100644 index 000000000..3d09ae817 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_wall_polishing.json new file mode 100644 index 000000000..523b5fa9a --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_walls_to_brick.json new file mode 100644 index 000000000..36ba48056 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_axe.json index f4daa0258..85157e6b3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:slate_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" + "item": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_blank.json index cc080d555..ba2b03586 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:slate_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:slate_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_cross.json index ff2c305e2..c91a4a1c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:slate_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" + "item": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hammer.json index a5a32d584..a429cd76b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:slate_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" + "item": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hoe.json index f3a6a21f4..7746cfe10 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:slate_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" + "item": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_horizontal.json index c4ccc76d8..ccc928d66 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:slate_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" + "item": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_i.json index 07980c436..9785e56c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:slate_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" + "item": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_left.json index 6c6be09fb..1f736c3a6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:slate_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" + "item": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_pickaxe.json index 332f8d34e..e2ad124f0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:slate_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" + "item": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_plus.json index 071b06f9b..847777f6e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:slate_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" + "item": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_right.json index eea95c7c3..4cc3e8abe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:slate_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" + "item": "mineralogy:slate_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_sword.json index bad73b393..c64106a3f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:slate_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" + "item": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_vertical.json index 2c6369f9d..a504cba56 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:slate_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" + "item": "mineralogy:slate_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_slab.json index 0d2000fc4..b9ca457fd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + } + ], "rewards": { "recipes": [ "mineralogy:slate_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json index 72fead37f..fb881ba36 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:slate_smooth" @@ -22,12 +28,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json index 5312619ee..265529518 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:slate_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:slate_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json index 7918564d5..085912626 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:slate_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:slate_smooth_brick" + "item": "mineralogy:slate_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_slab.json index 418932b40..0c751f28c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:slate_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:slate_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json index 01e93b90e..f6efd7d44 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:slate_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:slate_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json index fdcf59ecc..f60100444 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:slate_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:slate_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json index 7ca65321d..3d9b50e6b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:slate_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:slate_smooth" + "item": "mineralogy:slate_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_slab.json index 44b4010e3..1950c65b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:slate_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:slate_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json index f1fba4eb1..650cc248a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:slate_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:slate_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json index 8b3828891..25eccdd5b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:slate_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:slate_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json index 487924cbd..36d9ea161 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:slate_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_to_stone.json new file mode 100644 index 000000000..60b71ad88 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:slate_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:slate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json index d9cac1429..acd2c7dc9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + } + ], "rewards": { "recipes": [ "mineralogy:slate_wall" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json new file mode 100644 index 000000000..312f9fa31 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_block" + } + ], + "rewards": { + "recipes": [ + "mineralogy:sulfur_block" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:sulfur_block" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:sulfur_dust" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json new file mode 100644 index 000000000..6c18daf0b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:sulfur_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:sulfur_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:sulfur_block" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json index 9201de583..db0b5733e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_brick" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_block_polishing.json new file mode 100644 index 000000000..cee166b47 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_block_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_brick" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json index 8d4344339..8c0d4004e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_brick_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], - "item": "mineralogy:tuff_brick" + "item": "mineralogy:tuff_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab.json index 8948a0851..0dc690f18 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_brick_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:tuff_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_polishing.json new file mode 100644 index 000000000..e2f6098c6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_brick_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_recombination.json new file mode 100644 index 000000000..bb29159e6 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json index acb56c3a3..26df09840 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_brick_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:tuff_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs_polishing.json new file mode 100644 index 000000000..de35dae60 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_brick_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json index 09e522258..73e80ff15 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_brick_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_BRICK" - ], "item": "mineralogy:tuff_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall_polishing.json new file mode 100644 index 000000000..64b49820c --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_brick_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json new file mode 100644 index 000000000..c98db5124 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json @@ -0,0 +1,32 @@ +{ + "conditions": [], + "rewards": { + "recipes": [ + "mineralogy:tuff_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json index 3f5959c8b..5d4b50059 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_furnace" @@ -16,7 +22,17 @@ "conditions": { "items": [ { - "tag": "mineralogy:crafting_materials/tuff" + "item": "mineralogy:tuff_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -26,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_brick_slab_recombination.json new file mode 100644 index 000000000..99cda9eb3 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_brick_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_smooth_brick_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slab_recombination.json new file mode 100644 index 000000000..f06307b1f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slabs_to_brick.json new file mode 100644 index 000000000..e458f40fa --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_stairs_to_brick.json new file mode 100644 index 000000000..19c30ab9f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_smooth_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_walls_to_brick.json new file mode 100644 index 000000000..4ed94cbc2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_smooth_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_polishing.json new file mode 100644 index 000000000..1fefbdd5d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_slab" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_recombination.json new file mode 100644 index 000000000..5de9a14b1 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_recombination.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slabs_to_brick.json new file mode 100644 index 000000000..ee13e391b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slabs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_polishing.json new file mode 100644 index 000000000..3fc277df7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_stairs" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_to_brick.json new file mode 100644 index 000000000..649a69f7d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_stairs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_wall_polishing.json new file mode 100644 index 000000000..03475e6c8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_wall_polishing.json @@ -0,0 +1,66 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_wall" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_sand" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_walls_to_brick.json new file mode 100644 index 000000000..6d3a60936 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_walls_to_brick.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff_wall" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_axe.json index c7a8dbeb7..b2ac6f2ed 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_axe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_axe" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_relief_axe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" + "item": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_blank.json index 95edc477e..8fd9aef21 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_blank.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_blank" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_relief_blank" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:tuff_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_cross.json index 028e03a0f..bf64fc126 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_cross.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_cross" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_relief_cross" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" + "item": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hammer.json index 48809c176..9cb88dded 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hammer.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hammer" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_relief_hammer" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" + "item": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hoe.json index 0164702ea..ee25441b4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hoe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hoe" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_relief_hoe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" + "item": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_horizontal.json index 396974dc1..9eea2f48b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_horizontal.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_horizontal" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_relief_horizontal" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" + "item": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_i.json index a4d5c7338..3fefdca1a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_i.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_i" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_relief_i" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" + "item": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_left.json index 683d30b89..fbcb0940b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_left.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_left" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_relief_left" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" + "item": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_pickaxe.json index 2e32f7a12..d8802367c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_pickaxe.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_pickaxe" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_relief_pickaxe" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" + "item": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_plus.json index 15fc7a909..a7866eed8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_plus.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_plus" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_relief_plus" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" + "item": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_right.json index e5b060cc0..e02cfd0aa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_right.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_right" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_relief_right" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" + "item": "mineralogy:tuff_relief_left" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_sword.json index d1b706199..c740f99a0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_sword.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_sword" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_relief_sword" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" + "item": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_vertical.json index becd52776..b791172a4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_vertical.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_vertical" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_relief_vertical" @@ -16,11 +22,7 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" + "item": "mineralogy:tuff_relief_blank" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_slab.json index 1efe579af..9796c9b8a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_slab" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json index 3b4f56296..d1065cc55 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_smooth" @@ -20,12 +26,26 @@ } ] } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } } }, "requirements": [ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_sand" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json index 145d49a4f..550c03edd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_smooth_brick" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:tuff_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json index 6e421eba1..1fec636db 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_smooth_brick_furnace" @@ -16,12 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], - "item": "mineralogy:tuff_smooth_brick" + "item": "mineralogy:tuff_smooth_brick_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -31,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_slab.json index 078cd8082..d94491e16 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_smooth_brick_slab" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:tuff_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json index f3f7b44ad..403e8eed3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_smooth_brick_stairs" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:tuff_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json index 8b18cbb96..c6ab6e006 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_smooth_brick_wall" @@ -16,11 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH", - "GENERATE_SMOOTHBRICK" - ], "item": "mineralogy:tuff_smooth_brick" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json index bceb7d520..57b8f5bb1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_furnace" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_smooth_furnace" @@ -16,11 +22,17 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], - "item": "mineralogy:tuff_smooth" + "item": "mineralogy:tuff_smooth_slab" + } + ] + } + }, + "has_furnace": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:furnace" } ] } @@ -30,6 +42,10 @@ [ "has_the_recipe", "has_rock" + ], + [ + "has_the_recipe", + "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_slab.json index f8501d0c8..4f024b487 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_smooth_slab" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:tuff_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json index 50c3f7f3a..2f013f687 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_smooth_stairs" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:tuff_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json index 0fdf9c02e..d8ce01c94 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_smooth_wall" @@ -16,10 +22,6 @@ "conditions": { "items": [ { - "type": "mineralogy:config_item", - "flags": [ - "GENERATE_SMOOTH" - ], "item": "mineralogy:tuff_smooth" } ] diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json index e423afbc8..5c6681976 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_stairs" diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_to_stone.json new file mode 100644 index 000000000..87920f78f --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_to_stone.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "mineralogy:tuff_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:tuff" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json index 0171535ad..48b7cfafa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + } + ], "rewards": { "recipes": [ "mineralogy:tuff_wall" diff --git a/src/main/resources/data/mineralogy/orespawn/provider.json b/src/main/resources/data/mineralogy/orespawn/provider.json new file mode 100644 index 000000000..6d8e33aaf --- /dev/null +++ b/src/main/resources/data/mineralogy/orespawn/provider.json @@ -0,0 +1,636 @@ +{ + "schema_version": 4, + "provider_modid": "mineralogy", + "provider_revision": 3, + "profile_defaults": { + "geology_mode": "geome", + "place_fluid_deposits": true, + "manage_vanilla_ores": false, + "default_template": "", + "geome_scale": 384, + "biome_influence": 1.15, + "regional_noise_influence": 0.9, + "boundary_noise_influence": 0.45, + "formations": { + "algorithm": "stable_layers", + "horizontal_size": "average", + "vertical_thickness": "average", + "waviness": "average", + "edge_irregularity": "average", + "formation_continuity": "average", + "custom": { + "stratum_wavelength": 256, + "family_region_wavelength": 100, + "vertical_thickness": 8, + "waviness_amplitude": 60, + "edge_octaves": 4, + "continuity": 0.85 + } + }, + "worldgen_aliases": { + "mineralogy:andesite": "minecraft:andesite", + "mineralogy:basalt": "minecraft:basalt", + "mineralogy:diorite": "minecraft:diorite", + "mineralogy:granite": "minecraft:granite" + }, + "cyano": { + "geome_size": 100, + "rock_layer_noise": 32, + "rock_layer_thickness": 8 + }, + "terrain_dimensions": { + "minecraft:overworld": { + "enabled": true, + "biome_ids": [], + "biome_namespaces": [], + "host_blocks": [ + "minecraft:stone" + ], + "host_tags": [] + } + } + }, + "fluid_deposits": { + "mineralogy:fluid_deposit/crude_oil": { + "enabled": true, + "block": "mineralogy:crude_oil", + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": 0, + "max_y": 48, + "frequency": 0.08, + "min_radius": 5, + "max_radius": 12, + "min_vertical_radius": 2, + "max_vertical_radius": 5, + "max_lobes": 4, + "min_solid_cover": 2, + "host_families": [ + "sedimentary" + ], + "host_blocks": [], + "host_tags": [], + "biome_ids": [], + "excluded_biome_ids": [], + "biome_dictionary": [ + "OCEAN" + ], + "excluded_biome_dictionary": [], + "geomes": {} + } + } + } + }, + "rocks": { + "mineralogy:rock/minecraft/andesite": { + "family": "igneous_volcanic", + "depth_peak": 68, + "depth_spread": 42, + "weight": 1, + "geomes": { + "volcanic_arc": 3, + "mountain_belt": 1.2 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "minecraft:andesite" + }, + "mineralogy:rock/minecraft/basalt": { + "family": "igneous_volcanic", + "depth_peak": 72, + "depth_spread": 36, + "weight": 1.2, + "geomes": { + "volcanic_arc": 4, + "coastal_shelf": 0.7 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "minecraft:basalt" + }, + "mineralogy:rock/mineralogy/rhyolite": { + "family": "igneous_volcanic", + "depth_peak": 70, + "depth_spread": 36, + "weight": 1, + "geomes": { + "volcanic_arc": 3.5, + "mountain_belt": 0.8 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:rhyolite" + }, + "mineralogy:rock/mineralogy/basaltic_glass": { + "family": "igneous_volcanic", + "depth_peak": 78, + "depth_spread": 24, + "weight": 0.75, + "geomes": { + "volcanic_arc": 4.5 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:basaltic_glass" + }, + "mineralogy:rock/mineralogy/scoria": { + "family": "igneous_volcanic", + "depth_peak": 80, + "depth_spread": 22, + "weight": 0.85, + "geomes": { + "volcanic_arc": 4 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:scoria" + }, + "mineralogy:rock/minecraft/tuff": { + "family": "igneous_volcanic", + "depth_peak": 74, + "depth_spread": 30, + "weight": 0.9, + "geomes": { + "volcanic_arc": 3.5, + "arid_basin": 0.8 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:tuff" + }, + "mineralogy:rock/mineralogy/pumice": { + "family": "igneous_volcanic", + "depth_peak": 82, + "depth_spread": 20, + "weight": 0.65, + "geomes": { + "volcanic_arc": 4 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:pumice" + }, + "mineralogy:rock/minecraft/diorite": { + "family": "igneous_intrusive", + "depth_peak": 36, + "depth_spread": 42, + "weight": 1, + "geomes": { + "stable_craton": 1.3, + "mountain_belt": 1 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "minecraft:diorite" + }, + "mineralogy:rock/minecraft/granite": { + "family": "igneous_intrusive", + "depth_peak": 30, + "depth_spread": 48, + "weight": 1.1, + "geomes": { + "stable_craton": 2, + "mountain_belt": 1.4 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "minecraft:granite" + }, + "mineralogy:rock/mineralogy/pegmatite": { + "family": "igneous_intrusive", + "depth_peak": 26, + "depth_spread": 36, + "weight": 0.8, + "geomes": { + "stable_craton": 1.6, + "mountain_belt": 1.2 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:pegmatite" + }, + "mineralogy:rock/mineralogy/diabase": { + "family": "igneous_intrusive", + "depth_peak": 30, + "depth_spread": 40, + "weight": 1, + "geomes": { + "stable_craton": 1.2, + "volcanic_arc": 1.2 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:diabase" + }, + "mineralogy:rock/mineralogy/gabbro": { + "family": "igneous_intrusive", + "depth_peak": 20, + "depth_spread": 44, + "weight": 1.1, + "geomes": { + "stable_craton": 1.2, + "mountain_belt": 1.2 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:gabbro" + }, + "mineralogy:rock/mineralogy/peridotite": { + "family": "igneous_intrusive", + "depth_peak": 10, + "depth_spread": 34, + "weight": 0.85, + "geomes": { + "mountain_belt": 1.5, + "volcanic_arc": 1 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:peridotite" + }, + "mineralogy:rock/mineralogy/shale": { + "family": "sedimentary", + "depth_peak": 62, + "depth_spread": 36, + "weight": 1.15, + "geomes": { + "sedimentary_basin": 3.5, + "wetland_basin": 2, + "coastal_shelf": 1.8 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:shale" + }, + "mineralogy:rock/mineralogy/conglomerate": { + "family": "sedimentary", + "depth_peak": 58, + "depth_spread": 32, + "weight": 0.9, + "geomes": { + "sedimentary_basin": 2.2, + "mountain_belt": 0.8 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:conglomerate" + }, + "mineralogy:rock/mineralogy/dolomite": { + "family": "sedimentary", + "depth_peak": 55, + "depth_spread": 38, + "weight": 0.9, + "geomes": { + "coastal_shelf": 2.2, + "sedimentary_basin": 1.8 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:dolomite" + }, + "mineralogy:rock/mineralogy/limestone": { + "family": "sedimentary", + "depth_peak": 60, + "depth_spread": 40, + "weight": 1, + "geomes": { + "coastal_shelf": 3, + "sedimentary_basin": 1.6 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:limestone" + }, + "mineralogy:rock/mineralogy/siltstone": { + "family": "sedimentary", + "depth_peak": 66, + "depth_spread": 34, + "weight": 1, + "geomes": { + "sedimentary_basin": 2.4, + "wetland_basin": 1.8 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:siltstone" + }, + "mineralogy:rock/mineralogy/rock_salt": { + "family": "sedimentary", + "depth_peak": 54, + "depth_spread": 28, + "weight": 0.6, + "geomes": { + "arid_basin": 4, + "coastal_shelf": 1.2 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:rock_salt" + }, + "mineralogy:rock/mineralogy/chert": { + "family": "sedimentary", + "depth_peak": 48, + "depth_spread": 32, + "weight": 0.65, + "geomes": { + "coastal_shelf": 2, + "sedimentary_basin": 1.4 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:chert" + }, + "mineralogy:rock/mineralogy/gypsum": { + "family": "sedimentary", + "depth_peak": 52, + "depth_spread": 26, + "weight": 0.65, + "geomes": { + "arid_basin": 3.5, + "coastal_shelf": 1 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:gypsum" + }, + "mineralogy:rock/mineralogy/chalk": { + "family": "sedimentary", + "depth_peak": 68, + "depth_spread": 24, + "weight": 0.65, + "geomes": { + "coastal_shelf": 3 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:chalk" + }, + "mineralogy:rock/minecraft/sandstone": { + "family": "sedimentary", + "depth_peak": 72, + "depth_spread": 28, + "weight": 0.55, + "geomes": { + "arid_basin": 2.5, + "coastal_shelf": 0.8 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "minecraft:sandstone" + }, + "mineralogy:rock/mineralogy/marble": { + "family": "metamorphic", + "depth_peak": 32, + "depth_spread": 36, + "weight": 0.85, + "geomes": { + "mountain_belt": 1.8, + "stable_craton": 1.2 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:marble" + }, + "mineralogy:rock/mineralogy/slate": { + "family": "metamorphic", + "depth_peak": 36, + "depth_spread": 34, + "weight": 1, + "geomes": { + "mountain_belt": 2, + "sedimentary_basin": 0.7 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:slate" + }, + "mineralogy:rock/mineralogy/schist": { + "family": "metamorphic", + "depth_peak": 24, + "depth_spread": 34, + "weight": 1, + "geomes": { + "mountain_belt": 2.8 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:schist" + }, + "mineralogy:rock/mineralogy/gneiss": { + "family": "metamorphic", + "depth_peak": 18, + "depth_spread": 38, + "weight": 1, + "geomes": { + "mountain_belt": 2.6, + "stable_craton": 1.2 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:gneiss" + }, + "mineralogy:rock/mineralogy/phyllite": { + "family": "metamorphic", + "depth_peak": 34, + "depth_spread": 34, + "weight": 0.9, + "geomes": { + "mountain_belt": 2 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:phyllite" + }, + "mineralogy:rock/mineralogy/amphibolite": { + "family": "metamorphic", + "depth_peak": 18, + "depth_spread": 34, + "weight": 0.9, + "geomes": { + "mountain_belt": 2.4, + "volcanic_arc": 0.8 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:amphibolite" + }, + "mineralogy:rock/mineralogy/hornfels": { + "family": "metamorphic", + "depth_peak": 24, + "depth_spread": 28, + "weight": 0.75, + "geomes": { + "volcanic_arc": 2, + "mountain_belt": 1.4 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:hornfels" + }, + "mineralogy:rock/mineralogy/quartzite": { + "family": "metamorphic", + "depth_peak": 30, + "depth_spread": 34, + "weight": 0.85, + "geomes": { + "mountain_belt": 1.8, + "stable_craton": 1 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:quartzite" + }, + "mineralogy:rock/mineralogy/novaculite": { + "family": "metamorphic", + "depth_peak": 28, + "depth_spread": 30, + "weight": 0.65, + "geomes": { + "mountain_belt": 1.6 + }, + "enabled": true, + "min_y": 0, + "max_y": 255, + "ore_replaceable": true, + "block": "mineralogy:novaculite" + } + }, + "ores": { + "mineralogy:ore/mineralogy/sulfur_ore": { + "enabled": true, + "source_mod": "mineralogy", + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": 16, + "max_y": 64, + "frequency": 1, + "quantity": 16, + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ], + "host_tags": [ + "forge:stone" + ] + } + }, + "block": "mineralogy:sulfur_ore" + }, + "mineralogy:ore/mineralogy/phosphorous_ore": { + "enabled": true, + "source_mod": "mineralogy", + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": 16, + "max_y": 64, + "frequency": 1, + "quantity": 16, + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ], + "host_tags": [ + "forge:stone" + ] + } + }, + "block": "mineralogy:phosphorous_ore" + }, + "mineralogy:ore/mineralogy/nitrate_ore": { + "enabled": true, + "source_mod": "mineralogy", + "dimensions": { + "minecraft:overworld": { + "enabled": true, + "min_y": 16, + "max_y": 64, + "frequency": 1, + "quantity": 16, + "host_families": [ + "sedimentary", + "metamorphic", + "igneous_intrusive", + "igneous_volcanic" + ], + "host_tags": [ + "forge:stone" + ] + } + }, + "block": "mineralogy:nitrate_ore" + } + }, + "geomes": {}, + "biome_rules": {}, + "terrain_dimensions": {}, + "templates": {} +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json index 276d96d1e..261ae3de0 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_block_polishing.json new file mode 100644 index 000000000..d43fe6c8d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_furnace.json index 4d771d493..53a7cb45f 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/amphibolite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab.json index c16114637..19b3a9c58 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_polishing.json new file mode 100644 index 000000000..01e06b925 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_recombination.json new file mode 100644 index 000000000..39412b21a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "item": "mineralogy:amphibolite_brick_slab" + } + ], + "result": { + "item": "mineralogy:amphibolite_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs.json index 44081145d..d8318982c 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs_polishing.json new file mode 100644 index 000000000..676b1fc22 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall.json index 9f07e2e7c..1ec4997cc 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall_polishing.json new file mode 100644 index 000000000..93026431d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/amphibolite_cobblestone.json index 226d4ef4c..bbee9e384 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/amphibolite" + "tag": "mineralogy:stones/amphibolite" }, { - "tag": "mineralogy:crafting_materials/amphibolite" + "tag": "mineralogy:stones/amphibolite" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json b/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json index 6c07d0292..68351b492 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:amphibolite_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/amphibolite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:amphibolite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/amphibolite_furnace_from_rock.json deleted file mode 100644 index 169ba69ff..000000000 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..cd3eb34fc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_smooth_brick_slab" + }, + { + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slab_recombination.json new file mode 100644 index 000000000..5368ab8fa --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "item": "mineralogy:amphibolite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slabs_to_brick.json new file mode 100644 index 000000000..ef8c52b37 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_stairs_to_brick.json new file mode 100644 index 000000000..b2d21b84d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_walls_to_brick.json new file mode 100644 index 000000000..44b237185 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_polishing.json new file mode 100644 index 000000000..5dbcc5c73 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_recombination.json new file mode 100644 index 000000000..a956c7d16 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_slab" + }, + { + "item": "mineralogy:amphibolite_slab" + } + ], + "result": { + "item": "mineralogy:amphibolite", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slabs_to_brick.json new file mode 100644 index 000000000..d6c288398 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_slab" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_polishing.json new file mode 100644 index 000000000..b9cb6d84f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_to_brick.json new file mode 100644 index 000000000..9e37803bb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_stairs" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_wall_polishing.json new file mode 100644 index 000000000..dcf1c5ab3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_walls_to_brick.json new file mode 100644 index 000000000..941c8a05c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_wall" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_axe.json index abff0c10e..6ad12ea63 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:amphibolite_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:amphibolite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_blank.json index b77ccd656..43ca16f7c 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_cross.json index 00aa76233..64788a340 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hammer.json index 448ff854d..6a5cbf04c 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hoe.json index e915a8ac9..44fafa213 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:amphibolite_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:amphibolite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_horizontal.json index fa82021c0..614be0f46 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_i.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_i.json index df42e373c..6e0ec4f98 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_left.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_left.json index f0ee2f255..b12dfb1a3 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_pickaxe.json index 8f38c6d56..30c933275 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:amphibolite_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:amphibolite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_plus.json index 9d599619e..913995396 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_right.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_right.json index 89525cba1..601a89c4e 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_left" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_left" + }, + { + "item": "mineralogy:amphibolite_relief_left" + } + ], + "result": { + "item": "mineralogy:amphibolite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_sword.json index 1d0d79d68..431f6e59f 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:amphibolite_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:amphibolite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_vertical.json index c2c32cdf9..64432483e 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json b/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json index 2edb866dd..b4f9f5b4a 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite" + } + }, + "result": { + "item": "mineralogy:amphibolite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_slab_from_amphibolite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/amphibolite_slab_from_amphibolite_stonecutting.json deleted file mode 100644 index aa47ac8cb..000000000 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_slab_from_amphibolite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/amphibolite" - }, - "result": "mineralogy:amphibolite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json index 4b7b51689..506473bad 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/amphibolite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:amphibolite_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/amphibolite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick.json index 33958c479..7a2af45cc 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_furnace.json index a5151b36d..f8910747e 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/amphibolite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_slab.json index 40cd9fd46..7adabf4ec 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_stairs.json index 7b30234c9..7013273dc 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_wall.json index 170015dff..559f46077 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_furnace.json index 42e59c558..8d0ec9a71 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/amphibolite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_slab.json index 7efb6bfe5..a3e5e8dcb 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_stairs.json index 2b4a00272..7d98fda0a 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_wall.json index 6a37525e8..663734aa4 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json b/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json index 334079fde..765f21bc0 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite" + } + }, + "result": { + "item": "mineralogy:amphibolite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs_from_amphibolite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/amphibolite_stairs_from_amphibolite_stonecutting.json deleted file mode 100644 index fb25e2da3..000000000 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs_from_amphibolite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/amphibolite" - }, - "result": "mineralogy:amphibolite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json b/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json index 874327c44..c6797de98 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite" + } + }, + "result": { + "item": "mineralogy:amphibolite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_wall_from_amphibolite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/amphibolite_wall_from_amphibolite_stonecutting.json deleted file mode 100644 index a4fdbb202..000000000 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_wall_from_amphibolite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/amphibolite" - }, - "result": "mineralogy:amphibolite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_brick.json index 7a456b1d8..4dd181564 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:andesite" - } - }, - "result": { - "item": "mineralogy:andesite_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite" + } + }, + "result": { + "item": "mineralogy:andesite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_block_polishing.json new file mode 100644 index 000000000..d85746e8d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_furnace.json index f07b5e5ff..edeefe3b5 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:andesite_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/andesite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:andesite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab.json index f2129160e..1632cc350 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_brick" - } - }, - "result": { - "item": "mineralogy:andesite_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_brick" + } + }, + "result": { + "item": "mineralogy:andesite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_polishing.json new file mode 100644 index 000000000..e4a8cf66e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_recombination.json new file mode 100644 index 000000000..eb38d6051 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick_slab" + }, + { + "item": "mineralogy:andesite_brick_slab" + } + ], + "result": { + "item": "mineralogy:andesite_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs.json index a8f960dbf..5cb899a61 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_brick" - } - }, - "result": { - "item": "mineralogy:andesite_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/brick" + } + }, + "result": { + "item": "mineralogy:andesite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs_polishing.json new file mode 100644 index 000000000..7bd553a7d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_wall.json index 60fa256ec..1f2df7387 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_brick" - } - }, - "result": { - "item": "mineralogy:andesite_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/brick" + } + }, + "result": { + "item": "mineralogy:andesite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_wall_polishing.json new file mode 100644 index 000000000..b6def452d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/andesite_cobblestone.json index f424fb525..4a0d8161f 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/andesite" + "tag": "mineralogy:stones/andesite" }, { - "tag": "mineralogy:crafting_materials/andesite" + "tag": "mineralogy:stones/andesite" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/andesite_furnace.json b/src/main/resources/data/mineralogy/recipes/andesite_furnace.json index ff5736e63..b8f6c7d6a 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:andesite_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/andesite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:andesite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/andesite_furnace_from_rock.json deleted file mode 100644 index 04516291a..000000000 --- a/src/main/resources/data/mineralogy/recipes/andesite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/andesite" - } - }, - "result": { - "item": "mineralogy:andesite_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..f6797ea97 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_smooth_brick_slab" + }, + { + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_slab_recombination.json new file mode 100644 index 000000000..e1b0eaef9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_smooth_slab" + }, + { + "item": "mineralogy:andesite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:andesite_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_slabs_to_brick.json new file mode 100644 index 000000000..160f20a8e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_stairs_to_brick.json new file mode 100644 index 000000000..e140835d4 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_walls_to_brick.json new file mode 100644 index 000000000..240b5eec2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_polishing.json new file mode 100644 index 000000000..aca90a73a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_recombination.json new file mode 100644 index 000000000..09b908f9e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_slab" + }, + { + "item": "mineralogy:andesite_slab" + } + ], + "result": { + "item": "mineralogy:andesite", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_slabs_to_brick.json new file mode 100644 index 000000000..44148b3b7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_slab" + } + }, + "result": { + "item": "mineralogy:andesite_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_polishing.json new file mode 100644 index 000000000..c22d3249e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_to_brick.json new file mode 100644 index 000000000..1a3e018c0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_stairs" + } + }, + "result": { + "item": "mineralogy:andesite_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_wall_polishing.json new file mode 100644 index 000000000..5bf3a58c5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_walls_to_brick.json new file mode 100644 index 000000000..7887e321b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_wall" + } + }, + "result": { + "item": "mineralogy:andesite_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_axe.json index bbae33aee..c4e870261 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:andesite_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:andesite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json index 444cc9640..9552bb078 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - } - }, - "result": { - "item": "mineralogy:andesite_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth" + } + }, + "result": { + "item": "mineralogy:andesite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_cross.json index 994303234..b1f91a1f9 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_hammer.json index 2c3784e3f..8caccad41 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_hoe.json index f972e24cb..92ab5e384 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:andesite_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:andesite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_horizontal.json index d927b97f0..dc8ed5435 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_i.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_i.json index 1fcb86ecd..c242db482 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_left.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_left.json index e5553683c..574fd7ae2 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_pickaxe.json index 900e63634..be07b4e67 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:andesite_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:andesite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_plus.json index b526472de..db0ce57fc 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_right.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_right.json index 05bbace35..c58d29389 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_left" - } - }, - "result": { - "item": "mineralogy:andesite_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_left" + }, + { + "item": "mineralogy:andesite_relief_left" + } + ], + "result": { + "item": "mineralogy:andesite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_sword.json index fe1eec8a3..2aae0272b 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:andesite_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:andesite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_vertical.json index c215d568b..b6568f884 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_slab.json b/src/main/resources/data/mineralogy/recipes/andesite_slab.json index b94c0fd64..fe295ce48 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite" - } - }, - "result": { - "item": "mineralogy:andesite_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite" + } + }, + "result": { + "item": "mineralogy:andesite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_slab_from_andesite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/andesite_slab_from_andesite_stonecutting.json deleted file mode 100644 index 6eea5c122..000000000 --- a/src/main/resources/data/mineralogy/recipes/andesite_slab_from_andesite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:andesite" - }, - "result": "mineralogy:andesite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth.json index 11b8fe9b0..4abb67516 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/andesite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:andesite_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/andesite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick.json index 3e0874ff1..8964b5de1 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_furnace.json index bcd8c299b..401cc2283 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/andesite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_slab.json index ebe0bccc3..4164e7b04 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_stairs.json index b74c6ca71..162b1d811 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_wall.json index 4cef22fa1..6f5d0623c 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_furnace.json index 0bd083cf6..728fd720b 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/andesite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab.json index 2b62dd2b2..0eece1401 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json index e0aba3b6a..85c4a2128 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_wall.json index de919e6bd..8de8ca6f4 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_stairs.json index c3dfd930e..1d49219e7 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite" - } - }, - "result": { - "item": "mineralogy:andesite_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite" + } + }, + "result": { + "item": "mineralogy:andesite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_stairs_from_andesite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/andesite_stairs_from_andesite_stonecutting.json deleted file mode 100644 index 780037585..000000000 --- a/src/main/resources/data/mineralogy/recipes/andesite_stairs_from_andesite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:andesite" - }, - "result": "mineralogy:andesite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_wall.json index 188059bcf..332ca18d1 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite" - } - }, - "result": { - "item": "mineralogy:andesite_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite" + } + }, + "result": { + "item": "mineralogy:andesite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_wall_from_andesite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/andesite_wall_from_andesite_stonecutting.json deleted file mode 100644 index 7b724a288..000000000 --- a/src/main/resources/data/mineralogy/recipes/andesite_wall_from_andesite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:andesite" - }, - "result": "mineralogy:andesite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_brick.json index 8fb3833cd..2ee5e5514 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basalt" - } - }, - "result": { - "item": "mineralogy:basalt_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt" + } + }, + "result": { + "item": "mineralogy:basalt_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_block_polishing.json new file mode 100644 index 000000000..832738960 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_furnace.json index af1d81025..e1523700d 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basalt_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basalt/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basalt_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab.json index 8842aaef2..904592a43 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_brick" - } - }, - "result": { - "item": "mineralogy:basalt_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_brick" + } + }, + "result": { + "item": "mineralogy:basalt_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_polishing.json new file mode 100644 index 000000000..46039f079 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_recombination.json new file mode 100644 index 000000000..fe247d251 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick_slab" + }, + { + "item": "mineralogy:basalt_brick_slab" + } + ], + "result": { + "item": "mineralogy:basalt_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs.json index 87febf344..e243450cd 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_brick" - } - }, - "result": { - "item": "mineralogy:basalt_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/brick" + } + }, + "result": { + "item": "mineralogy:basalt_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs_polishing.json new file mode 100644 index 000000000..da098fc06 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_wall.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_wall.json index b493a7826..a23e9d98c 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_brick" - } - }, - "result": { - "item": "mineralogy:basalt_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/brick" + } + }, + "result": { + "item": "mineralogy:basalt_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_wall_polishing.json new file mode 100644 index 000000000..03544181d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_cobblestone.json b/src/main/resources/data/mineralogy/recipes/basalt_cobblestone.json index c71623c52..691b6cb88 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/basalt" + "tag": "mineralogy:stones/basalt" }, { - "tag": "mineralogy:crafting_materials/basalt" + "tag": "mineralogy:stones/basalt" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/basalt_furnace.json b/src/main/resources/data/mineralogy/recipes/basalt_furnace.json index aa576088c..0effcad0a 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basalt_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basalt" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basalt_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/basalt_furnace_from_rock.json deleted file mode 100644 index 66cbbf039..000000000 --- a/src/main/resources/data/mineralogy/recipes/basalt_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basalt" - } - }, - "result": { - "item": "mineralogy:basalt_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_brick_slab_recombination.json new file mode 100644 index 000000000..9ea8abe0c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_smooth_brick_slab" + }, + { + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_slab_recombination.json new file mode 100644 index 000000000..a9dbf7ef6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_smooth_slab" + }, + { + "item": "mineralogy:basalt_smooth_slab" + } + ], + "result": { + "item": "mineralogy:basalt_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_slabs_to_brick.json new file mode 100644 index 000000000..80efdf72a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth_slab" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_stairs_to_brick.json new file mode 100644 index 000000000..6d436d551 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_walls_to_brick.json new file mode 100644 index 000000000..047820316 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth_wall" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_polishing.json new file mode 100644 index 000000000..bd4fdaa08 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_recombination.json new file mode 100644 index 000000000..27d6b2234 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_slab" + }, + { + "item": "mineralogy:basalt_slab" + } + ], + "result": { + "item": "mineralogy:basalt", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_slabs_to_brick.json new file mode 100644 index 000000000..e44f3556c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_slab" + } + }, + "result": { + "item": "mineralogy:basalt_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_polishing.json new file mode 100644 index 000000000..a65de082d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_to_brick.json new file mode 100644 index 000000000..adc0827d9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_stairs" + } + }, + "result": { + "item": "mineralogy:basalt_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_wall_polishing.json new file mode 100644 index 000000000..a63d780d2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_walls_to_brick.json new file mode 100644 index 000000000..ebf8f5695 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_wall" + } + }, + "result": { + "item": "mineralogy:basalt_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_axe.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_axe.json index d2e434080..570250144 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:basalt_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:basalt_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json index c28af0406..8c1172e29 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth" - } - }, - "result": { - "item": "mineralogy:basalt_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth" + } + }, + "result": { + "item": "mineralogy:basalt_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_cross.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_cross.json index 443790480..9b2558080 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_hammer.json index 825caa41f..89dc25287 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_hoe.json index bf3bc58f4..d6977c01d 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:basalt_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:basalt_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_horizontal.json index fd13b3d91..ed2190297 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_i.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_i.json index 195fe87ed..df51160d1 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_left.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_left.json index 4d7f7dc75..e89bd3765 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_pickaxe.json index 339143455..c370a9e4a 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:basalt_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:basalt_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_plus.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_plus.json index 872dfb500..e205af3cb 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_right.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_right.json index 4b17e24c6..f13284bce 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_left" - } - }, - "result": { - "item": "mineralogy:basalt_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_left" + }, + { + "item": "mineralogy:basalt_relief_left" + } + ], + "result": { + "item": "mineralogy:basalt_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_sword.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_sword.json index a2b3cb2f4..3ac649dea 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:basalt_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:basalt_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_vertical.json index af3ce50ec..776f785bd 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_slab.json index 3ccdb0d80..bd04f195c 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basalt" - } - }, - "result": { - "item": "mineralogy:basalt_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt" + } + }, + "result": { + "item": "mineralogy:basalt_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_slab_from_basalt_stonecutting.json b/src/main/resources/data/mineralogy/recipes/basalt_slab_from_basalt_stonecutting.json deleted file mode 100644 index 2c37fcfb3..000000000 --- a/src/main/resources/data/mineralogy/recipes/basalt_slab_from_basalt_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/basalt" - }, - "result": "mineralogy:basalt_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth.json index 200e03385..877de7157 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/basalt" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:basalt_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/basalt" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick.json index 086da93fb..a2f956861 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_furnace.json index d0ae2c34d..078c1853b 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basalt/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_slab.json index a4de0864d..3904ddaee 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth_brick" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth_brick" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_stairs.json index 66ae4e2b7..b4370c4ab 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth_brick" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth_brick" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_wall.json index e252641c7..cb92d878e 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth_brick" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth_brick" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_furnace.json index 9cd6cd7a2..8db07d00e 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basalt/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json index 04041d057..6c65e6072 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_stairs.json index df59ba68b..9a6d59e74 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_wall.json index 7fe7c5904..aebaebe9a 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_stairs.json b/src/main/resources/data/mineralogy/recipes/basalt_stairs.json index 6a105c5d0..0873978b6 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basalt" - } - }, - "result": { - "item": "mineralogy:basalt_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt" + } + }, + "result": { + "item": "mineralogy:basalt_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_stairs_from_basalt_stonecutting.json b/src/main/resources/data/mineralogy/recipes/basalt_stairs_from_basalt_stonecutting.json deleted file mode 100644 index 705eb00d4..000000000 --- a/src/main/resources/data/mineralogy/recipes/basalt_stairs_from_basalt_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/basalt" - }, - "result": "mineralogy:basalt_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_wall.json b/src/main/resources/data/mineralogy/recipes/basalt_wall.json index 939a01227..f24c30d9c 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basalt" - } - }, - "result": { - "item": "mineralogy:basalt_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt" + } + }, + "result": { + "item": "mineralogy:basalt_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_wall_from_basalt_stonecutting.json b/src/main/resources/data/mineralogy/recipes/basalt_wall_from_basalt_stonecutting.json deleted file mode 100644 index 1fa5ce507..000000000 --- a/src/main/resources/data/mineralogy/recipes/basalt_wall_from_basalt_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/basalt" - }, - "result": "mineralogy:basalt_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick.json index 62ce63fbc..303f39757 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_block_polishing.json new file mode 100644 index 000000000..1f70d30ef --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_furnace.json index 00d09c1a7..f2d32c981 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basaltic_glass/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab.json index 6c2425202..b1741a0a1 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_polishing.json new file mode 100644 index 000000000..e1e28152e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_recombination.json new file mode 100644 index 000000000..cb05ca44f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "item": "mineralogy:basaltic_glass_brick_slab" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs.json index 5a4cedb37..bd2088a2a 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs_polishing.json new file mode 100644 index 000000000..3b82bf8d8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall.json index fd964d4fd..349948f1e 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall_polishing.json new file mode 100644 index 000000000..d97011678 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_cobblestone.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_cobblestone.json index bc53334de..6f1cdbffd 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/basaltic_glass" + "tag": "mineralogy:stones/basaltic_glass" }, { - "tag": "mineralogy:crafting_materials/basaltic_glass" + "tag": "mineralogy:stones/basaltic_glass" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace.json index 8878131ce..2513211f5 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basaltic_glass" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace_from_rock.json deleted file mode 100644 index 73891a30f..000000000 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_brick_slab_recombination.json new file mode 100644 index 000000000..85f986593 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + }, + { + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slab_recombination.json new file mode 100644 index 000000000..077fbfa3d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slabs_to_brick.json new file mode 100644 index 000000000..984878919 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth_slab" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_stairs_to_brick.json new file mode 100644 index 000000000..8d16e7390 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_walls_to_brick.json new file mode 100644 index 000000000..98c219b9c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth_wall" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_polishing.json new file mode 100644 index 000000000..75e41fe16 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_recombination.json new file mode 100644 index 000000000..245eee46a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_slab" + }, + { + "item": "mineralogy:basaltic_glass_slab" + } + ], + "result": { + "item": "mineralogy:basaltic_glass", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slabs_to_brick.json new file mode 100644 index 000000000..27db58c2a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_slab" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_polishing.json new file mode 100644 index 000000000..475d79002 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_to_brick.json new file mode 100644 index 000000000..43cf999a6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_stairs" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_wall_polishing.json new file mode 100644 index 000000000..ce1ae073d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_walls_to_brick.json new file mode 100644 index 000000000..fa562dde6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_wall" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_axe.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_axe.json index 4a7204994..28fd8e580 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:basaltic_glass_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_blank.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_blank.json index 1430eda6e..3ad5db5c3 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_cross.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_cross.json index 2e9d20319..ae88787ec 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hammer.json index d8b238198..e65a906df 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hoe.json index 9c1dce487..ede80601f 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:basaltic_glass_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_horizontal.json index fea53fb53..32ef937f1 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_i.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_i.json index 9e60d4b2b..4942c4c25 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_left.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_left.json index c8dd3100e..569a7849d 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_pickaxe.json index a779d3d16..3aa1ec288 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:basaltic_glass_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_plus.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_plus.json index 8c0b09720..d6f7164f4 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_right.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_right.json index e4af5aa6a..96f981bf1 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_left" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_left" + }, + { + "item": "mineralogy:basaltic_glass_relief_left" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_sword.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_sword.json index a24a1bd19..4c042a2f5 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:basaltic_glass_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_vertical.json index 8572d39f0..63b9279d5 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab.json index 00f505789..ec190e359 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab_from_basaltic_glass_stonecutting.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab_from_basaltic_glass_stonecutting.json deleted file mode 100644 index 2bf2d06e4..000000000 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab_from_basaltic_glass_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - }, - "result": "mineralogy:basaltic_glass_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth.json index e8301e233..e6873839a 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/basaltic_glass" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/basaltic_glass" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick.json index 7eb07841c..3c8c40d95 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_furnace.json index 005f3df06..af3ba1ce9 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basaltic_glass/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_slab.json index 8aecdf8ce..e9037e01e 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth_brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_stairs.json index e7f2999d4..3712797b2 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth_brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_wall.json index a9ae65645..7129280af 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth_brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_furnace.json index 23b9b0e6e..23f010fdd 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basaltic_glass/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_slab.json index 2e2ef55af..007217857 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_stairs.json index b7f65e6d8..bac8c3a25 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_wall.json index 8ccd29249..e785b4bcf 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs.json index 06d6a8290..35a1573c8 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs_from_basaltic_glass_stonecutting.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs_from_basaltic_glass_stonecutting.json deleted file mode 100644 index 8e4c3a7fa..000000000 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs_from_basaltic_glass_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - }, - "result": "mineralogy:basaltic_glass_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall.json index 7a23a41c3..a46fed2ad 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall_from_basaltic_glass_stonecutting.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall_from_basaltic_glass_stonecutting.json deleted file mode 100644 index af60d8a83..000000000 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall_from_basaltic_glass_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/basaltic_glass" - }, - "result": "mineralogy:basaltic_glass_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/chalk.json b/src/main/resources/data/mineralogy/recipes/chalk.json index 044bb0a1b..3bd8ad215 100644 --- a/src/main/resources/data/mineralogy/recipes/chalk.json +++ b/src/main/resources/data/mineralogy/recipes/chalk.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:chalk" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -10,6 +16,7 @@ } }, "result": { - "item": "mineralogy:chalk" + "item": "mineralogy:chalk", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/chalk_dust.json b/src/main/resources/data/mineralogy/recipes/chalk_dust.json index 359bbe768..bdfdcd818 100644 --- a/src/main/resources/data/mineralogy/recipes/chalk_dust.json +++ b/src/main/resources/data/mineralogy/recipes/chalk_dust.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:chalk_dust" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { diff --git a/src/main/resources/data/mineralogy/recipes/cobblestone.json b/src/main/resources/data/mineralogy/recipes/cobblestone.json index 63f7df18c..afdad0426 100644 --- a/src/main/resources/data/mineralogy/recipes/cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/cobblestone.json @@ -1,4 +1,5 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json index f1c1cb1ed..dd1e961fb 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_block_polishing.json new file mode 100644 index 000000000..f86f0fc62 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_furnace.json index 0ab969abb..cec13700e 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/conglomerate/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab.json index d6a832254..f2ef5efd7 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_polishing.json new file mode 100644 index 000000000..925d54d9a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_recombination.json new file mode 100644 index 000000000..52d810124 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "item": "mineralogy:conglomerate_brick_slab" + } + ], + "result": { + "item": "mineralogy:conglomerate_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs.json index e6313fc1d..be41bc085 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs_polishing.json new file mode 100644 index 000000000..a9b693733 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall.json index bfb5163be..b2316129b 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall_polishing.json new file mode 100644 index 000000000..dad96be7d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_cobblestone.json b/src/main/resources/data/mineralogy/recipes/conglomerate_cobblestone.json index c20bcce5a..416cd52cc 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/conglomerate" + "tag": "mineralogy:stones/conglomerate" }, { - "tag": "mineralogy:crafting_materials/conglomerate" + "tag": "mineralogy:stones/conglomerate" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json b/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json index 449e15262..1a517d6b3 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:conglomerate_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/conglomerate" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:conglomerate_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/conglomerate_furnace_from_rock.json deleted file mode 100644 index aa29e6672..000000000 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_brick_slab_recombination.json new file mode 100644 index 000000000..8137ac557 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_smooth_brick_slab" + }, + { + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slab_recombination.json new file mode 100644 index 000000000..d72ca2df0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "item": "mineralogy:conglomerate_smooth_slab" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slabs_to_brick.json new file mode 100644 index 000000000..b9409a906 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth_slab" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_stairs_to_brick.json new file mode 100644 index 000000000..0abed2a0d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_walls_to_brick.json new file mode 100644 index 000000000..1fb272df5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth_wall" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_polishing.json new file mode 100644 index 000000000..6b063844e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_recombination.json new file mode 100644 index 000000000..830c106cc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_slab" + }, + { + "item": "mineralogy:conglomerate_slab" + } + ], + "result": { + "item": "mineralogy:conglomerate", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slabs_to_brick.json new file mode 100644 index 000000000..4967292db --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_slab" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_polishing.json new file mode 100644 index 000000000..65c67f427 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_to_brick.json new file mode 100644 index 000000000..c9b073f0c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_stairs" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_wall_polishing.json new file mode 100644 index 000000000..fa10dc161 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_walls_to_brick.json new file mode 100644 index 000000000..355a0918d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_wall" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_axe.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_axe.json index b5691bc76..c89436878 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:conglomerate_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:conglomerate_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_blank.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_blank.json index bae9ab0fd..0374f1a16 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_cross.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_cross.json index 9d96f065b..0de596085 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hammer.json index 31a94aed7..a5680c5e1 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hoe.json index f64a56c34..332a7e9c0 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:conglomerate_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:conglomerate_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_horizontal.json index b386f69c2..b3e7a1ef6 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_i.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_i.json index 786987036..ab5468bb2 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_left.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_left.json index 184f7a790..6e37f6209 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_pickaxe.json index 6d1693000..fe18adbe5 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:conglomerate_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:conglomerate_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_plus.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_plus.json index 641c63499..30a38abeb 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_right.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_right.json index 3201a868a..78e68f288 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_left" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_left" + }, + { + "item": "mineralogy:conglomerate_relief_left" + } + ], + "result": { + "item": "mineralogy:conglomerate_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_sword.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_sword.json index ca521b0f9..c5c3d0f4e 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:conglomerate_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:conglomerate_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_vertical.json index d1f2fe952..3100433ee 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json b/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json index 64903ddbe..ad6e150d9 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate" + } + }, + "result": { + "item": "mineralogy:conglomerate_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_slab_from_conglomerate_stonecutting.json b/src/main/resources/data/mineralogy/recipes/conglomerate_slab_from_conglomerate_stonecutting.json deleted file mode 100644 index b4547e014..000000000 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_slab_from_conglomerate_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/conglomerate" - }, - "result": "mineralogy:conglomerate_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json index 8a315915f..e8bfb17cc 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/conglomerate" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:conglomerate_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/conglomerate" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick.json index 39c7b96d8..0e3b0ee47 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_furnace.json index 14a281df6..74d35cab8 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/conglomerate/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_slab.json index a5eb77a3a..bed71c7a1 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth_brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_stairs.json index 5a1b993b1..69c2b5e47 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth_brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_wall.json index de9508085..3671ee17d 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth_brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_furnace.json index 3a6cf18cc..0732b4a46 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/conglomerate/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_slab.json index 1d1ff7424..8ce6bc00b 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_stairs.json index e06382af1..009ff9048 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_wall.json index a287930af..9eb179eca 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json b/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json index 31e71d05f..14ab18f2f 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate" + } + }, + "result": { + "item": "mineralogy:conglomerate_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs_from_conglomerate_stonecutting.json b/src/main/resources/data/mineralogy/recipes/conglomerate_stairs_from_conglomerate_stonecutting.json deleted file mode 100644 index ee54c05f8..000000000 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs_from_conglomerate_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/conglomerate" - }, - "result": "mineralogy:conglomerate_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json b/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json index 9486d0fa2..49acde432 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate" + } + }, + "result": { + "item": "mineralogy:conglomerate_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_wall_from_conglomerate_stonecutting.json b/src/main/resources/data/mineralogy/recipes/conglomerate_wall_from_conglomerate_stonecutting.json deleted file mode 100644 index 701179c21..000000000 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_wall_from_conglomerate_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/conglomerate" - }, - "result": "mineralogy:conglomerate_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_brick.json index 90fd9fc67..bdb956b1c 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/diabase" - } - }, - "result": { - "item": "mineralogy:diabase_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase" + } + }, + "result": { + "item": "mineralogy:diabase_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_block_polishing.json new file mode 100644 index 000000000..849f63f05 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_furnace.json index adf8c3ef1..8cca7a4f8 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diabase_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diabase/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diabase_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab.json index b16a2c4af..6470b1aec 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_brick" - } - }, - "result": { - "item": "mineralogy:diabase_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_brick" + } + }, + "result": { + "item": "mineralogy:diabase_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_polishing.json new file mode 100644 index 000000000..9dcc8f721 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_recombination.json new file mode 100644 index 000000000..f4d169557 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick_slab" + }, + { + "item": "mineralogy:diabase_brick_slab" + } + ], + "result": { + "item": "mineralogy:diabase_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs.json index a8a8ba8ca..16de67711 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_brick" - } - }, - "result": { - "item": "mineralogy:diabase_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/brick" + } + }, + "result": { + "item": "mineralogy:diabase_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs_polishing.json new file mode 100644 index 000000000..1f06e6c19 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_wall.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_wall.json index 6f5860ab2..4a7939477 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_brick" - } - }, - "result": { - "item": "mineralogy:diabase_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/brick" + } + }, + "result": { + "item": "mineralogy:diabase_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_wall_polishing.json new file mode 100644 index 000000000..e0f38ad07 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_cobblestone.json b/src/main/resources/data/mineralogy/recipes/diabase_cobblestone.json index 86e0f2ca3..854dd8c2d 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/diabase" + "tag": "mineralogy:stones/diabase" }, { - "tag": "mineralogy:crafting_materials/diabase" + "tag": "mineralogy:stones/diabase" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/diabase_furnace.json b/src/main/resources/data/mineralogy/recipes/diabase_furnace.json index 7abfdfbb0..e5625c81a 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diabase_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diabase" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diabase_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/diabase_furnace_from_rock.json deleted file mode 100644 index 8716b9c39..000000000 --- a/src/main/resources/data/mineralogy/recipes/diabase_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/diabase" - } - }, - "result": { - "item": "mineralogy:diabase_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_brick_slab_recombination.json new file mode 100644 index 000000000..f6cd77f9e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_smooth_brick_slab" + }, + { + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_slab_recombination.json new file mode 100644 index 000000000..fe9763bb0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_smooth_slab" + }, + { + "item": "mineralogy:diabase_smooth_slab" + } + ], + "result": { + "item": "mineralogy:diabase_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_slabs_to_brick.json new file mode 100644 index 000000000..2cbc14c73 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth_slab" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_stairs_to_brick.json new file mode 100644 index 000000000..c2de91be7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_walls_to_brick.json new file mode 100644 index 000000000..174aecb2f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth_wall" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_polishing.json new file mode 100644 index 000000000..9795a2e16 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_recombination.json new file mode 100644 index 000000000..99bdaf5f3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_slab" + }, + { + "item": "mineralogy:diabase_slab" + } + ], + "result": { + "item": "mineralogy:diabase", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_slabs_to_brick.json new file mode 100644 index 000000000..6cbb22080 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_slab" + } + }, + "result": { + "item": "mineralogy:diabase_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_polishing.json new file mode 100644 index 000000000..979b46b69 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_to_brick.json new file mode 100644 index 000000000..427d043df --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_stairs" + } + }, + "result": { + "item": "mineralogy:diabase_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_wall_polishing.json new file mode 100644 index 000000000..9605c1b04 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_walls_to_brick.json new file mode 100644 index 000000000..c6defb4de --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_wall" + } + }, + "result": { + "item": "mineralogy:diabase_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_axe.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_axe.json index 1afd6ebf9..7c1219a6d 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:diabase_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:diabase_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_blank.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_blank.json index a9e69fbf2..83e2eb9ff 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - } - }, - "result": { - "item": "mineralogy:diabase_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth" + } + }, + "result": { + "item": "mineralogy:diabase_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_cross.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_cross.json index 17f29da31..7b1f00085 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_hammer.json index cfdb628b1..e4c85690f 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_hoe.json index 445da48ff..054f84569 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:diabase_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:diabase_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_horizontal.json index 1e974ffaf..414e2598e 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_i.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_i.json index afe5f8da3..9851e859d 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_left.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_left.json index eca7f8cf7..6e9c5ff01 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_pickaxe.json index e4aed98c8..551b44771 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:diabase_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:diabase_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_plus.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_plus.json index 45b70a6f9..bed057484 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_right.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_right.json index b40fed0be..80a01258c 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_left" - } - }, - "result": { - "item": "mineralogy:diabase_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_left" + }, + { + "item": "mineralogy:diabase_relief_left" + } + ], + "result": { + "item": "mineralogy:diabase_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_sword.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_sword.json index 93b491f6d..3f2c3da2e 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:diabase_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:diabase_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_vertical.json index be9ce321c..aa08d66bf 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_slab.json b/src/main/resources/data/mineralogy/recipes/diabase_slab.json index 0691e00c4..b8c950396 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/diabase" - } - }, - "result": { - "item": "mineralogy:diabase_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase" + } + }, + "result": { + "item": "mineralogy:diabase_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_slab_from_diabase_stonecutting.json b/src/main/resources/data/mineralogy/recipes/diabase_slab_from_diabase_stonecutting.json deleted file mode 100644 index 563bd6a69..000000000 --- a/src/main/resources/data/mineralogy/recipes/diabase_slab_from_diabase_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/diabase" - }, - "result": "mineralogy:diabase_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth.json index 9ca764a92..875e7b4f0 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/diabase" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:diabase_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/diabase" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick.json index 09f81cf6c..a36893e95 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_furnace.json index 3cf3ca4b1..127e833f6 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diabase/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_slab.json index a0b645054..705ee1101 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth_brick" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth_brick" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_stairs.json index 980de2c62..368c8f904 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth_brick" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth_brick" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_wall.json index 9abfd973f..71c640a38 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth_brick" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth_brick" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_furnace.json index 5ee754201..4041bc684 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diabase/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_slab.json index aca6ce061..f2525ad8d 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_stairs.json index ecaec3787..7f99ae7d7 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_wall.json index b9828127f..f0293dd2f 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_stairs.json b/src/main/resources/data/mineralogy/recipes/diabase_stairs.json index aaf4461d3..c0db19828 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/diabase" - } - }, - "result": { - "item": "mineralogy:diabase_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase" + } + }, + "result": { + "item": "mineralogy:diabase_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_stairs_from_diabase_stonecutting.json b/src/main/resources/data/mineralogy/recipes/diabase_stairs_from_diabase_stonecutting.json deleted file mode 100644 index c6453235b..000000000 --- a/src/main/resources/data/mineralogy/recipes/diabase_stairs_from_diabase_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/diabase" - }, - "result": "mineralogy:diabase_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_wall.json b/src/main/resources/data/mineralogy/recipes/diabase_wall.json index 2d1fd5f27..bb53fb526 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/diabase" - } - }, - "result": { - "item": "mineralogy:diabase_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase" + } + }, + "result": { + "item": "mineralogy:diabase_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_wall_from_diabase_stonecutting.json b/src/main/resources/data/mineralogy/recipes/diabase_wall_from_diabase_stonecutting.json deleted file mode 100644 index 2993e06e0..000000000 --- a/src/main/resources/data/mineralogy/recipes/diabase_wall_from_diabase_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/diabase" - }, - "result": "mineralogy:diabase_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_brick.json index 6a41cba4b..c5159fd7a 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diorite" - } - }, - "result": { - "item": "mineralogy:diorite_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite" + } + }, + "result": { + "item": "mineralogy:diorite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_block_polishing.json new file mode 100644 index 000000000..5ad0d1c88 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_furnace.json index 8eac164cd..0cd1da19d 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diorite_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diorite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diorite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab.json index 1d5ac5349..a213b06e1 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_brick" - } - }, - "result": { - "item": "mineralogy:diorite_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_brick" + } + }, + "result": { + "item": "mineralogy:diorite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_polishing.json new file mode 100644 index 000000000..9febaf202 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_recombination.json new file mode 100644 index 000000000..7d585ea15 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick_slab" + }, + { + "item": "mineralogy:diorite_brick_slab" + } + ], + "result": { + "item": "mineralogy:diorite_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs.json index 12cf5a755..8fd1905c0 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_brick" - } - }, - "result": { - "item": "mineralogy:diorite_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/brick" + } + }, + "result": { + "item": "mineralogy:diorite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs_polishing.json new file mode 100644 index 000000000..a0db93bc6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_wall.json index e7b7b4d19..ddbf530fa 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_brick" - } - }, - "result": { - "item": "mineralogy:diorite_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/brick" + } + }, + "result": { + "item": "mineralogy:diorite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_wall_polishing.json new file mode 100644 index 000000000..27f2511e3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/diorite_cobblestone.json index f8c6127c1..fd07f1731 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/diorite" + "tag": "mineralogy:stones/diorite" }, { - "tag": "mineralogy:crafting_materials/diorite" + "tag": "mineralogy:stones/diorite" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/diorite_furnace.json b/src/main/resources/data/mineralogy/recipes/diorite_furnace.json index 2a5c42c70..3a48d90a1 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diorite_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diorite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diorite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/diorite_furnace_from_rock.json deleted file mode 100644 index 644869ec8..000000000 --- a/src/main/resources/data/mineralogy/recipes/diorite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/diorite" - } - }, - "result": { - "item": "mineralogy:diorite_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..91f4ab1e7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_smooth_brick_slab" + }, + { + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_slab_recombination.json new file mode 100644 index 000000000..adf7fe66f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_smooth_slab" + }, + { + "item": "mineralogy:diorite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:diorite_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_slabs_to_brick.json new file mode 100644 index 000000000..d834f31f4 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_stairs_to_brick.json new file mode 100644 index 000000000..076b48e2f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_walls_to_brick.json new file mode 100644 index 000000000..853816620 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_polishing.json new file mode 100644 index 000000000..47f1239ee --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_recombination.json new file mode 100644 index 000000000..61f9d7090 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_slab" + }, + { + "item": "mineralogy:diorite_slab" + } + ], + "result": { + "item": "mineralogy:diorite", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_slabs_to_brick.json new file mode 100644 index 000000000..fa2a95a2b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_slab" + } + }, + "result": { + "item": "mineralogy:diorite_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_polishing.json new file mode 100644 index 000000000..9ac42f2ea --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_to_brick.json new file mode 100644 index 000000000..859f50a5f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_stairs" + } + }, + "result": { + "item": "mineralogy:diorite_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_wall_polishing.json new file mode 100644 index 000000000..905ae9afe --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_walls_to_brick.json new file mode 100644 index 000000000..19064b1e7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_wall" + } + }, + "result": { + "item": "mineralogy:diorite_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_axe.json index aaf4e7cbb..3998f53c5 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:diorite_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:diorite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json index 2e804a8d9..4bb9b167e 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - } - }, - "result": { - "item": "mineralogy:diorite_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth" + } + }, + "result": { + "item": "mineralogy:diorite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_cross.json index 8434dcad3..ec02c635c 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_hammer.json index d83dfec5b..f734e1f7d 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_hoe.json index f11a5c6cc..65f18aeac 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:diorite_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:diorite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_horizontal.json index d94fce255..78fbb5330 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_i.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_i.json index 0529d33f7..8df5652b5 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_left.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_left.json index f1f8afe11..a3d0d88fb 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_pickaxe.json index da597b39e..b22dfddb9 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:diorite_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:diorite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_plus.json index 80539df14..f18eb5cee 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_right.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_right.json index 36ea805f3..048e708c2 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_left" - } - }, - "result": { - "item": "mineralogy:diorite_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_left" + }, + { + "item": "mineralogy:diorite_relief_left" + } + ], + "result": { + "item": "mineralogy:diorite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_sword.json index bda59de8e..3fe517023 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:diorite_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:diorite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_vertical.json index e9dcabfa6..c21165bfa 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_slab.json b/src/main/resources/data/mineralogy/recipes/diorite_slab.json index 5a8d1a59e..44cfe3d6e 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite" - } - }, - "result": { - "item": "mineralogy:diorite_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite" + } + }, + "result": { + "item": "mineralogy:diorite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_slab_from_diorite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/diorite_slab_from_diorite_stonecutting.json deleted file mode 100644 index 1157fbad9..000000000 --- a/src/main/resources/data/mineralogy/recipes/diorite_slab_from_diorite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:diorite" - }, - "result": "mineralogy:diorite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth.json index fd3d61590..e982dc9e9 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/diorite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:diorite_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/diorite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick.json index fcd2dccf5..0e5e72095 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_furnace.json index ce67f1747..084e4e851 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diorite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_slab.json index 1c8e3ef22..41a69e455 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_stairs.json index 7b14b3928..f5c189da9 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_wall.json index 55d6a67cb..0c612e43f 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_furnace.json index d624cf381..badd330ec 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diorite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab.json index f25a14fb0..19ea3e8a5 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json index 91ae97173..d4565244f 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_wall.json index d7e5b2cd8..e5fb7a810 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_stairs.json index 81724bbd6..cff9b0256 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite" - } - }, - "result": { - "item": "mineralogy:diorite_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite" + } + }, + "result": { + "item": "mineralogy:diorite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_stairs_from_diorite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/diorite_stairs_from_diorite_stonecutting.json deleted file mode 100644 index fa523c7d7..000000000 --- a/src/main/resources/data/mineralogy/recipes/diorite_stairs_from_diorite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:diorite" - }, - "result": "mineralogy:diorite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_wall.json index 567be8198..69df6abe9 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite" - } - }, - "result": { - "item": "mineralogy:diorite_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite" + } + }, + "result": { + "item": "mineralogy:diorite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_wall_from_diorite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/diorite_wall_from_diorite_stonecutting.json deleted file mode 100644 index 2993dd121..000000000 --- a/src/main/resources/data/mineralogy/recipes/diorite_wall_from_diorite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:diorite" - }, - "result": "mineralogy:diorite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick.json index be0d05ec2..63ccc6f0e 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite" + } + }, + "result": { + "item": "mineralogy:dolomite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_block_polishing.json new file mode 100644 index 000000000..f774d6afb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_furnace.json index aff892105..bb36b7a59 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/dolomite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab.json index 18a5d6876..9ac81d406 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_brick" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_polishing.json new file mode 100644 index 000000000..feab3aa3d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_recombination.json new file mode 100644 index 000000000..336658ace --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick_slab" + }, + { + "item": "mineralogy:dolomite_brick_slab" + } + ], + "result": { + "item": "mineralogy:dolomite_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs.json index 3824747be..4f9e0b9f5 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/brick" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs_polishing.json new file mode 100644 index 000000000..648b5ec95 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall.json index b03d9c4fa..c1823181f 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/brick" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall_polishing.json new file mode 100644 index 000000000..77e638c2f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/dolomite_cobblestone.json index 6ab3a4c35..e898b56ed 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/dolomite" + "tag": "mineralogy:stones/dolomite" }, { - "tag": "mineralogy:crafting_materials/dolomite" + "tag": "mineralogy:stones/dolomite" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json b/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json index 594d1a822..58ea4cbb4 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:dolomite_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/dolomite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:dolomite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/dolomite_furnace_from_rock.json deleted file mode 100644 index 326fbb07d..000000000 --- a/src/main/resources/data/mineralogy/recipes/dolomite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..59e77183f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_smooth_brick_slab" + }, + { + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_slab_recombination.json new file mode 100644 index 000000000..0adf7e650 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "item": "mineralogy:dolomite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_slabs_to_brick.json new file mode 100644 index 000000000..4007116f9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_stairs_to_brick.json new file mode 100644 index 000000000..a3a9339e5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_walls_to_brick.json new file mode 100644 index 000000000..5507e6ff9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_polishing.json new file mode 100644 index 000000000..e45eaf249 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_recombination.json new file mode 100644 index 000000000..aaac80236 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_slab" + }, + { + "item": "mineralogy:dolomite_slab" + } + ], + "result": { + "item": "mineralogy:dolomite", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slabs_to_brick.json new file mode 100644 index 000000000..9e980f6d4 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_slab" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_polishing.json new file mode 100644 index 000000000..44ebb2a66 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_to_brick.json new file mode 100644 index 000000000..cb30c66a6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_stairs" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_wall_polishing.json new file mode 100644 index 000000000..99e06c573 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_walls_to_brick.json new file mode 100644 index 000000000..b2ab92101 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_wall" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_axe.json index e156f7544..dd42e53ab 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:dolomite_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:dolomite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_blank.json index e3e65cd9d..09dc11264 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_cross.json index 0f9f5125d..1ea9222f0 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_hammer.json index 9fbef9bed..41d3a001d 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_hoe.json index 4fde0f972..a30270691 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:dolomite_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:dolomite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_horizontal.json index 9f8b619fd..45a5fd14c 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_i.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_i.json index 3ce66b0cb..4d1ed3658 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_left.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_left.json index 5860e5a53..bd8b811e1 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_pickaxe.json index 711fee4de..5c918c389 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:dolomite_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:dolomite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_plus.json index fe75cd5f5..2609feccd 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_right.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_right.json index 815b6af29..b4dc36354 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_left" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_left" + }, + { + "item": "mineralogy:dolomite_relief_left" + } + ], + "result": { + "item": "mineralogy:dolomite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_sword.json index dcd717df1..3f6229211 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:dolomite_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:dolomite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_vertical.json index 537f29da9..329ac9ae1 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_slab.json b/src/main/resources/data/mineralogy/recipes/dolomite_slab.json index ee597099e..b6a5dfd6a 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite" + } + }, + "result": { + "item": "mineralogy:dolomite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_slab_from_dolomite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/dolomite_slab_from_dolomite_stonecutting.json deleted file mode 100644 index 4c8c62532..000000000 --- a/src/main/resources/data/mineralogy/recipes/dolomite_slab_from_dolomite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/dolomite" - }, - "result": "mineralogy:dolomite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json index 213e2fea3..9d93d4121 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/dolomite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:dolomite_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/dolomite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick.json index c144d7f5d..923cb7ff7 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_furnace.json index 2b9c9cf92..620b23347 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/dolomite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_slab.json index b8aa5ce3f..7a5dc1fa4 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_stairs.json index a061403f8..f34bfcb34 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_wall.json index 7d0d0f113..ba39a4dd2 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_furnace.json index 7e9ffcefc..15ddf9b6e 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/dolomite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_slab.json index dfc759213..d61a822d7 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_stairs.json index d0136ebd9..9cc2b25e1 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_wall.json index 2880fe08a..fddf6d27e 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json b/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json index a18a60bee..92cbcd26f 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite" + } + }, + "result": { + "item": "mineralogy:dolomite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_stairs_from_dolomite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/dolomite_stairs_from_dolomite_stonecutting.json deleted file mode 100644 index 48fddadd1..000000000 --- a/src/main/resources/data/mineralogy/recipes/dolomite_stairs_from_dolomite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/dolomite" - }, - "result": "mineralogy:dolomite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_wall.json b/src/main/resources/data/mineralogy/recipes/dolomite_wall.json index a717d76c9..1a1e383db 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite" + } + }, + "result": { + "item": "mineralogy:dolomite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_wall_from_dolomite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/dolomite_wall_from_dolomite_stonecutting.json deleted file mode 100644 index 6144fe20e..000000000 --- a/src/main/resources/data/mineralogy/recipes/dolomite_wall_from_dolomite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/dolomite" - }, - "result": "mineralogy:dolomite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/drywall.json b/src/main/resources/data/mineralogy/recipes/drywall.json index 891fec107..7027c0062 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall.json +++ b/src/main/resources/data/mineralogy/recipes/drywall.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "pgp", @@ -7,7 +17,7 @@ ], "key": { "p": { - "item": "minecraft:paper" + "tag": "forge:paper" }, "g": { "tag": "forge:dusts/gypsum" diff --git a/src/main/resources/data/mineralogy/recipes/drywall_black.json b/src/main/resources/data/mineralogy/recipes/drywall_black.json index 717b3c46f..62f154c01 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_black.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_black.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_black" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/black" + "item": "minecraft:ink_sac" } ], "result": { - "item": "mineralogy:drywall_black" + "item": "mineralogy:drywall_black", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_blue.json b/src/main/resources/data/mineralogy/recipes/drywall_blue.json index e4a7cc07f..934629e38 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_blue.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_blue.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_blue" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/blue" + "item": "minecraft:lapis_lazuli" } ], "result": { - "item": "mineralogy:drywall_blue" + "item": "mineralogy:drywall_blue", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_brown.json b/src/main/resources/data/mineralogy/recipes/drywall_brown.json index 111246dbd..2336dae4a 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_brown.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_brown.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_brown" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/brown" + "item": "minecraft:cocoa_beans" } ], "result": { - "item": "mineralogy:drywall_brown" + "item": "mineralogy:drywall_brown", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_cyan.json b/src/main/resources/data/mineralogy/recipes/drywall_cyan.json index ca1b58dd1..7f08bbb7c 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_cyan.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_cyan.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_cyan" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/cyan" + "item": "minecraft:cyan_dye" } ], "result": { - "item": "mineralogy:drywall_cyan" + "item": "mineralogy:drywall_cyan", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_gray.json b/src/main/resources/data/mineralogy/recipes/drywall_gray.json index 637180196..9d58d6bc3 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_gray.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_gray.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_gray" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/gray" + "item": "minecraft:gray_dye" } ], "result": { - "item": "mineralogy:drywall_gray" + "item": "mineralogy:drywall_gray", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_green.json b/src/main/resources/data/mineralogy/recipes/drywall_green.json index 32aaada88..2501994a6 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_green.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_green.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_green" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/green" + "item": "minecraft:green_dye" } ], "result": { - "item": "mineralogy:drywall_green" + "item": "mineralogy:drywall_green", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_light_blue.json b/src/main/resources/data/mineralogy/recipes/drywall_light_blue.json index 59ab14314..ceb3866c1 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_light_blue.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_light_blue.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_light_blue" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/light_blue" + "item": "minecraft:light_blue_dye" } ], "result": { - "item": "mineralogy:drywall_light_blue" + "item": "mineralogy:drywall_light_blue", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_lime.json b/src/main/resources/data/mineralogy/recipes/drywall_lime.json index a55bfdf4f..00604dee2 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_lime.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_lime.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_lime" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/lime" + "item": "minecraft:lime_dye" } ], "result": { - "item": "mineralogy:drywall_lime" + "item": "mineralogy:drywall_lime", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_magenta.json b/src/main/resources/data/mineralogy/recipes/drywall_magenta.json index fbad8987b..fca1b4b01 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_magenta.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_magenta.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_magenta" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/magenta" + "item": "minecraft:magenta_dye" } ], "result": { - "item": "mineralogy:drywall_magenta" + "item": "mineralogy:drywall_magenta", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_orange.json b/src/main/resources/data/mineralogy/recipes/drywall_orange.json index 95d1de8f8..7535200ef 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_orange.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_orange.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_orange" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/orange" + "item": "minecraft:orange_dye" } ], "result": { - "item": "mineralogy:drywall_orange" + "item": "mineralogy:drywall_orange", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_pink.json b/src/main/resources/data/mineralogy/recipes/drywall_pink.json index 0abc3bdb7..9456a9a08 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_pink.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_pink.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_pink" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/pink" + "item": "minecraft:pink_dye" } ], "result": { - "item": "mineralogy:drywall_pink" + "item": "mineralogy:drywall_pink", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_purple.json b/src/main/resources/data/mineralogy/recipes/drywall_purple.json index d8c661b9b..f947b1bf6 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_purple.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_purple.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_purple" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/purple" + "item": "minecraft:purple_dye" } ], "result": { - "item": "mineralogy:drywall_purple" + "item": "mineralogy:drywall_purple", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_red.json b/src/main/resources/data/mineralogy/recipes/drywall_red.json index 2b7c17b5f..1869d12db 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_red.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_red.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_red" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/red" + "item": "minecraft:red_dye" } ], "result": { - "item": "mineralogy:drywall_red" + "item": "mineralogy:drywall_red", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_silver.json b/src/main/resources/data/mineralogy/recipes/drywall_silver.json index b294c3fde..8d253652b 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_silver.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_silver.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_silver" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/light_gray" + "item": "minecraft:light_gray_dye" } ], "result": { - "item": "mineralogy:drywall_silver" + "item": "mineralogy:drywall_silver", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_white.json b/src/main/resources/data/mineralogy/recipes/drywall_white.json index c8c6288df..d574a3845 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_white.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_white.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/white" + "item": "minecraft:bone_meal" } ], "result": { - "item": "mineralogy:drywall_white" + "item": "mineralogy:drywall_white", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_yellow.json b/src/main/resources/data/mineralogy/recipes/drywall_yellow.json index 240987a32..f654ec570 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_yellow.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_yellow.json @@ -1,14 +1,25 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_yellow" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:drywall_white" + "tag": "mineralogy:drywall/white" }, { - "tag": "forge:dyes/yellow" + "item": "minecraft:yellow_dye" } ], "result": { - "item": "mineralogy:drywall_yellow" + "item": "mineralogy:drywall_yellow", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick.json index 7663c679a..379201f4b 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro" + } + }, + "result": { + "item": "mineralogy:gabbro_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_block_polishing.json new file mode 100644 index 000000000..60d4b5e5d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_furnace.json index a3447d73a..bf916bc72 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gabbro/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab.json index ba498dace..c4b05fb55 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_brick" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_polishing.json new file mode 100644 index 000000000..fd506637d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_recombination.json new file mode 100644 index 000000000..331c014c6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick_slab" + }, + { + "item": "mineralogy:gabbro_brick_slab" + } + ], + "result": { + "item": "mineralogy:gabbro_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs.json index be392c040..1a5f0e452 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/brick" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs_polishing.json new file mode 100644 index 000000000..6db4c0d7a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall.json index fab4a716e..c2356d4b7 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/brick" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall_polishing.json new file mode 100644 index 000000000..c2941b5e3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_cobblestone.json b/src/main/resources/data/mineralogy/recipes/gabbro_cobblestone.json index c66a0011d..9a0d2dca3 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/gabbro" + "tag": "mineralogy:stones/gabbro" }, { - "tag": "mineralogy:crafting_materials/gabbro" + "tag": "mineralogy:stones/gabbro" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json b/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json index 5819bb8cc..35383a938 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gabbro_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gabbro" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gabbro_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/gabbro_furnace_from_rock.json deleted file mode 100644 index 999a2f727..000000000 --- a/src/main/resources/data/mineralogy/recipes/gabbro_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_brick_slab_recombination.json new file mode 100644 index 000000000..d55dfb292 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_smooth_brick_slab" + }, + { + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_slab_recombination.json new file mode 100644 index 000000000..28e5edf68 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "item": "mineralogy:gabbro_smooth_slab" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_slabs_to_brick.json new file mode 100644 index 000000000..f9a214132 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth_slab" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_stairs_to_brick.json new file mode 100644 index 000000000..7b38f85e6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_walls_to_brick.json new file mode 100644 index 000000000..16b730b34 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth_wall" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_polishing.json new file mode 100644 index 000000000..3eced29d9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_recombination.json new file mode 100644 index 000000000..1d098711b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_slab" + }, + { + "item": "mineralogy:gabbro_slab" + } + ], + "result": { + "item": "mineralogy:gabbro", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slabs_to_brick.json new file mode 100644 index 000000000..953eb256f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_slab" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_polishing.json new file mode 100644 index 000000000..8af4471e9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_to_brick.json new file mode 100644 index 000000000..dc96ca803 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_stairs" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_wall_polishing.json new file mode 100644 index 000000000..1f99b3f8b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_walls_to_brick.json new file mode 100644 index 000000000..9707f0bc8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_wall" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_axe.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_axe.json index 230bffa26..da4290519 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:gabbro_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:gabbro_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_blank.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_blank.json index eaf3d9394..5f86da2af 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_cross.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_cross.json index c997d1d4d..036b3e42a 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_hammer.json index 79e417a36..fa34df452 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_hoe.json index 8af08c84c..ce09e9986 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:gabbro_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:gabbro_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_horizontal.json index 3b3a13098..ba546d845 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_i.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_i.json index 5d8ce99a2..3bf525a3a 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_left.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_left.json index c24288ecb..9c502bc5b 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_pickaxe.json index 51ed81503..a9a172f83 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:gabbro_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:gabbro_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_plus.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_plus.json index 5fab88117..27a4c81c9 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_right.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_right.json index 8647320d5..8d4f8406c 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_left" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_left" + }, + { + "item": "mineralogy:gabbro_relief_left" + } + ], + "result": { + "item": "mineralogy:gabbro_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_sword.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_sword.json index 1b47b3800..b35f33c95 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:gabbro_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:gabbro_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_vertical.json index 7a6af6801..aa8c2c47e 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_slab.json b/src/main/resources/data/mineralogy/recipes/gabbro_slab.json index 41e2edbd3..e3d87e3e8 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro" + } + }, + "result": { + "item": "mineralogy:gabbro_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_slab_from_gabbro_stonecutting.json b/src/main/resources/data/mineralogy/recipes/gabbro_slab_from_gabbro_stonecutting.json deleted file mode 100644 index 355dc3d51..000000000 --- a/src/main/resources/data/mineralogy/recipes/gabbro_slab_from_gabbro_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/gabbro" - }, - "result": "mineralogy:gabbro_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json index e0243ad98..d1455be2a 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/gabbro" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:gabbro_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/gabbro" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick.json index 69ef58194..e1f983e7e 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_furnace.json index 7d81a257a..2edb14526 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gabbro/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_slab.json index a2bd163cf..1d328a8d4 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth_brick" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_stairs.json index 43f84439b..6afa62d62 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth_brick" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_wall.json index f480a1720..5673f8b75 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth_brick" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_furnace.json index db8186e2c..fde7607a4 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gabbro/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_slab.json index 03b68e8ad..f4d5e9a78 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_stairs.json index b2c18abfa..4593f1f2b 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_wall.json index 56af05be6..6a14ef416 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json b/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json index 266295138..ce1bc20e7 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro" + } + }, + "result": { + "item": "mineralogy:gabbro_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_stairs_from_gabbro_stonecutting.json b/src/main/resources/data/mineralogy/recipes/gabbro_stairs_from_gabbro_stonecutting.json deleted file mode 100644 index a44aa76b0..000000000 --- a/src/main/resources/data/mineralogy/recipes/gabbro_stairs_from_gabbro_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/gabbro" - }, - "result": "mineralogy:gabbro_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_wall.json b/src/main/resources/data/mineralogy/recipes/gabbro_wall.json index d14005662..e612e12a1 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro" + } + }, + "result": { + "item": "mineralogy:gabbro_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_wall_from_gabbro_stonecutting.json b/src/main/resources/data/mineralogy/recipes/gabbro_wall_from_gabbro_stonecutting.json deleted file mode 100644 index eb20d6403..000000000 --- a/src/main/resources/data/mineralogy/recipes/gabbro_wall_from_gabbro_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/gabbro" - }, - "result": "mineralogy:gabbro_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick.json index be4796332..ce546be28 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss" + } + }, + "result": { + "item": "mineralogy:gneiss_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_block_polishing.json new file mode 100644 index 000000000..265ec81ff --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_furnace.json index a1a82ecd2..464945c01 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gneiss/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab.json index 9ebb6e086..67c96cfdb 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_brick" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_polishing.json new file mode 100644 index 000000000..c7f4e89cf --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_recombination.json new file mode 100644 index 000000000..b3c5dc490 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick_slab" + }, + { + "item": "mineralogy:gneiss_brick_slab" + } + ], + "result": { + "item": "mineralogy:gneiss_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs.json index 16cb6db9e..0ea494586 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/brick" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs_polishing.json new file mode 100644 index 000000000..83c2be261 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall.json index e6e74e799..bd37baa5a 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/brick" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall_polishing.json new file mode 100644 index 000000000..11d8fb197 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_cobblestone.json b/src/main/resources/data/mineralogy/recipes/gneiss_cobblestone.json index 210c98653..2252a83b5 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/gneiss" + "tag": "mineralogy:stones/gneiss" }, { - "tag": "mineralogy:crafting_materials/gneiss" + "tag": "mineralogy:stones/gneiss" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json b/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json index 37fa86e59..d078c9f4a 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gneiss_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gneiss" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gneiss_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/gneiss_furnace_from_rock.json deleted file mode 100644 index b858bb92c..000000000 --- a/src/main/resources/data/mineralogy/recipes/gneiss_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_brick_slab_recombination.json new file mode 100644 index 000000000..b01c87208 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_smooth_brick_slab" + }, + { + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_slab_recombination.json new file mode 100644 index 000000000..da9f65dd6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "item": "mineralogy:gneiss_smooth_slab" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_slabs_to_brick.json new file mode 100644 index 000000000..0b309fd5a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth_slab" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_stairs_to_brick.json new file mode 100644 index 000000000..98460b391 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_walls_to_brick.json new file mode 100644 index 000000000..d00491db5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth_wall" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_polishing.json new file mode 100644 index 000000000..83568f45e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_recombination.json new file mode 100644 index 000000000..7873c0413 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_slab" + }, + { + "item": "mineralogy:gneiss_slab" + } + ], + "result": { + "item": "mineralogy:gneiss", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slabs_to_brick.json new file mode 100644 index 000000000..384ba20c9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_slab" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_polishing.json new file mode 100644 index 000000000..bdc4dbd52 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_to_brick.json new file mode 100644 index 000000000..3fe0558bb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_stairs" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_wall_polishing.json new file mode 100644 index 000000000..5670e632c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_walls_to_brick.json new file mode 100644 index 000000000..c4b346009 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_wall" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_axe.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_axe.json index 211a42cef..4f87c3377 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:gneiss_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:gneiss_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_blank.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_blank.json index c5bd379d7..6c46398af 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_cross.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_cross.json index 76b504e8c..c697b2c9a 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_hammer.json index 46d3248f5..fbf230399 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_hoe.json index 5496f76d8..f87065da2 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:gneiss_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:gneiss_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_horizontal.json index 9530f2df7..c415c424f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_i.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_i.json index 6623eaf15..44b677616 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_left.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_left.json index b2e52f992..3b3c60fc6 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_pickaxe.json index f00c7b21b..593a06bae 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:gneiss_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:gneiss_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_plus.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_plus.json index df66616ea..670eb57cf 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_right.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_right.json index 037381062..dbe19f4c3 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_left" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_left" + }, + { + "item": "mineralogy:gneiss_relief_left" + } + ], + "result": { + "item": "mineralogy:gneiss_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_sword.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_sword.json index 816de9d79..fe1b210ec 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:gneiss_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:gneiss_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_vertical.json index 18cc58bf5..a1572669f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_slab.json b/src/main/resources/data/mineralogy/recipes/gneiss_slab.json index 103b2496f..46b03e71e 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss" + } + }, + "result": { + "item": "mineralogy:gneiss_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_slab_from_gneiss_stonecutting.json b/src/main/resources/data/mineralogy/recipes/gneiss_slab_from_gneiss_stonecutting.json deleted file mode 100644 index 1a5607d16..000000000 --- a/src/main/resources/data/mineralogy/recipes/gneiss_slab_from_gneiss_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/gneiss" - }, - "result": "mineralogy:gneiss_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json index db53720df..0ae5b638a 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/gneiss" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:gneiss_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/gneiss" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick.json index c5e29db5e..2e2d2b879 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_furnace.json index b131b8c5e..1cb64027a 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gneiss/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_slab.json index cc0578b2c..08a36573f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth_brick" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_stairs.json index f41fc6e8a..4399fed7d 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth_brick" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_wall.json index 08464ea62..92c59848b 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth_brick" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_furnace.json index 017eb4b2c..8c5d54ada 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gneiss/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_slab.json index d9c5995d7..0cb30e62d 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_stairs.json index fbbae3f80..125a8e87b 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_wall.json index 51903c750..a0e45d68e 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json b/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json index f760bab27..1f9cb9268 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss" + } + }, + "result": { + "item": "mineralogy:gneiss_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_stairs_from_gneiss_stonecutting.json b/src/main/resources/data/mineralogy/recipes/gneiss_stairs_from_gneiss_stonecutting.json deleted file mode 100644 index 5b05aee18..000000000 --- a/src/main/resources/data/mineralogy/recipes/gneiss_stairs_from_gneiss_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/gneiss" - }, - "result": "mineralogy:gneiss_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_wall.json b/src/main/resources/data/mineralogy/recipes/gneiss_wall.json index 186d0bda2..ca3ca8476 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss" + } + }, + "result": { + "item": "mineralogy:gneiss_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_wall_from_gneiss_stonecutting.json b/src/main/resources/data/mineralogy/recipes/gneiss_wall_from_gneiss_stonecutting.json deleted file mode 100644 index ea6a8c4af..000000000 --- a/src/main/resources/data/mineralogy/recipes/gneiss_wall_from_gneiss_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/gneiss" - }, - "result": "mineralogy:gneiss_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick.json b/src/main/resources/data/mineralogy/recipes/granite_brick.json index ef2d2f2a7..4fc4bc262 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:granite" - } - }, - "result": { - "item": "mineralogy:granite_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite" + } + }, + "result": { + "item": "mineralogy:granite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_brick_block_polishing.json new file mode 100644 index 000000000..497705a13 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/granite_brick_furnace.json index 43756fcaf..892f26b0f 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:granite_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/granite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:granite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/granite_brick_slab.json index 186d87bab..b16032ccf 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_brick" - } - }, - "result": { - "item": "mineralogy:granite_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_brick" + } + }, + "result": { + "item": "mineralogy:granite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_brick_slab_polishing.json new file mode 100644 index 000000000..23bd5286f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/granite_brick_slab_recombination.json new file mode 100644 index 000000000..0466007e9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick_slab" + }, + { + "item": "mineralogy:granite_brick_slab" + } + ], + "result": { + "item": "mineralogy:granite_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_brick_stairs.json index 6f955f44b..d30ce5eee 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_brick" - } - }, - "result": { - "item": "mineralogy:granite_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/brick" + } + }, + "result": { + "item": "mineralogy:granite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_brick_stairs_polishing.json new file mode 100644 index 000000000..26158df58 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/granite_brick_wall.json index 70800d72d..83ea00025 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_brick" - } - }, - "result": { - "item": "mineralogy:granite_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/brick" + } + }, + "result": { + "item": "mineralogy:granite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_brick_wall_polishing.json new file mode 100644 index 000000000..56ca6fcf8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/granite_cobblestone.json index f5136c974..91f5e9116 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/granite_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/granite" + "tag": "mineralogy:stones/granite" }, { - "tag": "mineralogy:crafting_materials/granite" + "tag": "mineralogy:stones/granite" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/granite_furnace.json b/src/main/resources/data/mineralogy/recipes/granite_furnace.json index 9ed5644f3..faf2765ab 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:granite_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/granite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:granite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/granite_furnace_from_rock.json deleted file mode 100644 index 4c50b2c12..000000000 --- a/src/main/resources/data/mineralogy/recipes/granite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/granite" - } - }, - "result": { - "item": "mineralogy:granite_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/granite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..8c4300afb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_smooth_brick_slab" + }, + { + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:granite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/granite_polished_slab_recombination.json new file mode 100644 index 000000000..0279fcfa9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_smooth_slab" + }, + { + "item": "mineralogy:granite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:granite_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_polished_slabs_to_brick.json new file mode 100644 index 000000000..eb7de501a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_polished_stairs_to_brick.json new file mode 100644 index 000000000..5ab67da5c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_polished_walls_to_brick.json new file mode 100644 index 000000000..d196c965e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_raw_slab_polishing.json new file mode 100644 index 000000000..dc1bf37e7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/granite_raw_slab_recombination.json new file mode 100644 index 000000000..173abb61f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_slab" + }, + { + "item": "mineralogy:granite_slab" + } + ], + "result": { + "item": "mineralogy:granite", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_raw_slabs_to_brick.json new file mode 100644 index 000000000..88b95dd96 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_slab" + } + }, + "result": { + "item": "mineralogy:granite_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_polishing.json new file mode 100644 index 000000000..a2b951c43 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_to_brick.json new file mode 100644 index 000000000..4e95813f7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_stairs" + } + }, + "result": { + "item": "mineralogy:granite_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_raw_wall_polishing.json new file mode 100644 index 000000000..672f39fc5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_raw_walls_to_brick.json new file mode 100644 index 000000000..007ac0d46 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_wall" + } + }, + "result": { + "item": "mineralogy:granite_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/granite_relief_axe.json index e8bf723d7..2981808bb 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:granite_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:granite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json index 5f6fd7899..1f0e113a2 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - } - }, - "result": { - "item": "mineralogy:granite_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth" + } + }, + "result": { + "item": "mineralogy:granite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/granite_relief_cross.json index 0a742c168..f9e40ee93 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/granite_relief_hammer.json index 52b8a920f..91abb1898 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/granite_relief_hoe.json index bb9bb7683..78f4fb6bc 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:granite_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:granite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/granite_relief_horizontal.json index 705039aa4..434ec2e68 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_i.json b/src/main/resources/data/mineralogy/recipes/granite_relief_i.json index dca5b6348..1e0042633 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_left.json b/src/main/resources/data/mineralogy/recipes/granite_relief_left.json index f9a40448a..192d9fa1e 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/granite_relief_pickaxe.json index c80d184a2..95d859e9e 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:granite_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:granite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/granite_relief_plus.json index 0094fdb2a..808c7f48c 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_right.json b/src/main/resources/data/mineralogy/recipes/granite_relief_right.json index 280a02fc4..e102df93c 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_left" - } - }, - "result": { - "item": "mineralogy:granite_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_left" + }, + { + "item": "mineralogy:granite_relief_left" + } + ], + "result": { + "item": "mineralogy:granite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/granite_relief_sword.json index 7d4fc4be6..555082c11 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:granite_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:granite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/granite_relief_vertical.json index 797205d77..3ea518b73 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_slab.json b/src/main/resources/data/mineralogy/recipes/granite_slab.json index 07927a17b..3a0f24a46 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite" - } - }, - "result": { - "item": "mineralogy:granite_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite" + } + }, + "result": { + "item": "mineralogy:granite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_slab_from_granite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/granite_slab_from_granite_stonecutting.json deleted file mode 100644 index 532306f23..000000000 --- a/src/main/resources/data/mineralogy/recipes/granite_slab_from_granite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:granite" - }, - "result": "mineralogy:granite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth.json b/src/main/resources/data/mineralogy/recipes/granite_smooth.json index 00029faa3..2cafcc7e6 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/granite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:granite_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/granite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick.json index bb644f5b9..465a5cbda 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_furnace.json index 2264cdab9..e9bccde52 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/granite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_slab.json index 49ed02172..8dc3da154 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_stairs.json index 9a6934c71..53f0919b5 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_wall.json index 691c3436c..66aa29eb2 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_furnace.json index a02e057d4..9b9f92ce4 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:granite_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/granite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:granite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab.json index 4fd817e85..ce788946c 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - } - }, - "result": { - "item": "mineralogy:granite_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth" + } + }, + "result": { + "item": "mineralogy:granite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json index 8e905eebf..885a1003a 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - } - }, - "result": { - "item": "mineralogy:granite_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth" + } + }, + "result": { + "item": "mineralogy:granite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_wall.json index c820f1a59..c72b54fe2 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - } - }, - "result": { - "item": "mineralogy:granite_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth" + } + }, + "result": { + "item": "mineralogy:granite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_stairs.json index 38bd8954d..4c2120e34 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite" - } - }, - "result": { - "item": "mineralogy:granite_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite" + } + }, + "result": { + "item": "mineralogy:granite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_stairs_from_granite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/granite_stairs_from_granite_stonecutting.json deleted file mode 100644 index 7a86089ac..000000000 --- a/src/main/resources/data/mineralogy/recipes/granite_stairs_from_granite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:granite" - }, - "result": "mineralogy:granite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/granite_wall.json b/src/main/resources/data/mineralogy/recipes/granite_wall.json index 4664e82d8..5f2a48548 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite" - } - }, - "result": { - "item": "mineralogy:granite_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite" + } + }, + "result": { + "item": "mineralogy:granite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_wall_from_granite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/granite_wall_from_granite_stonecutting.json deleted file mode 100644 index ef079dbc3..000000000 --- a/src/main/resources/data/mineralogy/recipes/granite_wall_from_granite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:granite" - }, - "result": "mineralogy:granite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon_dust.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon_dust.json new file mode 100644 index 000000000..2e3f5f038 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon_dust.json @@ -0,0 +1,31 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/carbon" + } + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/carbon" + }, + { + "tag": "forge:dusts/nitrate" + }, + { + "tag": "forge:dusts/sulfur" + } + ], + "result": { + "item": "minecraft:gunpowder", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json similarity index 63% rename from src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon.json rename to src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json index 55a7c0a9c..4d869dc4b 100644 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon.json +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json @@ -1,8 +1,14 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "forge:dusts/carbon" + "item": "minecraft:charcoal" }, { "tag": "forge:dusts/nitrate" diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal.json deleted file mode 100644 index 9a470320b..000000000 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:coal" - }, - { - "tag": "forge:dusts/nitrate" - }, - { - "tag": "forge:dusts/sulfur" - } - ], - "result": { - "item": "minecraft:gunpowder", - "count": 4 - } -} diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal_dust.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal_dust.json new file mode 100644 index 000000000..95a4a8cae --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal_dust.json @@ -0,0 +1,31 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/coal" + } + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/coal" + }, + { + "tag": "forge:dusts/nitrate" + }, + { + "tag": "forge:dusts/sulfur" + } + ], + "result": { + "item": "minecraft:gunpowder", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_sugar.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_sugar.json index 2b25af923..3cdcb7c65 100644 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_sugar.json +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_sugar.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { diff --git a/src/main/resources/data/mineralogy/recipes/gypsum.json b/src/main/resources/data/mineralogy/recipes/gypsum.json index 5bb619aad..4e0b32977 100644 --- a/src/main/resources/data/mineralogy/recipes/gypsum.json +++ b/src/main/resources/data/mineralogy/recipes/gypsum.json @@ -1,9 +1,14 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gypsum" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ - "xxx", - "xxx", - "xxx" + "xx", + "xx" ], "key": { "x": { @@ -11,6 +16,7 @@ } }, "result": { - "item": "mineralogy:gypsum" + "item": "mineralogy:gypsum", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/gypsum_dust.json b/src/main/resources/data/mineralogy/recipes/gypsum_dust.json index 9d5adb223..f6d26d2cd 100644 --- a/src/main/resources/data/mineralogy/recipes/gypsum_dust.json +++ b/src/main/resources/data/mineralogy/recipes/gypsum_dust.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gypsum_dust" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -7,6 +13,6 @@ ], "result": { "item": "mineralogy:gypsum_dust", - "count": 9 + "count": 4 } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick.json index 01bfa0585..eaa1f1f9d 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels" + } + }, + "result": { + "item": "mineralogy:hornfels_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_block_polishing.json new file mode 100644 index 000000000..895caff2b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_furnace.json index 6647c9a09..07abf9eb1 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/hornfels/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab.json index 24fa46592..b06f61e6d 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_brick" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_polishing.json new file mode 100644 index 000000000..03d8b417b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_recombination.json new file mode 100644 index 000000000..8372a26ee --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick_slab" + }, + { + "item": "mineralogy:hornfels_brick_slab" + } + ], + "result": { + "item": "mineralogy:hornfels_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs.json index 4c6a29a59..14fc4bc18 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/brick" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs_polishing.json new file mode 100644 index 000000000..feaded12e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall.json index 7a2b8a533..8dc8f34dc 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/brick" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall_polishing.json new file mode 100644 index 000000000..4e337c18f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_cobblestone.json b/src/main/resources/data/mineralogy/recipes/hornfels_cobblestone.json index 93bfdb765..2a2cf87ec 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/hornfels" + "tag": "mineralogy:stones/hornfels" }, { - "tag": "mineralogy:crafting_materials/hornfels" + "tag": "mineralogy:stones/hornfels" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json b/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json index 4cc767d88..5ea26dcb0 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:hornfels_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/hornfels" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:hornfels_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/hornfels_furnace_from_rock.json deleted file mode 100644 index 3023923c6..000000000 --- a/src/main/resources/data/mineralogy/recipes/hornfels_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_brick_slab_recombination.json new file mode 100644 index 000000000..3db0faab8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_smooth_brick_slab" + }, + { + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_slab_recombination.json new file mode 100644 index 000000000..0ed28a7c3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "item": "mineralogy:hornfels_smooth_slab" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_slabs_to_brick.json new file mode 100644 index 000000000..7d82ff653 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth_slab" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_stairs_to_brick.json new file mode 100644 index 000000000..4d72100e5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_walls_to_brick.json new file mode 100644 index 000000000..d85bff0ab --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth_wall" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_polishing.json new file mode 100644 index 000000000..12def83ef --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_recombination.json new file mode 100644 index 000000000..dc1d5a748 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_slab" + }, + { + "item": "mineralogy:hornfels_slab" + } + ], + "result": { + "item": "mineralogy:hornfels", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slabs_to_brick.json new file mode 100644 index 000000000..d5178ba5d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_slab" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_polishing.json new file mode 100644 index 000000000..4c566d017 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_to_brick.json new file mode 100644 index 000000000..2e60a4074 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_stairs" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_wall_polishing.json new file mode 100644 index 000000000..18fcd3c14 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_walls_to_brick.json new file mode 100644 index 000000000..be46bc854 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_wall" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_axe.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_axe.json index bc8284da9..4a928f389 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:hornfels_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:hornfels_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_blank.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_blank.json index 282e1c5df..9c87337d1 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_cross.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_cross.json index b5fec7612..34823ff90 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_hammer.json index 16e9a419a..56f4b7bb4 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_hoe.json index c2c79fadf..518b3df48 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:hornfels_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:hornfels_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_horizontal.json index 23217574a..6c2179429 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_i.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_i.json index 3cdaf3074..2aa52b270 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_left.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_left.json index fdcf382ee..a5575df02 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_pickaxe.json index c248a733e..50906048b 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:hornfels_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:hornfels_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_plus.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_plus.json index f8743797a..1990e5d65 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_right.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_right.json index 7740f370b..6d6cfa0f7 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_left" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_left" + }, + { + "item": "mineralogy:hornfels_relief_left" + } + ], + "result": { + "item": "mineralogy:hornfels_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_sword.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_sword.json index d996cf08c..13c795649 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:hornfels_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:hornfels_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_vertical.json index c9940ca72..e3995b4af 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_slab.json b/src/main/resources/data/mineralogy/recipes/hornfels_slab.json index 9a362695e..d97f745ed 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels" + } + }, + "result": { + "item": "mineralogy:hornfels_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_slab_from_hornfels_stonecutting.json b/src/main/resources/data/mineralogy/recipes/hornfels_slab_from_hornfels_stonecutting.json deleted file mode 100644 index 0a55432fc..000000000 --- a/src/main/resources/data/mineralogy/recipes/hornfels_slab_from_hornfels_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/hornfels" - }, - "result": "mineralogy:hornfels_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json index 5213ec679..e91cdf1dc 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/hornfels" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:hornfels_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/hornfels" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick.json index 74f30e352..66476ee95 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_furnace.json index 3848a9413..f54ef39f3 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/hornfels/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_slab.json index 6bd46b7f9..87d9bd753 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth_brick" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_stairs.json index 0c84a292a..a3e12dcf0 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth_brick" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_wall.json index 543cc3c4e..1dc3c2cf9 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth_brick" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_furnace.json index 71ba2a978..ec7bad694 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/hornfels/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_slab.json index 48150f032..bdb651369 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_stairs.json index 690f70729..21651469f 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_wall.json index 7c29ac7ff..0a713cbf8 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json b/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json index 2eaacf0e7..a27fa5620 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels" + } + }, + "result": { + "item": "mineralogy:hornfels_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_stairs_from_hornfels_stonecutting.json b/src/main/resources/data/mineralogy/recipes/hornfels_stairs_from_hornfels_stonecutting.json deleted file mode 100644 index 7c4a6399d..000000000 --- a/src/main/resources/data/mineralogy/recipes/hornfels_stairs_from_hornfels_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/hornfels" - }, - "result": "mineralogy:hornfels_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_wall.json b/src/main/resources/data/mineralogy/recipes/hornfels_wall.json index d83a51860..4d0ce9cd9 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels" + } + }, + "result": { + "item": "mineralogy:hornfels_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_wall_from_hornfels_stonecutting.json b/src/main/resources/data/mineralogy/recipes/hornfels_wall_from_hornfels_stonecutting.json deleted file mode 100644 index 2b5df1346..000000000 --- a/src/main/resources/data/mineralogy/recipes/hornfels_wall_from_hornfels_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/hornfels" - }, - "result": "mineralogy:hornfels_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_brick.json index 7b28ddc08..e71c8b670 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/limestone" - } - }, - "result": { - "item": "mineralogy:limestone_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone" + } + }, + "result": { + "item": "mineralogy:limestone_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_block_polishing.json new file mode 100644 index 000000000..e3e718989 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_furnace.json index 8bb720fce..df10c6099 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:limestone_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/limestone/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:limestone_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab.json index 87153ea42..ff7662f81 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_brick" - } - }, - "result": { - "item": "mineralogy:limestone_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_brick" + } + }, + "result": { + "item": "mineralogy:limestone_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_polishing.json new file mode 100644 index 000000000..0c3f2080a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_recombination.json new file mode 100644 index 000000000..70db2e995 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick_slab" + }, + { + "item": "mineralogy:limestone_brick_slab" + } + ], + "result": { + "item": "mineralogy:limestone_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs.json index 0360e9d3d..fe66cafeb 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_brick" - } - }, - "result": { - "item": "mineralogy:limestone_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/brick" + } + }, + "result": { + "item": "mineralogy:limestone_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs_polishing.json new file mode 100644 index 000000000..2223a4229 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_wall.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_wall.json index 618dc7a57..00da885b4 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_brick" - } - }, - "result": { - "item": "mineralogy:limestone_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/brick" + } + }, + "result": { + "item": "mineralogy:limestone_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_wall_polishing.json new file mode 100644 index 000000000..2451dde9b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_cobblestone.json b/src/main/resources/data/mineralogy/recipes/limestone_cobblestone.json index 68e457a80..59eaaf52c 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/limestone" + "tag": "mineralogy:stones/limestone" }, { - "tag": "mineralogy:crafting_materials/limestone" + "tag": "mineralogy:stones/limestone" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/limestone_furnace.json b/src/main/resources/data/mineralogy/recipes/limestone_furnace.json index f7e50a85b..c73f48091 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:limestone_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/limestone" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:limestone_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/limestone_furnace_from_rock.json deleted file mode 100644 index 170d6b687..000000000 --- a/src/main/resources/data/mineralogy/recipes/limestone_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/limestone" - } - }, - "result": { - "item": "mineralogy:limestone_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_brick_slab_recombination.json new file mode 100644 index 000000000..4d9ee36c5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_smooth_brick_slab" + }, + { + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_slab_recombination.json new file mode 100644 index 000000000..255cd3ceb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_smooth_slab" + }, + { + "item": "mineralogy:limestone_smooth_slab" + } + ], + "result": { + "item": "mineralogy:limestone_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_slabs_to_brick.json new file mode 100644 index 000000000..fc5a0cb9f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth_slab" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_stairs_to_brick.json new file mode 100644 index 000000000..eb812aa17 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_walls_to_brick.json new file mode 100644 index 000000000..984bcacfd --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth_wall" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_polishing.json new file mode 100644 index 000000000..e5e4c8650 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_recombination.json new file mode 100644 index 000000000..6af52d637 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_slab" + }, + { + "item": "mineralogy:limestone_slab" + } + ], + "result": { + "item": "mineralogy:limestone", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_slabs_to_brick.json new file mode 100644 index 000000000..b3353664f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_slab" + } + }, + "result": { + "item": "mineralogy:limestone_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_polishing.json new file mode 100644 index 000000000..5af88afd8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_to_brick.json new file mode 100644 index 000000000..62e21a132 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_stairs" + } + }, + "result": { + "item": "mineralogy:limestone_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_wall_polishing.json new file mode 100644 index 000000000..14fa3f115 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_walls_to_brick.json new file mode 100644 index 000000000..749deefab --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_wall" + } + }, + "result": { + "item": "mineralogy:limestone_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_axe.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_axe.json index 63e57191e..d5cb155b3 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:limestone_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:limestone_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_blank.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_blank.json index ae2018ea8..bf7bc1d94 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - } - }, - "result": { - "item": "mineralogy:limestone_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth" + } + }, + "result": { + "item": "mineralogy:limestone_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_cross.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_cross.json index 0196b12b2..126f15148 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_hammer.json index b911b5fb6..15dc06729 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_hoe.json index 9a014f98a..d9a57f2c8 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:limestone_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:limestone_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_horizontal.json index 6df8a6df5..9f291ccb4 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_i.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_i.json index 0f5c9d59a..ea7f2dc51 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_left.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_left.json index 7b68d30ef..9e4b9f970 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_pickaxe.json index e59235a75..ae12ff2fc 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:limestone_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:limestone_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_plus.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_plus.json index d4e898cb0..2b25826d7 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_right.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_right.json index 14c9249b5..a03ed3a89 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_left" - } - }, - "result": { - "item": "mineralogy:limestone_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_left" + }, + { + "item": "mineralogy:limestone_relief_left" + } + ], + "result": { + "item": "mineralogy:limestone_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_sword.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_sword.json index 7a6fa051d..b7f18389f 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:limestone_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:limestone_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_vertical.json index 2f26278af..513a02528 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_slab.json b/src/main/resources/data/mineralogy/recipes/limestone_slab.json index ecff1e29e..7e4f5eaf4 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/limestone" - } - }, - "result": { - "item": "mineralogy:limestone_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone" + } + }, + "result": { + "item": "mineralogy:limestone_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_slab_from_limestone_stonecutting.json b/src/main/resources/data/mineralogy/recipes/limestone_slab_from_limestone_stonecutting.json deleted file mode 100644 index 54fcd4f47..000000000 --- a/src/main/resources/data/mineralogy/recipes/limestone_slab_from_limestone_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/limestone" - }, - "result": "mineralogy:limestone_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth.json index d9ff74cad..f63744d97 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/limestone" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:limestone_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/limestone" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick.json index f12b20686..dce6c8237 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_furnace.json index cda60b0f7..76b5483f3 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/limestone/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_slab.json index ec617bb05..a35fd7956 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth_brick" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth_brick" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_stairs.json index b22ad78eb..325572b58 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth_brick" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth_brick" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_wall.json index 87726f05f..108b3e441 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth_brick" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth_brick" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_furnace.json index 9b5cb6d26..1e19d87c2 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/limestone/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_slab.json index f2d3012f9..c4803e65c 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_stairs.json index 753a17853..9789a10bf 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_wall.json index a263f2fac..2f9888bfa 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_stairs.json b/src/main/resources/data/mineralogy/recipes/limestone_stairs.json index 0d1d09c18..2c3e4e0f1 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/limestone" - } - }, - "result": { - "item": "mineralogy:limestone_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone" + } + }, + "result": { + "item": "mineralogy:limestone_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_stairs_from_limestone_stonecutting.json b/src/main/resources/data/mineralogy/recipes/limestone_stairs_from_limestone_stonecutting.json deleted file mode 100644 index 85ab9faac..000000000 --- a/src/main/resources/data/mineralogy/recipes/limestone_stairs_from_limestone_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/limestone" - }, - "result": "mineralogy:limestone_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_wall.json b/src/main/resources/data/mineralogy/recipes/limestone_wall.json index 5879f4307..2f06127f3 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/limestone" - } - }, - "result": { - "item": "mineralogy:limestone_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone" + } + }, + "result": { + "item": "mineralogy:limestone_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_wall_from_limestone_stonecutting.json b/src/main/resources/data/mineralogy/recipes/limestone_wall_from_limestone_stonecutting.json deleted file mode 100644 index d3f33b599..000000000 --- a/src/main/resources/data/mineralogy/recipes/limestone_wall_from_limestone_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/limestone" - }, - "result": "mineralogy:limestone_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick.json b/src/main/resources/data/mineralogy/recipes/marble_brick.json index 3d453b2e4..3d67176a1 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/marble" - } - }, - "result": { - "item": "mineralogy:marble_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble" + } + }, + "result": { + "item": "mineralogy:marble_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_brick_block_polishing.json new file mode 100644 index 000000000..8cef567b0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/marble_brick_furnace.json index 07a39b0f7..91a5f53ff 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:marble_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/marble/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:marble_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_slab.json b/src/main/resources/data/mineralogy/recipes/marble_brick_slab.json index 21172dd03..e49b33d77 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_brick" - } - }, - "result": { - "item": "mineralogy:marble_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_brick" + } + }, + "result": { + "item": "mineralogy:marble_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_brick_slab_polishing.json new file mode 100644 index 000000000..734780458 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/marble_brick_slab_recombination.json new file mode 100644 index 000000000..8d4b69fb5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick_slab" + }, + { + "item": "mineralogy:marble_brick_slab" + } + ], + "result": { + "item": "mineralogy:marble_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/marble_brick_stairs.json index 85be55beb..cd84a0ce1 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_brick" - } - }, - "result": { - "item": "mineralogy:marble_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/brick" + } + }, + "result": { + "item": "mineralogy:marble_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_brick_stairs_polishing.json new file mode 100644 index 000000000..875c90430 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_wall.json b/src/main/resources/data/mineralogy/recipes/marble_brick_wall.json index 9f949fcc7..ba563244e 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_brick" - } - }, - "result": { - "item": "mineralogy:marble_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/brick" + } + }, + "result": { + "item": "mineralogy:marble_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_brick_wall_polishing.json new file mode 100644 index 000000000..1ef76f322 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_cobblestone.json b/src/main/resources/data/mineralogy/recipes/marble_cobblestone.json index 4789d3e55..cb915ce21 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/marble_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/marble" + "tag": "mineralogy:stones/marble" }, { - "tag": "mineralogy:crafting_materials/marble" + "tag": "mineralogy:stones/marble" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/marble_furnace.json b/src/main/resources/data/mineralogy/recipes/marble_furnace.json index 6ece28aeb..0d001caac 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:marble_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/marble" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:marble_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/marble_furnace_from_rock.json deleted file mode 100644 index 550ee18d6..000000000 --- a/src/main/resources/data/mineralogy/recipes/marble_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/marble" - } - }, - "result": { - "item": "mineralogy:marble_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/marble_polished_brick_slab_recombination.json new file mode 100644 index 000000000..352a85bee --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_smooth_brick_slab" + }, + { + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:marble_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/marble_polished_slab_recombination.json new file mode 100644 index 000000000..b221401a5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_smooth_slab" + }, + { + "item": "mineralogy:marble_smooth_slab" + } + ], + "result": { + "item": "mineralogy:marble_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_polished_slabs_to_brick.json new file mode 100644 index 000000000..f75df464b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth_slab" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_polished_stairs_to_brick.json new file mode 100644 index 000000000..39f2ca936 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_polished_walls_to_brick.json new file mode 100644 index 000000000..4347a3812 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth_wall" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_raw_slab_polishing.json new file mode 100644 index 000000000..8cfe300fa --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/marble_raw_slab_recombination.json new file mode 100644 index 000000000..cd806f29a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_slab" + }, + { + "item": "mineralogy:marble_slab" + } + ], + "result": { + "item": "mineralogy:marble", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_raw_slabs_to_brick.json new file mode 100644 index 000000000..82ca8bbb3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_slab" + } + }, + "result": { + "item": "mineralogy:marble_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_polishing.json new file mode 100644 index 000000000..765a9a789 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_to_brick.json new file mode 100644 index 000000000..43169a5d6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_stairs" + } + }, + "result": { + "item": "mineralogy:marble_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_raw_wall_polishing.json new file mode 100644 index 000000000..17b082a53 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_raw_walls_to_brick.json new file mode 100644 index 000000000..74f05a5cf --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_wall" + } + }, + "result": { + "item": "mineralogy:marble_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_axe.json b/src/main/resources/data/mineralogy/recipes/marble_relief_axe.json index b2c8f57a0..42268b337 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:marble_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:marble_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_blank.json b/src/main/resources/data/mineralogy/recipes/marble_relief_blank.json index 9f32f6f8f..77e789a98 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - } - }, - "result": { - "item": "mineralogy:marble_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth" + } + }, + "result": { + "item": "mineralogy:marble_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_cross.json b/src/main/resources/data/mineralogy/recipes/marble_relief_cross.json index ea3a54b54..7c157cb06 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/marble_relief_hammer.json index 94b7dbc46..e6386f1f2 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/marble_relief_hoe.json index fb4deb5df..b49118369 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:marble_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:marble_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/marble_relief_horizontal.json index 08505348a..e7c04dc44 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_i.json b/src/main/resources/data/mineralogy/recipes/marble_relief_i.json index 0673774b4..66f051168 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_left.json b/src/main/resources/data/mineralogy/recipes/marble_relief_left.json index 64f58a43c..f2620bed3 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/marble_relief_pickaxe.json index 1967b854e..69aef677b 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:marble_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:marble_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_plus.json b/src/main/resources/data/mineralogy/recipes/marble_relief_plus.json index a4437e7ac..a6a50be1f 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_right.json b/src/main/resources/data/mineralogy/recipes/marble_relief_right.json index 2ec41db2b..c46d3136b 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_left" - } - }, - "result": { - "item": "mineralogy:marble_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_left" + }, + { + "item": "mineralogy:marble_relief_left" + } + ], + "result": { + "item": "mineralogy:marble_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_sword.json b/src/main/resources/data/mineralogy/recipes/marble_relief_sword.json index fc9727ebe..f0047ab4b 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:marble_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:marble_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/marble_relief_vertical.json index af67eb024..7880148ef 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_slab.json b/src/main/resources/data/mineralogy/recipes/marble_slab.json index 6db31a876..8afe1b7d2 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/marble" - } - }, - "result": { - "item": "mineralogy:marble_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble" + } + }, + "result": { + "item": "mineralogy:marble_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_slab_from_marble_stonecutting.json b/src/main/resources/data/mineralogy/recipes/marble_slab_from_marble_stonecutting.json deleted file mode 100644 index 3635a8ffc..000000000 --- a/src/main/resources/data/mineralogy/recipes/marble_slab_from_marble_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/marble" - }, - "result": "mineralogy:marble_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth.json b/src/main/resources/data/mineralogy/recipes/marble_smooth.json index 88869e645..4571e7db8 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/marble" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:marble_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/marble" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick.json index d1ecd24f5..4e64fc34c 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_furnace.json index eacac35b3..b1ec1bf71 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/marble/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_slab.json index 52879cf5e..60d9b10a7 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth_brick" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth_brick" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_stairs.json index ff1138d76..bb6d9f3b8 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth_brick" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth_brick" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_wall.json index e0cd8f858..48e8a80bd 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth_brick" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth_brick" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_furnace.json index 41b9310a0..27ec3ddf9 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:marble_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/marble/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:marble_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_slab.json index 0c3fc93cc..ce2da208d 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - } - }, - "result": { - "item": "mineralogy:marble_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth" + } + }, + "result": { + "item": "mineralogy:marble_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_stairs.json index 88a51b3d7..0d19541bb 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - } - }, - "result": { - "item": "mineralogy:marble_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth" + } + }, + "result": { + "item": "mineralogy:marble_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_wall.json index 2c5ed67fe..8140e77df 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - } - }, - "result": { - "item": "mineralogy:marble_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth" + } + }, + "result": { + "item": "mineralogy:marble_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_stairs.json b/src/main/resources/data/mineralogy/recipes/marble_stairs.json index f476e072e..a8df994d8 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/marble" - } - }, - "result": { - "item": "mineralogy:marble_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble" + } + }, + "result": { + "item": "mineralogy:marble_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_stairs_from_marble_stonecutting.json b/src/main/resources/data/mineralogy/recipes/marble_stairs_from_marble_stonecutting.json deleted file mode 100644 index a470c2389..000000000 --- a/src/main/resources/data/mineralogy/recipes/marble_stairs_from_marble_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/marble" - }, - "result": "mineralogy:marble_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/marble_wall.json b/src/main/resources/data/mineralogy/recipes/marble_wall.json index 5d292b64d..84e3f7c48 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/marble" - } - }, - "result": { - "item": "mineralogy:marble_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble" + } + }, + "result": { + "item": "mineralogy:marble_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_wall_from_marble_stonecutting.json b/src/main/resources/data/mineralogy/recipes/marble_wall_from_marble_stonecutting.json deleted file mode 100644 index 2630d0b26..000000000 --- a/src/main/resources/data/mineralogy/recipes/marble_wall_from_marble_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/marble" - }, - "result": "mineralogy:marble_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/mineral_fertilizer.json b/src/main/resources/data/mineralogy/recipes/mineral_fertilizer.json deleted file mode 100644 index 8416947cf..000000000 --- a/src/main/resources/data/mineralogy/recipes/mineral_fertilizer.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/nitrate" - }, - { - "tag": "forge:dusts/phosphorous" - } - ], - "result": { - "item": "mineralogy:mineral_fertilizer" - } -} diff --git a/src/main/resources/data/mineralogy/recipes/mineralfertilizer.json b/src/main/resources/data/mineralogy/recipes/mineralfertilizer.json new file mode 100644 index 000000000..b3d18072b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/mineralfertilizer.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_FERTILIZER" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:mineral_fertilizer" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/nitrate" + }, + { + "tag": "forge:dusts/phosphorous" + } + ], + "result": { + "item": "mineralogy:mineral_fertilizer", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/nitrate_block.json b/src/main/resources/data/mineralogy/recipes/nitrate_block.json index 2d9a73f50..ffa4c4537 100644 --- a/src/main/resources/data/mineralogy/recipes/nitrate_block.json +++ b/src/main/resources/data/mineralogy/recipes/nitrate_block.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_block" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,10 +17,11 @@ ], "key": { "x": { - "tag": "forge:dusts/nitrate" + "item": "mineralogy:nitrate_dust" } }, "result": { - "item": "mineralogy:nitrate_block" + "item": "mineralogy:nitrate_block", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/nitrate_dust.json b/src/main/resources/data/mineralogy/recipes/nitrate_dust.json index 94f98e8d8..6ee3fe804 100644 --- a/src/main/resources/data/mineralogy/recipes/nitrate_dust.json +++ b/src/main/resources/data/mineralogy/recipes/nitrate_dust.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_dust" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick.json index 37d027a63..9d746be1a 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite" + } + }, + "result": { + "item": "mineralogy:novaculite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_block_polishing.json new file mode 100644 index 000000000..c14cc22c8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_furnace.json index f67009d9e..a5b807279 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/novaculite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab.json index 50d32d5c6..cf1e0f6e7 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_brick" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_polishing.json new file mode 100644 index 000000000..ed61b5b03 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_recombination.json new file mode 100644 index 000000000..532a6a0cb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick_slab" + }, + { + "item": "mineralogy:novaculite_brick_slab" + } + ], + "result": { + "item": "mineralogy:novaculite_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs.json index 036111585..f8a95f389 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/brick" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs_polishing.json new file mode 100644 index 000000000..a5c52bf76 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall.json index ab72a1945..58c516370 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/brick" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall_polishing.json new file mode 100644 index 000000000..888abb979 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/novaculite_cobblestone.json index ddcef1ebe..8886306ef 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/novaculite" + "tag": "mineralogy:stones/novaculite" }, { - "tag": "mineralogy:crafting_materials/novaculite" + "tag": "mineralogy:stones/novaculite" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json b/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json index b8889426e..33eeae7f6 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:novaculite_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/novaculite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:novaculite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/novaculite_furnace_from_rock.json deleted file mode 100644 index fb54973ec..000000000 --- a/src/main/resources/data/mineralogy/recipes/novaculite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..cc4466477 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_smooth_brick_slab" + }, + { + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_slab_recombination.json new file mode 100644 index 000000000..bb49551ed --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "item": "mineralogy:novaculite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_slabs_to_brick.json new file mode 100644 index 000000000..e745b2dcc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_stairs_to_brick.json new file mode 100644 index 000000000..553b88ab9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_walls_to_brick.json new file mode 100644 index 000000000..0736ab652 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_polishing.json new file mode 100644 index 000000000..b8dc4c72a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_recombination.json new file mode 100644 index 000000000..efad4ec01 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_slab" + }, + { + "item": "mineralogy:novaculite_slab" + } + ], + "result": { + "item": "mineralogy:novaculite", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slabs_to_brick.json new file mode 100644 index 000000000..2f8ccde1e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_slab" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_polishing.json new file mode 100644 index 000000000..91d1b04e9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_to_brick.json new file mode 100644 index 000000000..e0cbc0aca --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_stairs" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_wall_polishing.json new file mode 100644 index 000000000..6d43688dd --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_walls_to_brick.json new file mode 100644 index 000000000..62418f0fb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_wall" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_axe.json index 7cb1c1cf7..fad1a1e04 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:novaculite_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:novaculite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_blank.json index 567ab3f19..7f191c7a1 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_cross.json index 7f79c6384..c0d70e6b5 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_hammer.json index fc621f422..85d1af647 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_hoe.json index afb042bed..4dba5fc43 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:novaculite_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:novaculite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_horizontal.json index 52728ca22..39050872b 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_i.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_i.json index 6e09ca570..86f3e21ae 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_left.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_left.json index 18d9ce481..f0d1f6121 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_pickaxe.json index 90678f931..f9c68294e 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:novaculite_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:novaculite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_plus.json index 9c13967fb..3f2969e61 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_right.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_right.json index 1cff6762f..2add9c8a4 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_left" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_left" + }, + { + "item": "mineralogy:novaculite_relief_left" + } + ], + "result": { + "item": "mineralogy:novaculite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_sword.json index 0f6db09ae..ff85513c3 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:novaculite_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:novaculite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_vertical.json index 4b0bfefbe..a9200b5ba 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_slab.json b/src/main/resources/data/mineralogy/recipes/novaculite_slab.json index 60b0747cc..2f75d43ee 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite" + } + }, + "result": { + "item": "mineralogy:novaculite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_slab_from_novaculite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/novaculite_slab_from_novaculite_stonecutting.json deleted file mode 100644 index 66dcc2521..000000000 --- a/src/main/resources/data/mineralogy/recipes/novaculite_slab_from_novaculite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/novaculite" - }, - "result": "mineralogy:novaculite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json index cfd80a614..bab8c6e9a 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/novaculite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:novaculite_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/novaculite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick.json index 20cb3130e..a66d9cfbc 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_furnace.json index 622548842..7469372f7 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/novaculite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_slab.json index d4190d4cd..6d67fcb6f 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_stairs.json index 2b4d25b5a..16f3f2e2d 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_wall.json index b3490e86f..138b920ab 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_furnace.json index 79102376d..7a97804ea 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/novaculite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_slab.json index 188591ca7..455f86907 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_stairs.json index f07aec03b..1154b6db9 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_wall.json index c4be97fc1..73b901469 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json b/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json index a8414e018..a08572c56 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite" + } + }, + "result": { + "item": "mineralogy:novaculite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_stairs_from_novaculite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/novaculite_stairs_from_novaculite_stonecutting.json deleted file mode 100644 index 497558edc..000000000 --- a/src/main/resources/data/mineralogy/recipes/novaculite_stairs_from_novaculite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/novaculite" - }, - "result": "mineralogy:novaculite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_wall.json b/src/main/resources/data/mineralogy/recipes/novaculite_wall.json index d4d25d96e..1af81604c 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite" + } + }, + "result": { + "item": "mineralogy:novaculite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_wall_from_novaculite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/novaculite_wall_from_novaculite_stonecutting.json deleted file mode 100644 index cd3a39530..000000000 --- a/src/main/resources/data/mineralogy/recipes/novaculite_wall_from_novaculite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/novaculite" - }, - "result": "mineralogy:novaculite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json index 9d789ce78..f8b6c2cdc 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_block_polishing.json new file mode 100644 index 000000000..145c67c1b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_furnace.json index 17124db45..69a371636 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/pegmatite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab.json index ff922750c..4b9fbd252 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_polishing.json new file mode 100644 index 000000000..11c8c4b4b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_recombination.json new file mode 100644 index 000000000..bd73a980d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "item": "mineralogy:pegmatite_brick_slab" + } + ], + "result": { + "item": "mineralogy:pegmatite_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs.json index 6718c41fc..b23441960 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs_polishing.json new file mode 100644 index 000000000..be078c913 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall.json index 84d4064e8..bd05bf3f3 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall_polishing.json new file mode 100644 index 000000000..6df44e291 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/pegmatite_cobblestone.json index a9cf4e5b9..3bf8cb33f 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/pegmatite" + "tag": "mineralogy:stones/pegmatite" }, { - "tag": "mineralogy:crafting_materials/pegmatite" + "tag": "mineralogy:stones/pegmatite" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json b/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json index b4772ba8e..6cae29c8d 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:pegmatite_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/pegmatite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:pegmatite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/pegmatite_furnace_from_rock.json deleted file mode 100644 index f4f1687d4..000000000 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..cd0dba4de --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_smooth_brick_slab" + }, + { + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slab_recombination.json new file mode 100644 index 000000000..f60fdf06e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "item": "mineralogy:pegmatite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slabs_to_brick.json new file mode 100644 index 000000000..1655a9123 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_stairs_to_brick.json new file mode 100644 index 000000000..9bd261079 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_walls_to_brick.json new file mode 100644 index 000000000..4d7e68fb3 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_polishing.json new file mode 100644 index 000000000..f859d7e9b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_recombination.json new file mode 100644 index 000000000..352bb3402 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_slab" + }, + { + "item": "mineralogy:pegmatite_slab" + } + ], + "result": { + "item": "mineralogy:pegmatite", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slabs_to_brick.json new file mode 100644 index 000000000..1243d2acf --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_slab" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_polishing.json new file mode 100644 index 000000000..645734747 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_to_brick.json new file mode 100644 index 000000000..36d23fac8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_stairs" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_wall_polishing.json new file mode 100644 index 000000000..f59ff1905 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_walls_to_brick.json new file mode 100644 index 000000000..3282211d8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_wall" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_axe.json index 96b7a10fa..5cd4906e3 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:pegmatite_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:pegmatite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_blank.json index 9481a40ff..f43dd423f 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_cross.json index 4d3d012b3..3f50b2d4b 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hammer.json index 223fde7e9..b7e8cefb9 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hoe.json index 68ae5309b..9cb93d1b1 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:pegmatite_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:pegmatite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_horizontal.json index 29aae5325..f67af22d5 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_i.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_i.json index b5e0091d4..cff042172 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_left.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_left.json index cc4697e46..6affaaa17 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_pickaxe.json index be5598a51..ea31e0d16 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:pegmatite_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:pegmatite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_plus.json index c050dabf1..29419fe54 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_right.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_right.json index 6a794203b..13d4c1644 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_left" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_left" + }, + { + "item": "mineralogy:pegmatite_relief_left" + } + ], + "result": { + "item": "mineralogy:pegmatite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_sword.json index a9287c5e0..c80a9439b 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:pegmatite_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:pegmatite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_vertical.json index bd2c68fe9..4d9f70604 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json b/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json index 1de7cfed5..33b4276a2 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite" + } + }, + "result": { + "item": "mineralogy:pegmatite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_slab_from_pegmatite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/pegmatite_slab_from_pegmatite_stonecutting.json deleted file mode 100644 index 75ea50a79..000000000 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_slab_from_pegmatite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/pegmatite" - }, - "result": "mineralogy:pegmatite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json index a87c062a7..178032c8a 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/pegmatite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:pegmatite_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/pegmatite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick.json index e3be488f2..5bf17b549 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_furnace.json index 57ad5f5a2..8fb322d7a 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/pegmatite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_slab.json index bda37c38d..ee414e382 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_stairs.json index fea77c2c6..b8a18498d 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_wall.json index d28b04493..99e8a7dde 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_furnace.json index 13a733ee6..ac35291a6 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/pegmatite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_slab.json index f7ba8959f..342db82d0 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_stairs.json index 519d22921..7dddf1f7d 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_wall.json index 5083a4ecf..edff75596 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json b/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json index f140c3d1c..ed97b6ce5 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite" + } + }, + "result": { + "item": "mineralogy:pegmatite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs_from_pegmatite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/pegmatite_stairs_from_pegmatite_stonecutting.json deleted file mode 100644 index c28271f80..000000000 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs_from_pegmatite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/pegmatite" - }, - "result": "mineralogy:pegmatite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json b/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json index e4ee88436..0439595f0 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite" + } + }, + "result": { + "item": "mineralogy:pegmatite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_wall_from_pegmatite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/pegmatite_wall_from_pegmatite_stonecutting.json deleted file mode 100644 index d3b4d6265..000000000 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_wall_from_pegmatite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/pegmatite" - }, - "result": "mineralogy:pegmatite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick.json index d1f97d0c9..f4292382e 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite" + } + }, + "result": { + "item": "mineralogy:peridotite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_block_polishing.json new file mode 100644 index 000000000..d0d0eec5e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_furnace.json index f5a6e6cbe..e8a51d7cc 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/peridotite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab.json index f01aefb29..7c695b5cc 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_brick" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_polishing.json new file mode 100644 index 000000000..502a66d02 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_recombination.json new file mode 100644 index 000000000..0fceecc5f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick_slab" + }, + { + "item": "mineralogy:peridotite_brick_slab" + } + ], + "result": { + "item": "mineralogy:peridotite_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs.json index b18e4b4df..2070ce999 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/brick" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs_polishing.json new file mode 100644 index 000000000..cf0beeeae --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall.json index d4d2251cd..0091e94d7 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/brick" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall_polishing.json new file mode 100644 index 000000000..472f689a6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/peridotite_cobblestone.json index d3ccef1b7..aee131493 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/peridotite" + "tag": "mineralogy:stones/peridotite" }, { - "tag": "mineralogy:crafting_materials/peridotite" + "tag": "mineralogy:stones/peridotite" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json b/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json index 2fd14f261..b9833b595 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:peridotite_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/peridotite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:peridotite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/peridotite_furnace_from_rock.json deleted file mode 100644 index e235b248e..000000000 --- a/src/main/resources/data/mineralogy/recipes/peridotite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..e0d054d38 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_smooth_brick_slab" + }, + { + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_slab_recombination.json new file mode 100644 index 000000000..c14f9c23d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "item": "mineralogy:peridotite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_slabs_to_brick.json new file mode 100644 index 000000000..016ff9bdf --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_stairs_to_brick.json new file mode 100644 index 000000000..5664ec164 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_walls_to_brick.json new file mode 100644 index 000000000..dbcb6b093 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_polishing.json new file mode 100644 index 000000000..d34646361 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_recombination.json new file mode 100644 index 000000000..9149d6bca --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_slab" + }, + { + "item": "mineralogy:peridotite_slab" + } + ], + "result": { + "item": "mineralogy:peridotite", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slabs_to_brick.json new file mode 100644 index 000000000..bfab900e5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_slab" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_polishing.json new file mode 100644 index 000000000..a64d71581 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_to_brick.json new file mode 100644 index 000000000..af6a11b46 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_stairs" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_wall_polishing.json new file mode 100644 index 000000000..272551f5e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_walls_to_brick.json new file mode 100644 index 000000000..42e584607 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_wall" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_axe.json index 9f93bde0e..266019221 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:peridotite_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:peridotite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_blank.json index 8fb57a8a2..ec9784a6b 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_cross.json index 187fb0846..c7a8d7f6e 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_hammer.json index c5951c183..9ff5008ed 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_hoe.json index b3e8a26c8..f357407ee 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:peridotite_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:peridotite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_horizontal.json index c7255cec4..474db4cc6 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_i.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_i.json index 3e0f6b7e4..dc65c1856 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_left.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_left.json index 7b3fc457e..95faea809 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_pickaxe.json index 59c261ef0..14b7a567c 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:peridotite_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:peridotite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_plus.json index fd81dedad..d91ed9c56 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_right.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_right.json index 424894cdf..961c67612 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_left" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_left" + }, + { + "item": "mineralogy:peridotite_relief_left" + } + ], + "result": { + "item": "mineralogy:peridotite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_sword.json index 705284bbf..9da5bbd4e 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:peridotite_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:peridotite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_vertical.json index 05b5e1844..c1cab26e9 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_slab.json b/src/main/resources/data/mineralogy/recipes/peridotite_slab.json index 92301341a..3a6e906ea 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite" + } + }, + "result": { + "item": "mineralogy:peridotite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_slab_from_peridotite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/peridotite_slab_from_peridotite_stonecutting.json deleted file mode 100644 index f2e505829..000000000 --- a/src/main/resources/data/mineralogy/recipes/peridotite_slab_from_peridotite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/peridotite" - }, - "result": "mineralogy:peridotite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json index c8ff4eea0..813f54d41 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/peridotite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:peridotite_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/peridotite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick.json index 42a65bfdf..28c5cabc4 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_furnace.json index 2f6eb521e..d8fa405b8 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/peridotite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_slab.json index 58affaf1d..1058a5718 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_stairs.json index dcc9c49a1..125f4e790 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_wall.json index aaeba01a6..e78eb105e 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_furnace.json index 3ea97fe12..15d785e3a 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/peridotite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_slab.json index 56d273666..93594bf2a 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_stairs.json index f1769da9e..8bb2d1b6c 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_wall.json index f1c203e40..6f5fd17d9 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json b/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json index aba8814d5..d785eefb8 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite" + } + }, + "result": { + "item": "mineralogy:peridotite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_stairs_from_peridotite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/peridotite_stairs_from_peridotite_stonecutting.json deleted file mode 100644 index f344b0fe6..000000000 --- a/src/main/resources/data/mineralogy/recipes/peridotite_stairs_from_peridotite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/peridotite" - }, - "result": "mineralogy:peridotite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_wall.json b/src/main/resources/data/mineralogy/recipes/peridotite_wall.json index 582ca95a4..a713e3d42 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite" + } + }, + "result": { + "item": "mineralogy:peridotite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_wall_from_peridotite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/peridotite_wall_from_peridotite_stonecutting.json deleted file mode 100644 index 82eef2347..000000000 --- a/src/main/resources/data/mineralogy/recipes/peridotite_wall_from_peridotite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/peridotite" - }, - "result": "mineralogy:peridotite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/phosphorous_block.json b/src/main/resources/data/mineralogy/recipes/phosphorous_block.json index 92b40456f..11a910cd5 100644 --- a/src/main/resources/data/mineralogy/recipes/phosphorous_block.json +++ b/src/main/resources/data/mineralogy/recipes/phosphorous_block.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_block" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,10 +17,11 @@ ], "key": { "x": { - "tag": "forge:dusts/phosphorous" + "item": "mineralogy:phosphorous_dust" } }, "result": { - "item": "mineralogy:phosphorous_block" + "item": "mineralogy:phosphorous_block", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json b/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json index 0937f7af7..ca2ad9d1a 100644 --- a/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json +++ b/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_dust" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick.json index b8c642850..1366755d1 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite" + } + }, + "result": { + "item": "mineralogy:phyllite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_block_polishing.json new file mode 100644 index 000000000..b63bf5fb7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_furnace.json index a2817aca8..51213d8e1 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/phyllite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab.json index 8da8e5b05..339ed5891 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_brick" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_polishing.json new file mode 100644 index 000000000..905fa47a5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_recombination.json new file mode 100644 index 000000000..4e32daad0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick_slab" + }, + { + "item": "mineralogy:phyllite_brick_slab" + } + ], + "result": { + "item": "mineralogy:phyllite_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs.json index 235097d1e..368dfdf17 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/brick" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs_polishing.json new file mode 100644 index 000000000..12e8b4b4c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall.json index 0e6760dfe..60fe51ecf 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/brick" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall_polishing.json new file mode 100644 index 000000000..9f18172ae --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/phyllite_cobblestone.json index d724d4952..a76039d7d 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/phyllite" + "tag": "mineralogy:stones/phyllite" }, { - "tag": "mineralogy:crafting_materials/phyllite" + "tag": "mineralogy:stones/phyllite" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json b/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json index 2d89e4e8d..084dd53e0 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:phyllite_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/phyllite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:phyllite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/phyllite_furnace_from_rock.json deleted file mode 100644 index fa6802d77..000000000 --- a/src/main/resources/data/mineralogy/recipes/phyllite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..2a7b898ac --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_smooth_brick_slab" + }, + { + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_slab_recombination.json new file mode 100644 index 000000000..2d7eb3f23 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "item": "mineralogy:phyllite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_slabs_to_brick.json new file mode 100644 index 000000000..de6725d50 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_stairs_to_brick.json new file mode 100644 index 000000000..592918e9b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_walls_to_brick.json new file mode 100644 index 000000000..b64a565a2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_polishing.json new file mode 100644 index 000000000..ee0f2460b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_recombination.json new file mode 100644 index 000000000..ff74ea325 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_slab" + }, + { + "item": "mineralogy:phyllite_slab" + } + ], + "result": { + "item": "mineralogy:phyllite", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slabs_to_brick.json new file mode 100644 index 000000000..8ed80829e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_slab" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_polishing.json new file mode 100644 index 000000000..e2ca9fed8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_to_brick.json new file mode 100644 index 000000000..35a834f78 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_stairs" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_wall_polishing.json new file mode 100644 index 000000000..1585f03bd --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_walls_to_brick.json new file mode 100644 index 000000000..4af6a76f7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_wall" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_axe.json index 6d9d024b6..f1ccb8dc1 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:phyllite_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:phyllite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_blank.json index 47dd4c62a..3a0646940 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_cross.json index 3b13e8404..9243dd686 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_hammer.json index 3f2a76d68..bdc8f3f6d 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_hoe.json index d9b04aaaf..d0e06b689 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:phyllite_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:phyllite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_horizontal.json index ba147f305..6ca55eaa8 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_i.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_i.json index 7166781d1..1cee5a16f 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_left.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_left.json index abc0fe39e..0651625ef 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_pickaxe.json index 136219691..5c72f2b48 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:phyllite_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:phyllite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_plus.json index f62a622f5..c4f1d3d35 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_right.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_right.json index 095f57504..dee5b3860 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_left" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_left" + }, + { + "item": "mineralogy:phyllite_relief_left" + } + ], + "result": { + "item": "mineralogy:phyllite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_sword.json index 60a43cea3..9c2e2b44a 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:phyllite_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:phyllite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_vertical.json index 47d3f4aca..46f6bbdcd 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_slab.json b/src/main/resources/data/mineralogy/recipes/phyllite_slab.json index 3e05de0b7..6602ce093 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite" + } + }, + "result": { + "item": "mineralogy:phyllite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_slab_from_phyllite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/phyllite_slab_from_phyllite_stonecutting.json deleted file mode 100644 index d30825141..000000000 --- a/src/main/resources/data/mineralogy/recipes/phyllite_slab_from_phyllite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/phyllite" - }, - "result": "mineralogy:phyllite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json index 8bada6c0c..b39bb2e35 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/phyllite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:phyllite_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/phyllite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick.json index c6b2f1dea..0160af8f8 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_furnace.json index adc2371b7..f5f33c409 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/phyllite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_slab.json index e52be8e1a..c66c840bf 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_stairs.json index 96579145a..cd2eb2eb2 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_wall.json index 7402fd13d..d47389766 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_furnace.json index df8ae65b7..fd5543771 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/phyllite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_slab.json index 2eef86cef..b5d5d106f 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_stairs.json index 149d7bf80..df2be36a2 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_wall.json index 81e058670..3b9ecc7b8 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json b/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json index 132bd081d..335a21ec4 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite" + } + }, + "result": { + "item": "mineralogy:phyllite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_stairs_from_phyllite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/phyllite_stairs_from_phyllite_stonecutting.json deleted file mode 100644 index d5995cea8..000000000 --- a/src/main/resources/data/mineralogy/recipes/phyllite_stairs_from_phyllite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/phyllite" - }, - "result": "mineralogy:phyllite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_wall.json b/src/main/resources/data/mineralogy/recipes/phyllite_wall.json index 57805f2e0..0e9062186 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite" + } + }, + "result": { + "item": "mineralogy:phyllite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_wall_from_phyllite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/phyllite_wall_from_phyllite_stonecutting.json deleted file mode 100644 index d1a5e36b6..000000000 --- a/src/main/resources/data/mineralogy/recipes/phyllite_wall_from_phyllite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/phyllite" - }, - "result": "mineralogy:phyllite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick.json index c1235bc67..ba748ecd3 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite" + } + }, + "result": { + "item": "mineralogy:quartzite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_block_polishing.json new file mode 100644 index 000000000..dce62a83e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_furnace.json index ab0ce0205..0bbed3c2e 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/quartzite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab.json index b9659b930..29a9eda81 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_brick" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_polishing.json new file mode 100644 index 000000000..caa10ecb4 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_recombination.json new file mode 100644 index 000000000..4660b18f4 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick_slab" + }, + { + "item": "mineralogy:quartzite_brick_slab" + } + ], + "result": { + "item": "mineralogy:quartzite_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs.json index bca9e0282..b2f4f29cc 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/brick" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs_polishing.json new file mode 100644 index 000000000..1df8cca58 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall.json index 1689cf22e..52cab82f3 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/brick" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall_polishing.json new file mode 100644 index 000000000..559564a2f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/quartzite_cobblestone.json index 7228c72b6..3c46e4b72 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/quartzite" + "tag": "mineralogy:stones/quartzite" }, { - "tag": "mineralogy:crafting_materials/quartzite" + "tag": "mineralogy:stones/quartzite" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json b/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json index aa6b73a76..125fc5d62 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:quartzite_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/quartzite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:quartzite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/quartzite_furnace_from_rock.json deleted file mode 100644 index 42ff1458d..000000000 --- a/src/main/resources/data/mineralogy/recipes/quartzite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..44347ac27 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_smooth_brick_slab" + }, + { + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_slab_recombination.json new file mode 100644 index 000000000..82a66b192 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "item": "mineralogy:quartzite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_slabs_to_brick.json new file mode 100644 index 000000000..59e5f36df --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_stairs_to_brick.json new file mode 100644 index 000000000..bb8e23534 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_walls_to_brick.json new file mode 100644 index 000000000..e7c0e2f22 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_polishing.json new file mode 100644 index 000000000..37cdc6e0f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_recombination.json new file mode 100644 index 000000000..c388ded48 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_slab" + }, + { + "item": "mineralogy:quartzite_slab" + } + ], + "result": { + "item": "mineralogy:quartzite", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slabs_to_brick.json new file mode 100644 index 000000000..318196f51 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_slab" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_polishing.json new file mode 100644 index 000000000..44ed038af --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_to_brick.json new file mode 100644 index 000000000..3a2ce2c4d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_stairs" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_wall_polishing.json new file mode 100644 index 000000000..d30dc2ab1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_walls_to_brick.json new file mode 100644 index 000000000..3b0a96743 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_wall" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_axe.json index 132d8b07c..eca3c339b 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:quartzite_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:quartzite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_blank.json index 406a4b976..0c2d0f239 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_cross.json index c75064056..41f244370 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_hammer.json index be9175874..1822b2812 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_hoe.json index 4780c016f..8eac2e2f0 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:quartzite_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:quartzite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_horizontal.json index 970498214..3c284d923 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_i.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_i.json index 7d348f7d5..6403850a7 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_left.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_left.json index 8a59fb051..f0d1d1cd6 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_pickaxe.json index 47a5238f5..db3a4e068 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:quartzite_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:quartzite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_plus.json index 292f6c947..052965b84 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_right.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_right.json index 9f84e57b4..9f3634197 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_left" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_left" + }, + { + "item": "mineralogy:quartzite_relief_left" + } + ], + "result": { + "item": "mineralogy:quartzite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_sword.json index adcdcce0b..7c861bbfe 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:quartzite_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:quartzite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_vertical.json index 283dbc478..ab95424c9 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_slab.json b/src/main/resources/data/mineralogy/recipes/quartzite_slab.json index 38c95aa48..87b22089c 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite" + } + }, + "result": { + "item": "mineralogy:quartzite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_slab_from_quartzite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/quartzite_slab_from_quartzite_stonecutting.json deleted file mode 100644 index 1a0928faa..000000000 --- a/src/main/resources/data/mineralogy/recipes/quartzite_slab_from_quartzite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/quartzite" - }, - "result": "mineralogy:quartzite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json index 07f560626..219601757 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/quartzite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:quartzite_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/quartzite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick.json index 55d7c0cb2..0cfaf6c80 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_furnace.json index 4e40f1536..da67dabf0 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/quartzite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_slab.json index 5432ec8b0..4910c71ba 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_stairs.json index 41ab13288..fa7cdb34b 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_wall.json index a59e87217..55fe8d9f8 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_furnace.json index b32bb0923..b758875ba 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/quartzite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_slab.json index 60e6b0b5a..5f852c1d0 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_stairs.json index d6bee65a2..1f55a0f51 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_wall.json index c6415f819..21418ef95 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json b/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json index 35c489994..7703c80a4 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite" + } + }, + "result": { + "item": "mineralogy:quartzite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_stairs_from_quartzite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/quartzite_stairs_from_quartzite_stonecutting.json deleted file mode 100644 index 784c4eeb1..000000000 --- a/src/main/resources/data/mineralogy/recipes/quartzite_stairs_from_quartzite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/quartzite" - }, - "result": "mineralogy:quartzite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_wall.json b/src/main/resources/data/mineralogy/recipes/quartzite_wall.json index 06260b1a6..c94c15eb9 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite" + } + }, + "result": { + "item": "mineralogy:quartzite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_wall_from_quartzite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/quartzite_wall_from_quartzite_stonecutting.json deleted file mode 100644 index e36acc232..000000000 --- a/src/main/resources/data/mineralogy/recipes/quartzite_wall_from_quartzite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/quartzite" - }, - "result": "mineralogy:quartzite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json index 9fe2a8d81..61e53796a 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_block_polishing.json new file mode 100644 index 000000000..9ed9a4d18 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_furnace.json index 59caf5915..9a1bbe0db 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rhyolite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab.json index 2cd11f6c2..17d62f982 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_polishing.json new file mode 100644 index 000000000..39586eda0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_recombination.json new file mode 100644 index 000000000..a984f7ee0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "item": "mineralogy:rhyolite_brick_slab" + } + ], + "result": { + "item": "mineralogy:rhyolite_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs.json index 29327380a..209d9eed9 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs_polishing.json new file mode 100644 index 000000000..2ca24b1cf --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall.json index 628743e9c..1d032d1a3 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall_polishing.json new file mode 100644 index 000000000..d2effdce8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/rhyolite_cobblestone.json index 8dc0e9d2c..220b8579e 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/rhyolite" + "tag": "mineralogy:stones/rhyolite" }, { - "tag": "mineralogy:crafting_materials/rhyolite" + "tag": "mineralogy:stones/rhyolite" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json b/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json index 0e3fac2c5..c4554d33f 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rhyolite_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rhyolite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rhyolite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/rhyolite_furnace_from_rock.json deleted file mode 100644 index 2f0a4678a..000000000 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_brick_slab_recombination.json new file mode 100644 index 000000000..5e04d5557 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_smooth_brick_slab" + }, + { + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slab_recombination.json new file mode 100644 index 000000000..6f8b89b44 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "item": "mineralogy:rhyolite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slabs_to_brick.json new file mode 100644 index 000000000..66769ba36 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_stairs_to_brick.json new file mode 100644 index 000000000..b77c4d61f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_walls_to_brick.json new file mode 100644 index 000000000..0388c593f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_polishing.json new file mode 100644 index 000000000..4dc0441a2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_recombination.json new file mode 100644 index 000000000..e3044fa0d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_slab" + }, + { + "item": "mineralogy:rhyolite_slab" + } + ], + "result": { + "item": "mineralogy:rhyolite", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slabs_to_brick.json new file mode 100644 index 000000000..372fac0e8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_slab" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_polishing.json new file mode 100644 index 000000000..6774976ea --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_to_brick.json new file mode 100644 index 000000000..d115e9197 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_stairs" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_wall_polishing.json new file mode 100644 index 000000000..71942da18 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_walls_to_brick.json new file mode 100644 index 000000000..bb2a840fe --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_wall" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_axe.json index 31ec846df..19179e11b 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:rhyolite_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:rhyolite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_blank.json index 989ffe39b..17c4582a7 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_cross.json index 534a432c3..005b4b276 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hammer.json index 56542432b..2f40e36b4 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hoe.json index 1dd7d6665..fa8fe35ed 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:rhyolite_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:rhyolite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_horizontal.json index 234ec04a7..92382e245 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_i.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_i.json index 8d6ace499..0604cb42c 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_left.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_left.json index c76346b3f..68547366b 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_pickaxe.json index d0b6e761b..dc39e32ca 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:rhyolite_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:rhyolite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_plus.json index e5a9ff54e..fd29e41d0 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_right.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_right.json index e12be459f..c18ee6d81 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_left" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_left" + }, + { + "item": "mineralogy:rhyolite_relief_left" + } + ], + "result": { + "item": "mineralogy:rhyolite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_sword.json index 7cea17c0b..6b597cd4f 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:rhyolite_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:rhyolite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_vertical.json index 6e908441f..74f85e2c0 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json b/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json index c098faa26..c7132fd9e 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite" + } + }, + "result": { + "item": "mineralogy:rhyolite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_slab_from_rhyolite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/rhyolite_slab_from_rhyolite_stonecutting.json deleted file mode 100644 index 9b4ed0f26..000000000 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_slab_from_rhyolite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/rhyolite" - }, - "result": "mineralogy:rhyolite_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json index 0d90591df..8c611b1d2 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/rhyolite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:rhyolite_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/rhyolite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick.json index 03e545433..bb58f652b 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_furnace.json index 90210de1a..808400f4c 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rhyolite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_slab.json index adb38fc9a..5da8456a4 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_stairs.json index 4e7e53eb3..e09a11c80 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_wall.json index eed7fd9a7..35a9ceeab 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_furnace.json index 1b8a2198a..feade1781 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rhyolite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_slab.json index c4b37dbcd..76aa8b7c7 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_stairs.json index edd1977b5..eb75f55f8 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_wall.json index 332ff85fc..331be81b3 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json b/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json index fb57d486c..c2812d03a 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite" + } + }, + "result": { + "item": "mineralogy:rhyolite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs_from_rhyolite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/rhyolite_stairs_from_rhyolite_stonecutting.json deleted file mode 100644 index 8f28f6679..000000000 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs_from_rhyolite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/rhyolite" - }, - "result": "mineralogy:rhyolite_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json b/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json index ca0267d80..056bc8445 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite" + } + }, + "result": { + "item": "mineralogy:rhyolite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_wall_from_rhyolite_stonecutting.json b/src/main/resources/data/mineralogy/recipes/rhyolite_wall_from_rhyolite_stonecutting.json deleted file mode 100644 index 9f0e3d818..000000000 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_wall_from_rhyolite_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/rhyolite" - }, - "result": "mineralogy:rhyolite_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt.json b/src/main/resources/data/mineralogy/recipes/rock_salt.json index 03e99bf44..b22dfdd8b 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -10,6 +16,7 @@ } }, "result": { - "item": "mineralogy:rock_salt" + "item": "mineralogy:rock_salt", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick.json index cc8e6edfc..b3b627655 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_block_polishing.json new file mode 100644 index 000000000..b62687fcc --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_furnace.json index b316b31f3..e1900ef3e 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rock_salt/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab.json index eb6e8e620..904b02b49 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_polishing.json new file mode 100644 index 000000000..ac588fa27 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_recombination.json new file mode 100644 index 000000000..6f8348912 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "item": "mineralogy:rock_salt_brick_slab" + } + ], + "result": { + "item": "mineralogy:rock_salt_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs.json index c319cf971..07e6da9b5 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs_polishing.json new file mode 100644 index 000000000..f25f8f8f1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall.json index 33690f29a..299a47a5c 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall_polishing.json new file mode 100644 index 000000000..2f172462c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_cobblestone.json b/src/main/resources/data/mineralogy/recipes/rock_salt_cobblestone.json index c80d39e2f..b8ced0161 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/rock_salt" + "tag": "mineralogy:stones/rock_salt" }, { - "tag": "mineralogy:crafting_materials/rock_salt" + "tag": "mineralogy:stones/rock_salt" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_dust.json b/src/main/resources/data/mineralogy/recipes/rock_salt_dust.json index 0858c92e1..d89728621 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_dust.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_dust.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_dust" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_furnace.json b/src/main/resources/data/mineralogy/recipes/rock_salt_furnace.json index 0e4f27294..9840bb0b8 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rock_salt_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rock_salt" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rock_salt_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/rock_salt_furnace_from_rock.json deleted file mode 100644 index 9c16e8851..000000000 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_brick_slab_recombination.json new file mode 100644 index 000000000..1521e6f9c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_smooth_brick_slab" + }, + { + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slab_recombination.json new file mode 100644 index 000000000..74e690adf --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "item": "mineralogy:rock_salt_smooth_slab" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slabs_to_brick.json new file mode 100644 index 000000000..b47446f2d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth_slab" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_stairs_to_brick.json new file mode 100644 index 000000000..b046e764c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_walls_to_brick.json new file mode 100644 index 000000000..81d569b69 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth_wall" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_polishing.json new file mode 100644 index 000000000..7b6a1c32e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_recombination.json new file mode 100644 index 000000000..0c720c86a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_slab" + }, + { + "item": "mineralogy:rock_salt_slab" + } + ], + "result": { + "item": "mineralogy:rock_salt", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slabs_to_brick.json new file mode 100644 index 000000000..d6d10173a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_slab" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_polishing.json new file mode 100644 index 000000000..4489e6850 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_to_brick.json new file mode 100644 index 000000000..0aa1afa2d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_stairs" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_wall_polishing.json new file mode 100644 index 000000000..ace497df5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_walls_to_brick.json new file mode 100644 index 000000000..0d710fb0f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_wall" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_axe.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_axe.json index 7cc40d4e3..94779cc68 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:rock_salt_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:rock_salt_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_blank.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_blank.json index 0232ac752..4f5da6560 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_cross.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_cross.json index fed65c95a..d60d3344e 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hammer.json index 340dd3922..edfd9636d 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hoe.json index 95d14df2a..3adeec053 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:rock_salt_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:rock_salt_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_horizontal.json index c3e37d540..e306daa86 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_i.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_i.json index a88828b19..5414a544d 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_left.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_left.json index a4a529c6e..056c6f3fe 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_pickaxe.json index 6bcc90415..2eca858a6 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:rock_salt_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:rock_salt_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_plus.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_plus.json index f358afb09..bb7378df9 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_right.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_right.json index a43c11618..d9b1d02d0 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_left" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_left" + }, + { + "item": "mineralogy:rock_salt_relief_left" + } + ], + "result": { + "item": "mineralogy:rock_salt_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_sword.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_sword.json index 40d5332c9..63e41327f 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:rock_salt_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:rock_salt_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_vertical.json index 2faf6084d..f1a6b7e9a 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_slab.json b/src/main/resources/data/mineralogy/recipes/rock_salt_slab.json index a9d10c246..6d9aa2009 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt" + } + }, + "result": { + "item": "mineralogy:rock_salt_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_slab_from_rock_salt_stonecutting.json b/src/main/resources/data/mineralogy/recipes/rock_salt_slab_from_rock_salt_stonecutting.json deleted file mode 100644 index fbd8d0bf2..000000000 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_slab_from_rock_salt_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/rock_salt" - }, - "result": "mineralogy:rock_salt_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth.json index 170b895db..7c224152c 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/rock_salt" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:rock_salt_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/rock_salt" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick.json index 3ec8d9a7f..04175b6e4 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_furnace.json index 46c2a59be..4d1cd95a7 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rock_salt/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_slab.json index 2db168c61..50c01e847 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth_brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_stairs.json index e49b3a3d5..8333db944 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth_brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_wall.json index e78eb3d50..20bb43335 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth_brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_furnace.json index 0186ba7d7..be9683766 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rock_salt/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_slab.json index 47cfe9ef3..a556887f1 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_stairs.json index 3c1329524..aea7fbce9 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_wall.json index 7d1f4586e..90f341cb6 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_stairs.json b/src/main/resources/data/mineralogy/recipes/rock_salt_stairs.json index edb542b8e..ad4e92704 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt" + } + }, + "result": { + "item": "mineralogy:rock_salt_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_stairs_from_rock_salt_stonecutting.json b/src/main/resources/data/mineralogy/recipes/rock_salt_stairs_from_rock_salt_stonecutting.json deleted file mode 100644 index a5cbb8fad..000000000 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_stairs_from_rock_salt_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/rock_salt" - }, - "result": "mineralogy:rock_salt_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_wall.json b/src/main/resources/data/mineralogy/recipes/rock_salt_wall.json index 7b28b4632..b335dc8b8 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt" + } + }, + "result": { + "item": "mineralogy:rock_salt_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_wall_from_rock_salt_stonecutting.json b/src/main/resources/data/mineralogy/recipes/rock_salt_wall_from_rock_salt_stonecutting.json deleted file mode 100644 index 014b18bc8..000000000 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_wall_from_rock_salt_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/rock_salt" - }, - "result": "mineralogy:rock_salt_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json b/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json index 942a0269f..ebec1319b 100644 --- a/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json +++ b/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json @@ -1,8 +1,18 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltlamp" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "forge:storage_blocks/rock_salt" + "item": "mineralogy:rock_salt" }, { "item": "minecraft:torch" @@ -12,6 +22,7 @@ } ], "result": { - "item": "mineralogy:rocksaltlamp" + "item": "mineralogy:rocksaltlamp", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json b/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json index bb7090cfc..1d073aee8 100644 --- a/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json +++ b/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltstreetlamp" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -14,6 +24,7 @@ } }, "result": { - "item": "mineralogy:rocksaltstreetlamp" + "item": "mineralogy:rocksaltstreetlamp", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick.json b/src/main/resources/data/mineralogy/recipes/schist_brick.json index 91b0880cf..700f53842 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/schist" - } - }, - "result": { - "item": "mineralogy:schist_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist" + } + }, + "result": { + "item": "mineralogy:schist_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_brick_block_polishing.json new file mode 100644 index 000000000..3a6c2bb72 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/schist_brick_furnace.json index faed36618..9dec4c4cf 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:schist_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/schist/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:schist_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_slab.json b/src/main/resources/data/mineralogy/recipes/schist_brick_slab.json index ebb2b1504..32b2c30a1 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_brick" - } - }, - "result": { - "item": "mineralogy:schist_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_brick" + } + }, + "result": { + "item": "mineralogy:schist_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_brick_slab_polishing.json new file mode 100644 index 000000000..3dca3d466 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/schist_brick_slab_recombination.json new file mode 100644 index 000000000..f6b0fb921 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick_slab" + }, + { + "item": "mineralogy:schist_brick_slab" + } + ], + "result": { + "item": "mineralogy:schist_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/schist_brick_stairs.json index 3aaa6d872..b8f8e34c3 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_brick" - } - }, - "result": { - "item": "mineralogy:schist_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/brick" + } + }, + "result": { + "item": "mineralogy:schist_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_brick_stairs_polishing.json new file mode 100644 index 000000000..5b1a6d006 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_wall.json b/src/main/resources/data/mineralogy/recipes/schist_brick_wall.json index e361ef1d9..42b801b34 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_brick" - } - }, - "result": { - "item": "mineralogy:schist_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/brick" + } + }, + "result": { + "item": "mineralogy:schist_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_brick_wall_polishing.json new file mode 100644 index 000000000..26d6bcb7d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_cobblestone.json b/src/main/resources/data/mineralogy/recipes/schist_cobblestone.json index 1a5187d2c..a21552d9f 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/schist_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/schist" + "tag": "mineralogy:stones/schist" }, { - "tag": "mineralogy:crafting_materials/schist" + "tag": "mineralogy:stones/schist" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/schist_furnace.json b/src/main/resources/data/mineralogy/recipes/schist_furnace.json index 9efb52d40..e1e3acd01 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:schist_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/schist" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:schist_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/schist_furnace_from_rock.json deleted file mode 100644 index 672ec8fd9..000000000 --- a/src/main/resources/data/mineralogy/recipes/schist_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/schist" - } - }, - "result": { - "item": "mineralogy:schist_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/schist_polished_brick_slab_recombination.json new file mode 100644 index 000000000..17d769f67 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_smooth_brick_slab" + }, + { + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:schist_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/schist_polished_slab_recombination.json new file mode 100644 index 000000000..c196e4be1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_smooth_slab" + }, + { + "item": "mineralogy:schist_smooth_slab" + } + ], + "result": { + "item": "mineralogy:schist_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_polished_slabs_to_brick.json new file mode 100644 index 000000000..f59a0b429 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth_slab" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_polished_stairs_to_brick.json new file mode 100644 index 000000000..c058678e5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_polished_walls_to_brick.json new file mode 100644 index 000000000..044870d3e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth_wall" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_raw_slab_polishing.json new file mode 100644 index 000000000..dffe0aa33 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/schist_raw_slab_recombination.json new file mode 100644 index 000000000..a4dd98d80 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_slab" + }, + { + "item": "mineralogy:schist_slab" + } + ], + "result": { + "item": "mineralogy:schist", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_raw_slabs_to_brick.json new file mode 100644 index 000000000..4c3c751a0 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_slab" + } + }, + "result": { + "item": "mineralogy:schist_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_polishing.json new file mode 100644 index 000000000..3282dc9a7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_to_brick.json new file mode 100644 index 000000000..defb71637 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_stairs" + } + }, + "result": { + "item": "mineralogy:schist_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_raw_wall_polishing.json new file mode 100644 index 000000000..260352f79 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_raw_walls_to_brick.json new file mode 100644 index 000000000..6869da865 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_wall" + } + }, + "result": { + "item": "mineralogy:schist_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_axe.json b/src/main/resources/data/mineralogy/recipes/schist_relief_axe.json index 5543e323f..b6d119f07 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:schist_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:schist_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_blank.json b/src/main/resources/data/mineralogy/recipes/schist_relief_blank.json index 8f000cb0e..68ff4e68d 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - } - }, - "result": { - "item": "mineralogy:schist_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth" + } + }, + "result": { + "item": "mineralogy:schist_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_cross.json b/src/main/resources/data/mineralogy/recipes/schist_relief_cross.json index f49efecb0..3932f6f92 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/schist_relief_hammer.json index 937f5156b..94447f953 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/schist_relief_hoe.json index 7498bc8b5..54e71839a 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:schist_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:schist_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/schist_relief_horizontal.json index fbf881767..1721315e5 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_i.json b/src/main/resources/data/mineralogy/recipes/schist_relief_i.json index 64b740a49..6df0a99b9 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_left.json b/src/main/resources/data/mineralogy/recipes/schist_relief_left.json index e2c9905b4..0338d059b 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/schist_relief_pickaxe.json index 5cc4a40fe..539ab900d 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:schist_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:schist_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_plus.json b/src/main/resources/data/mineralogy/recipes/schist_relief_plus.json index 6b5c0a9ec..841e74ccd 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_right.json b/src/main/resources/data/mineralogy/recipes/schist_relief_right.json index 3f74e9f53..98b6c6ea3 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_left" - } - }, - "result": { - "item": "mineralogy:schist_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_left" + }, + { + "item": "mineralogy:schist_relief_left" + } + ], + "result": { + "item": "mineralogy:schist_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_sword.json b/src/main/resources/data/mineralogy/recipes/schist_relief_sword.json index c5b709a26..c07f68ccc 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:schist_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:schist_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/schist_relief_vertical.json index ff58f4d2f..8b221ae1d 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_slab.json b/src/main/resources/data/mineralogy/recipes/schist_slab.json index b2077bf26..4e3cb02b7 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/schist" - } - }, - "result": { - "item": "mineralogy:schist_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist" + } + }, + "result": { + "item": "mineralogy:schist_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_slab_from_schist_stonecutting.json b/src/main/resources/data/mineralogy/recipes/schist_slab_from_schist_stonecutting.json deleted file mode 100644 index f483d21a2..000000000 --- a/src/main/resources/data/mineralogy/recipes/schist_slab_from_schist_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/schist" - }, - "result": "mineralogy:schist_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth.json b/src/main/resources/data/mineralogy/recipes/schist_smooth.json index dbc4d557d..eb54c8a5b 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/schist" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:schist_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/schist" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick.json index 443cc804d..d571aca72 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_furnace.json index 03b9be473..2410e89dd 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/schist/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_slab.json index e710e756c..12683ff7f 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth_brick" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth_brick" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_stairs.json index 75cdf6e93..741c2a1a8 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth_brick" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth_brick" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_wall.json index 33d854428..e53b1bd68 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth_brick" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth_brick" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_furnace.json index 8af1ec2dd..9bad865f9 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:schist_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/schist/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:schist_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_slab.json index 92ab5176e..851b92142 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - } - }, - "result": { - "item": "mineralogy:schist_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth" + } + }, + "result": { + "item": "mineralogy:schist_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_stairs.json index b9d335e00..eed2eb5f3 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - } - }, - "result": { - "item": "mineralogy:schist_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth" + } + }, + "result": { + "item": "mineralogy:schist_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_wall.json index c7f007c0d..5cf84a98f 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - } - }, - "result": { - "item": "mineralogy:schist_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth" + } + }, + "result": { + "item": "mineralogy:schist_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_stairs.json b/src/main/resources/data/mineralogy/recipes/schist_stairs.json index 91772505d..e2bc4bba0 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/schist" - } - }, - "result": { - "item": "mineralogy:schist_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist" + } + }, + "result": { + "item": "mineralogy:schist_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_stairs_from_schist_stonecutting.json b/src/main/resources/data/mineralogy/recipes/schist_stairs_from_schist_stonecutting.json deleted file mode 100644 index b716d2a90..000000000 --- a/src/main/resources/data/mineralogy/recipes/schist_stairs_from_schist_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/schist" - }, - "result": "mineralogy:schist_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/schist_wall.json b/src/main/resources/data/mineralogy/recipes/schist_wall.json index ba114d794..3868aa58f 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/schist" - } - }, - "result": { - "item": "mineralogy:schist_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist" + } + }, + "result": { + "item": "mineralogy:schist_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_wall_from_schist_stonecutting.json b/src/main/resources/data/mineralogy/recipes/schist_wall_from_schist_stonecutting.json deleted file mode 100644 index 6cbad960d..000000000 --- a/src/main/resources/data/mineralogy/recipes/schist_wall_from_schist_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/schist" - }, - "result": "mineralogy:schist_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_brick.json index ea0d7c357..dcc2e1126 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/scoria" - } - }, - "result": { - "item": "mineralogy:scoria_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria" + } + }, + "result": { + "item": "mineralogy:scoria_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_block_polishing.json new file mode 100644 index 000000000..ebfc3a141 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_furnace.json index cf43d9796..c1b5afaae 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:scoria_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/scoria/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:scoria_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab.json index 1b731a8fd..1efee7db3 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_brick" - } - }, - "result": { - "item": "mineralogy:scoria_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_brick" + } + }, + "result": { + "item": "mineralogy:scoria_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_polishing.json new file mode 100644 index 000000000..ce47c915d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_recombination.json new file mode 100644 index 000000000..651f3baba --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick_slab" + }, + { + "item": "mineralogy:scoria_brick_slab" + } + ], + "result": { + "item": "mineralogy:scoria_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs.json index b7eb4b4d2..adeb01e97 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_brick" - } - }, - "result": { - "item": "mineralogy:scoria_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/brick" + } + }, + "result": { + "item": "mineralogy:scoria_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs_polishing.json new file mode 100644 index 000000000..2166d55c6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_wall.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_wall.json index bde1ee20a..51d52a26e 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_brick" - } - }, - "result": { - "item": "mineralogy:scoria_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/brick" + } + }, + "result": { + "item": "mineralogy:scoria_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_wall_polishing.json new file mode 100644 index 000000000..b71340d70 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_cobblestone.json b/src/main/resources/data/mineralogy/recipes/scoria_cobblestone.json index e0f386af4..19a3c93c2 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/scoria" + "tag": "mineralogy:stones/scoria" }, { - "tag": "mineralogy:crafting_materials/scoria" + "tag": "mineralogy:stones/scoria" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/scoria_furnace.json b/src/main/resources/data/mineralogy/recipes/scoria_furnace.json index 68fe108c1..532b67e4a 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:scoria_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/scoria" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:scoria_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/scoria_furnace_from_rock.json deleted file mode 100644 index b8f1219db..000000000 --- a/src/main/resources/data/mineralogy/recipes/scoria_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/scoria" - } - }, - "result": { - "item": "mineralogy:scoria_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_brick_slab_recombination.json new file mode 100644 index 000000000..0901950eb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_smooth_brick_slab" + }, + { + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_slab_recombination.json new file mode 100644 index 000000000..5168e74cf --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_smooth_slab" + }, + { + "item": "mineralogy:scoria_smooth_slab" + } + ], + "result": { + "item": "mineralogy:scoria_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_slabs_to_brick.json new file mode 100644 index 000000000..c32bce248 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth_slab" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_stairs_to_brick.json new file mode 100644 index 000000000..a458a3266 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_walls_to_brick.json new file mode 100644 index 000000000..fa9df9e03 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth_wall" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_polishing.json new file mode 100644 index 000000000..da86a74f9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_recombination.json new file mode 100644 index 000000000..a36087235 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_slab" + }, + { + "item": "mineralogy:scoria_slab" + } + ], + "result": { + "item": "mineralogy:scoria", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_slabs_to_brick.json new file mode 100644 index 000000000..c00180ca8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_slab" + } + }, + "result": { + "item": "mineralogy:scoria_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_polishing.json new file mode 100644 index 000000000..a115f7f1a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_to_brick.json new file mode 100644 index 000000000..5728bb447 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_stairs" + } + }, + "result": { + "item": "mineralogy:scoria_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_wall_polishing.json new file mode 100644 index 000000000..189e11629 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_walls_to_brick.json new file mode 100644 index 000000000..2d5b479a5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_wall" + } + }, + "result": { + "item": "mineralogy:scoria_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_axe.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_axe.json index b5f80d77a..c5ce26f9d 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:scoria_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:scoria_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_blank.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_blank.json index 36cea68b3..681d0e77a 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - } - }, - "result": { - "item": "mineralogy:scoria_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth" + } + }, + "result": { + "item": "mineralogy:scoria_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_cross.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_cross.json index 7af7cbb0b..3a5fa8528 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_hammer.json index eb954bc9c..3ac5a6b84 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_hoe.json index db8657667..b89aaadbf 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:scoria_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:scoria_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_horizontal.json index fed37b653..235ba0914 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_i.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_i.json index f514d462c..3ba8bc6d9 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_left.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_left.json index 66d78c697..1ed5ff3d3 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_pickaxe.json index 0a33f245f..8410a5a56 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:scoria_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:scoria_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_plus.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_plus.json index ac91aa42f..39beb9f5f 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_right.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_right.json index d81d14190..e50f2d65f 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_left" - } - }, - "result": { - "item": "mineralogy:scoria_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_left" + }, + { + "item": "mineralogy:scoria_relief_left" + } + ], + "result": { + "item": "mineralogy:scoria_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_sword.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_sword.json index feb5a4e93..b6c9b3946 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:scoria_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:scoria_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_vertical.json index 1d67de29a..2c99bd71a 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_slab.json b/src/main/resources/data/mineralogy/recipes/scoria_slab.json index 0f32c15bb..82b2b4dba 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/scoria" - } - }, - "result": { - "item": "mineralogy:scoria_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria" + } + }, + "result": { + "item": "mineralogy:scoria_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_slab_from_scoria_stonecutting.json b/src/main/resources/data/mineralogy/recipes/scoria_slab_from_scoria_stonecutting.json deleted file mode 100644 index 3c4b69ed1..000000000 --- a/src/main/resources/data/mineralogy/recipes/scoria_slab_from_scoria_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/scoria" - }, - "result": "mineralogy:scoria_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth.json index 05763e821..8d5552c99 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/scoria" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:scoria_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/scoria" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick.json index bd1329d16..b7664a8a2 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_furnace.json index eaac47e74..31b8f3c83 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/scoria/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_slab.json index 1accff8ad..ca9036402 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth_brick" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth_brick" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_stairs.json index 0213e8f9c..1890359fc 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth_brick" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth_brick" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_wall.json index e589a6db1..a589e57eb 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth_brick" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth_brick" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_furnace.json index 0cf2f2d58..5e2f67c78 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/scoria/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_slab.json index 0d384c6cd..f3dc9b624 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_stairs.json index 0113b1066..d5d926144 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_wall.json index 41af35662..561c2f268 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_stairs.json b/src/main/resources/data/mineralogy/recipes/scoria_stairs.json index de775db69..31706616d 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/scoria" - } - }, - "result": { - "item": "mineralogy:scoria_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria" + } + }, + "result": { + "item": "mineralogy:scoria_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_stairs_from_scoria_stonecutting.json b/src/main/resources/data/mineralogy/recipes/scoria_stairs_from_scoria_stonecutting.json deleted file mode 100644 index b619e1d0e..000000000 --- a/src/main/resources/data/mineralogy/recipes/scoria_stairs_from_scoria_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/scoria" - }, - "result": "mineralogy:scoria_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_wall.json b/src/main/resources/data/mineralogy/recipes/scoria_wall.json index 79fd7df9c..8a2aeeed6 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/scoria" - } - }, - "result": { - "item": "mineralogy:scoria_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria" + } + }, + "result": { + "item": "mineralogy:scoria_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_wall_from_scoria_stonecutting.json b/src/main/resources/data/mineralogy/recipes/scoria_wall_from_scoria_stonecutting.json deleted file mode 100644 index 0af523267..000000000 --- a/src/main/resources/data/mineralogy/recipes/scoria_wall_from_scoria_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/scoria" - }, - "result": "mineralogy:scoria_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick.json b/src/main/resources/data/mineralogy/recipes/shale_brick.json index c7a8a87fc..c3827e606 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/shale" - } - }, - "result": { - "item": "mineralogy:shale_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale" + } + }, + "result": { + "item": "mineralogy:shale_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_brick_block_polishing.json new file mode 100644 index 000000000..fc4a1c076 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/shale_brick_furnace.json index 783710e82..6ac4c2f93 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:shale_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/shale/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:shale_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_slab.json b/src/main/resources/data/mineralogy/recipes/shale_brick_slab.json index babe562a8..05f243157 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_brick" - } - }, - "result": { - "item": "mineralogy:shale_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_brick" + } + }, + "result": { + "item": "mineralogy:shale_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_brick_slab_polishing.json new file mode 100644 index 000000000..b6358d17b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/shale_brick_slab_recombination.json new file mode 100644 index 000000000..c220113d1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick_slab" + }, + { + "item": "mineralogy:shale_brick_slab" + } + ], + "result": { + "item": "mineralogy:shale_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/shale_brick_stairs.json index f29fbbc2f..8ab1f9615 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_brick" - } - }, - "result": { - "item": "mineralogy:shale_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/brick" + } + }, + "result": { + "item": "mineralogy:shale_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_brick_stairs_polishing.json new file mode 100644 index 000000000..9dfb44439 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_wall.json b/src/main/resources/data/mineralogy/recipes/shale_brick_wall.json index bf744ea77..bf1ba0c2f 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_brick" - } - }, - "result": { - "item": "mineralogy:shale_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/brick" + } + }, + "result": { + "item": "mineralogy:shale_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_brick_wall_polishing.json new file mode 100644 index 000000000..19c2420e1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_cobblestone.json b/src/main/resources/data/mineralogy/recipes/shale_cobblestone.json index 95b6d6922..39214d9df 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/shale_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/shale" + "tag": "mineralogy:stones/shale" }, { - "tag": "mineralogy:crafting_materials/shale" + "tag": "mineralogy:stones/shale" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/shale_furnace.json b/src/main/resources/data/mineralogy/recipes/shale_furnace.json index 3830cbc15..08ace2a38 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:shale_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/shale" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:shale_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/shale_furnace_from_rock.json deleted file mode 100644 index b929672b2..000000000 --- a/src/main/resources/data/mineralogy/recipes/shale_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/shale" - } - }, - "result": { - "item": "mineralogy:shale_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/shale_polished_brick_slab_recombination.json new file mode 100644 index 000000000..138097682 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_smooth_brick_slab" + }, + { + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:shale_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/shale_polished_slab_recombination.json new file mode 100644 index 000000000..a69d2a467 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_smooth_slab" + }, + { + "item": "mineralogy:shale_smooth_slab" + } + ], + "result": { + "item": "mineralogy:shale_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_polished_slabs_to_brick.json new file mode 100644 index 000000000..27ee1a523 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth_slab" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_polished_stairs_to_brick.json new file mode 100644 index 000000000..7622ba043 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_polished_walls_to_brick.json new file mode 100644 index 000000000..9be598705 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth_wall" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_raw_slab_polishing.json new file mode 100644 index 000000000..790f08d8a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/shale_raw_slab_recombination.json new file mode 100644 index 000000000..fabbdbfeb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_slab" + }, + { + "item": "mineralogy:shale_slab" + } + ], + "result": { + "item": "mineralogy:shale", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_raw_slabs_to_brick.json new file mode 100644 index 000000000..2ac7a09c8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_slab" + } + }, + "result": { + "item": "mineralogy:shale_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_polishing.json new file mode 100644 index 000000000..1ee0c9b28 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_to_brick.json new file mode 100644 index 000000000..39fd2a755 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_stairs" + } + }, + "result": { + "item": "mineralogy:shale_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_raw_wall_polishing.json new file mode 100644 index 000000000..b3fdea5c9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_raw_walls_to_brick.json new file mode 100644 index 000000000..c00246a21 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_wall" + } + }, + "result": { + "item": "mineralogy:shale_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_axe.json b/src/main/resources/data/mineralogy/recipes/shale_relief_axe.json index 7aea32b74..e0b0eba78 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:shale_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:shale_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_blank.json b/src/main/resources/data/mineralogy/recipes/shale_relief_blank.json index a2f5d4bb7..58f15182c 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - } - }, - "result": { - "item": "mineralogy:shale_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth" + } + }, + "result": { + "item": "mineralogy:shale_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_cross.json b/src/main/resources/data/mineralogy/recipes/shale_relief_cross.json index cedeea488..13df95fbb 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/shale_relief_hammer.json index 35e2316a0..293e20b1b 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/shale_relief_hoe.json index 643001f67..d955b67c4 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:shale_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:shale_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/shale_relief_horizontal.json index 1457d525e..74dbdee92 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_i.json b/src/main/resources/data/mineralogy/recipes/shale_relief_i.json index 90c1c7cf9..f0774b9d2 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_left.json b/src/main/resources/data/mineralogy/recipes/shale_relief_left.json index 429080474..8dfb75921 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/shale_relief_pickaxe.json index dbb60ab41..aabafd2a9 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:shale_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:shale_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_plus.json b/src/main/resources/data/mineralogy/recipes/shale_relief_plus.json index 83b0807b8..ccd014de9 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_right.json b/src/main/resources/data/mineralogy/recipes/shale_relief_right.json index f35531bc7..de3dfee71 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_left" - } - }, - "result": { - "item": "mineralogy:shale_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_left" + }, + { + "item": "mineralogy:shale_relief_left" + } + ], + "result": { + "item": "mineralogy:shale_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_sword.json b/src/main/resources/data/mineralogy/recipes/shale_relief_sword.json index ca41082a9..fd849c57d 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:shale_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:shale_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/shale_relief_vertical.json index 64a82697a..e5387497f 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_slab.json b/src/main/resources/data/mineralogy/recipes/shale_slab.json index f1cafee98..ec69791cd 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/shale" - } - }, - "result": { - "item": "mineralogy:shale_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale" + } + }, + "result": { + "item": "mineralogy:shale_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_slab_from_shale_stonecutting.json b/src/main/resources/data/mineralogy/recipes/shale_slab_from_shale_stonecutting.json deleted file mode 100644 index 433f5ee08..000000000 --- a/src/main/resources/data/mineralogy/recipes/shale_slab_from_shale_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/shale" - }, - "result": "mineralogy:shale_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth.json b/src/main/resources/data/mineralogy/recipes/shale_smooth.json index 0ae7d7e34..1b2cb9458 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/shale" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:shale_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/shale" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick.json index 147de5a26..0da9bfcf1 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_furnace.json index 0b89d2fd3..f7a8b63c0 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/shale/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_slab.json index df112661f..02b8d9f7f 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth_brick" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth_brick" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_stairs.json index 7e64026b8..ed906f7c9 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth_brick" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth_brick" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_wall.json index 9d5354dc1..c80004a31 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth_brick" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth_brick" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_furnace.json index 5cd0c328c..9c01ebf47 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:shale_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/shale/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:shale_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_slab.json index d76fe7da0..89e8a551b 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - } - }, - "result": { - "item": "mineralogy:shale_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth" + } + }, + "result": { + "item": "mineralogy:shale_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_stairs.json index 6be8af269..31371546d 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - } - }, - "result": { - "item": "mineralogy:shale_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth" + } + }, + "result": { + "item": "mineralogy:shale_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_wall.json index 8b4b8117d..cd6164f90 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - } - }, - "result": { - "item": "mineralogy:shale_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth" + } + }, + "result": { + "item": "mineralogy:shale_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_stairs.json b/src/main/resources/data/mineralogy/recipes/shale_stairs.json index 35ad4648c..8d563ac92 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/shale" - } - }, - "result": { - "item": "mineralogy:shale_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale" + } + }, + "result": { + "item": "mineralogy:shale_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_stairs_from_shale_stonecutting.json b/src/main/resources/data/mineralogy/recipes/shale_stairs_from_shale_stonecutting.json deleted file mode 100644 index 1a8d05e3d..000000000 --- a/src/main/resources/data/mineralogy/recipes/shale_stairs_from_shale_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/shale" - }, - "result": "mineralogy:shale_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/shale_wall.json b/src/main/resources/data/mineralogy/recipes/shale_wall.json index 1d8316129..9d30f2b36 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/shale" - } - }, - "result": { - "item": "mineralogy:shale_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale" + } + }, + "result": { + "item": "mineralogy:shale_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_wall_from_shale_stonecutting.json b/src/main/resources/data/mineralogy/recipes/shale_wall_from_shale_stonecutting.json deleted file mode 100644 index 8c116479a..000000000 --- a/src/main/resources/data/mineralogy/recipes/shale_wall_from_shale_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/shale" - }, - "result": "mineralogy:shale_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick.json index efbbbb86a..070930015 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone" + } + }, + "result": { + "item": "mineralogy:siltstone_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_block_polishing.json new file mode 100644 index 000000000..8b6683877 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_furnace.json index 16363394d..347dccf12 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/siltstone/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab.json index 61c6f4831..eca3bad91 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_brick" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_polishing.json new file mode 100644 index 000000000..48a2fc0db --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_recombination.json new file mode 100644 index 000000000..fdd8a3bf5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick_slab" + }, + { + "item": "mineralogy:siltstone_brick_slab" + } + ], + "result": { + "item": "mineralogy:siltstone_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs.json index dd258f885..c803bc9ee 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/brick" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs_polishing.json new file mode 100644 index 000000000..264dfe24a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall.json index fc3c45f2a..9482ba651 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/brick" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall_polishing.json new file mode 100644 index 000000000..2785f897d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_cobblestone.json b/src/main/resources/data/mineralogy/recipes/siltstone_cobblestone.json index ff686b00c..29e2cf5cb 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/siltstone" + "tag": "mineralogy:stones/siltstone" }, { - "tag": "mineralogy:crafting_materials/siltstone" + "tag": "mineralogy:stones/siltstone" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json b/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json index f455e84f7..6e10043c0 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:siltstone_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/siltstone" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:siltstone_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/siltstone_furnace_from_rock.json deleted file mode 100644 index 4cb06d4c3..000000000 --- a/src/main/resources/data/mineralogy/recipes/siltstone_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_brick_slab_recombination.json new file mode 100644 index 000000000..86c456f2b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_smooth_brick_slab" + }, + { + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_slab_recombination.json new file mode 100644 index 000000000..e16cb726b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "item": "mineralogy:siltstone_smooth_slab" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_slabs_to_brick.json new file mode 100644 index 000000000..6d939f7e7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth_slab" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_stairs_to_brick.json new file mode 100644 index 000000000..ac764faf8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_walls_to_brick.json new file mode 100644 index 000000000..ba8968938 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth_wall" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_polishing.json new file mode 100644 index 000000000..ed7d6b8ff --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_recombination.json new file mode 100644 index 000000000..3de5cf27a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_slab" + }, + { + "item": "mineralogy:siltstone_slab" + } + ], + "result": { + "item": "mineralogy:siltstone", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slabs_to_brick.json new file mode 100644 index 000000000..93b49632f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_slab" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_polishing.json new file mode 100644 index 000000000..4f4fc2672 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_to_brick.json new file mode 100644 index 000000000..e7a350b48 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_stairs" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_wall_polishing.json new file mode 100644 index 000000000..9252466cd --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_walls_to_brick.json new file mode 100644 index 000000000..fddd85a2c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_wall" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_axe.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_axe.json index 4aa9a4a9a..fc7fcda0e 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:siltstone_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:siltstone_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_blank.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_blank.json index 9a730a2bc..39fa26e11 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_cross.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_cross.json index 721d33b67..f4e899fb6 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_hammer.json index a5e4f383c..f707dc652 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_hoe.json index a3bf1967e..4b673860a 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:siltstone_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:siltstone_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_horizontal.json index cbed00339..7b6fdffff 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_i.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_i.json index 0e6ea769a..53b17acac 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_left.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_left.json index 00bdca272..1e91e5389 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_pickaxe.json index 3c43f11d9..ecbec0e8b 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:siltstone_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:siltstone_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_plus.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_plus.json index 052763e34..33257b01d 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_right.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_right.json index 70402b7a8..814b18230 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_left" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_left" + }, + { + "item": "mineralogy:siltstone_relief_left" + } + ], + "result": { + "item": "mineralogy:siltstone_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_sword.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_sword.json index e4fd4e6a2..f2646b0fb 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:siltstone_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:siltstone_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_vertical.json index 81bbe66d2..9c42ea0dc 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_slab.json b/src/main/resources/data/mineralogy/recipes/siltstone_slab.json index 8c09c65af..b55a273d9 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone" + } + }, + "result": { + "item": "mineralogy:siltstone_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_slab_from_siltstone_stonecutting.json b/src/main/resources/data/mineralogy/recipes/siltstone_slab_from_siltstone_stonecutting.json deleted file mode 100644 index c0d02e510..000000000 --- a/src/main/resources/data/mineralogy/recipes/siltstone_slab_from_siltstone_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/siltstone" - }, - "result": "mineralogy:siltstone_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json index 5721729b2..80313189b 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/siltstone" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:siltstone_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/siltstone" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick.json index e11ebb0f8..fed922aec 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_furnace.json index b9d1bddbe..ff89c14c4 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/siltstone/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_slab.json index 6716847b8..0a328f0e0 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth_brick" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_stairs.json index 1e4722c0f..abf105806 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth_brick" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_wall.json index 9dbe513ce..291f500b5 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth_brick" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_furnace.json index be0ed423a..f04470b77 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/siltstone/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_slab.json index c688ea499..95abe3991 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_stairs.json index 40f4a2236..a76fe13e1 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_wall.json index a8721a68b..852218989 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json b/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json index af3eac7fc..7b4f31444 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone" + } + }, + "result": { + "item": "mineralogy:siltstone_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_stairs_from_siltstone_stonecutting.json b/src/main/resources/data/mineralogy/recipes/siltstone_stairs_from_siltstone_stonecutting.json deleted file mode 100644 index c15ac518d..000000000 --- a/src/main/resources/data/mineralogy/recipes/siltstone_stairs_from_siltstone_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/siltstone" - }, - "result": "mineralogy:siltstone_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_wall.json b/src/main/resources/data/mineralogy/recipes/siltstone_wall.json index 010331e66..6e325d060 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone" + } + }, + "result": { + "item": "mineralogy:siltstone_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_wall_from_siltstone_stonecutting.json b/src/main/resources/data/mineralogy/recipes/siltstone_wall_from_siltstone_stonecutting.json deleted file mode 100644 index 4925f0442..000000000 --- a/src/main/resources/data/mineralogy/recipes/siltstone_wall_from_siltstone_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/siltstone" - }, - "result": "mineralogy:siltstone_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick.json b/src/main/resources/data/mineralogy/recipes/slate_brick.json index 416c677d7..9cc3c1329 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/slate" - } - }, - "result": { - "item": "mineralogy:slate_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate" + } + }, + "result": { + "item": "mineralogy:slate_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_brick_block_polishing.json new file mode 100644 index 000000000..c2cf4e903 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/slate_brick_furnace.json index b0631ebdb..c88a26780 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:slate_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/slate/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:slate_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_slab.json b/src/main/resources/data/mineralogy/recipes/slate_brick_slab.json index 1687b11dd..1d7323da0 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_brick" - } - }, - "result": { - "item": "mineralogy:slate_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_brick" + } + }, + "result": { + "item": "mineralogy:slate_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_brick_slab_polishing.json new file mode 100644 index 000000000..7e4ad2ba8 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/slate_brick_slab_recombination.json new file mode 100644 index 000000000..3e5fd9e4f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick_slab" + }, + { + "item": "mineralogy:slate_brick_slab" + } + ], + "result": { + "item": "mineralogy:slate_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/slate_brick_stairs.json index 52e2d7da2..1c7ce58a8 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_brick" - } - }, - "result": { - "item": "mineralogy:slate_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/brick" + } + }, + "result": { + "item": "mineralogy:slate_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_brick_stairs_polishing.json new file mode 100644 index 000000000..6835321fb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_wall.json b/src/main/resources/data/mineralogy/recipes/slate_brick_wall.json index 9d52f0c53..8da5cac1b 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_brick" - } - }, - "result": { - "item": "mineralogy:slate_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/brick" + } + }, + "result": { + "item": "mineralogy:slate_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_brick_wall_polishing.json new file mode 100644 index 000000000..5168f24a2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_cobblestone.json b/src/main/resources/data/mineralogy/recipes/slate_cobblestone.json index a2383273d..0642555c3 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/slate_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/slate" + "tag": "mineralogy:stones/slate" }, { - "tag": "mineralogy:crafting_materials/slate" + "tag": "mineralogy:stones/slate" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/slate_furnace.json b/src/main/resources/data/mineralogy/recipes/slate_furnace.json index 2df13baf9..b0dd5af7d 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:slate_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/slate" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:slate_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/slate_furnace_from_rock.json deleted file mode 100644 index 8f64d235a..000000000 --- a/src/main/resources/data/mineralogy/recipes/slate_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/slate" - } - }, - "result": { - "item": "mineralogy:slate_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/slate_polished_brick_slab_recombination.json new file mode 100644 index 000000000..d19183503 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_smooth_brick_slab" + }, + { + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:slate_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/slate_polished_slab_recombination.json new file mode 100644 index 000000000..b50e4a8de --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_smooth_slab" + }, + { + "item": "mineralogy:slate_smooth_slab" + } + ], + "result": { + "item": "mineralogy:slate_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_polished_slabs_to_brick.json new file mode 100644 index 000000000..e1c871cb1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth_slab" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_polished_stairs_to_brick.json new file mode 100644 index 000000000..08bcf34f2 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_polished_walls_to_brick.json new file mode 100644 index 000000000..2360ca17e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth_wall" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_raw_slab_polishing.json new file mode 100644 index 000000000..e4d3368b9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/slate_raw_slab_recombination.json new file mode 100644 index 000000000..abf3f7f40 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_slab" + }, + { + "item": "mineralogy:slate_slab" + } + ], + "result": { + "item": "mineralogy:slate", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_raw_slabs_to_brick.json new file mode 100644 index 000000000..257c69288 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_slab" + } + }, + "result": { + "item": "mineralogy:slate_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_polishing.json new file mode 100644 index 000000000..92b22978c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_to_brick.json new file mode 100644 index 000000000..05b7e02fe --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_stairs" + } + }, + "result": { + "item": "mineralogy:slate_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_raw_wall_polishing.json new file mode 100644 index 000000000..cc00c298b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_raw_walls_to_brick.json new file mode 100644 index 000000000..2dbaae16f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_wall" + } + }, + "result": { + "item": "mineralogy:slate_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_axe.json b/src/main/resources/data/mineralogy/recipes/slate_relief_axe.json index 8af9e438b..1a4e4236c 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:slate_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:slate_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_blank.json b/src/main/resources/data/mineralogy/recipes/slate_relief_blank.json index 5a084af85..0b8223e72 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - } - }, - "result": { - "item": "mineralogy:slate_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth" + } + }, + "result": { + "item": "mineralogy:slate_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_cross.json b/src/main/resources/data/mineralogy/recipes/slate_relief_cross.json index b2e366b75..5e84c29a9 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/slate_relief_hammer.json index e2d0e2495..ab7f2a9e9 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/slate_relief_hoe.json index 6d210cb80..25c425b53 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:slate_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:slate_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/slate_relief_horizontal.json index 27acd815b..e13c2dddf 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_i.json b/src/main/resources/data/mineralogy/recipes/slate_relief_i.json index c4c002f6b..75b7e070d 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_left.json b/src/main/resources/data/mineralogy/recipes/slate_relief_left.json index d4337f502..0108ab6f5 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/slate_relief_pickaxe.json index 64a736b38..4a196ce64 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:slate_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:slate_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_plus.json b/src/main/resources/data/mineralogy/recipes/slate_relief_plus.json index 19c31b7e1..d905edb92 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_right.json b/src/main/resources/data/mineralogy/recipes/slate_relief_right.json index 14d1b6924..052a10cb8 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_left" - } - }, - "result": { - "item": "mineralogy:slate_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_left" + }, + { + "item": "mineralogy:slate_relief_left" + } + ], + "result": { + "item": "mineralogy:slate_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_sword.json b/src/main/resources/data/mineralogy/recipes/slate_relief_sword.json index 911ac0521..25d195e09 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:slate_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:slate_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/slate_relief_vertical.json index daebb82b5..ebf66bbba 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_slab.json b/src/main/resources/data/mineralogy/recipes/slate_slab.json index 86e818a43..b5872fa86 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/slate" - } - }, - "result": { - "item": "mineralogy:slate_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate" + } + }, + "result": { + "item": "mineralogy:slate_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_slab_from_slate_stonecutting.json b/src/main/resources/data/mineralogy/recipes/slate_slab_from_slate_stonecutting.json deleted file mode 100644 index 9a4392327..000000000 --- a/src/main/resources/data/mineralogy/recipes/slate_slab_from_slate_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/slate" - }, - "result": "mineralogy:slate_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth.json b/src/main/resources/data/mineralogy/recipes/slate_smooth.json index 0ff49ff10..7349a2a1f 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/slate" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:slate_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/slate" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick.json index d7990c7f9..e6dfc849b 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_furnace.json index 28d25c17e..36c1c940b 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/slate/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_slab.json index 14c2a63e7..9e9226552 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth_brick" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth_brick" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_stairs.json index 97d7bf70f..21ff64061 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth_brick" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth_brick" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_wall.json index 1ab824e3b..40c11e81e 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth_brick" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth_brick" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_furnace.json index 45f79ecf1..041582d47 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:slate_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/slate/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:slate_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_slab.json index 5a3fc4158..9998ca044 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - } - }, - "result": { - "item": "mineralogy:slate_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth" + } + }, + "result": { + "item": "mineralogy:slate_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_stairs.json index 3d91f8f91..e6ec83adc 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - } - }, - "result": { - "item": "mineralogy:slate_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth" + } + }, + "result": { + "item": "mineralogy:slate_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_wall.json index 5e14f0096..6b37b8f7e 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - } - }, - "result": { - "item": "mineralogy:slate_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth" + } + }, + "result": { + "item": "mineralogy:slate_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_stairs.json b/src/main/resources/data/mineralogy/recipes/slate_stairs.json index e3a74156d..54f07a20f 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/slate" - } - }, - "result": { - "item": "mineralogy:slate_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate" + } + }, + "result": { + "item": "mineralogy:slate_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_stairs_from_slate_stonecutting.json b/src/main/resources/data/mineralogy/recipes/slate_stairs_from_slate_stonecutting.json deleted file mode 100644 index 6648c9f42..000000000 --- a/src/main/resources/data/mineralogy/recipes/slate_stairs_from_slate_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/slate" - }, - "result": "mineralogy:slate_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/slate_wall.json b/src/main/resources/data/mineralogy/recipes/slate_wall.json index 2263f87d3..fa2c674d1 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/slate" - } - }, - "result": { - "item": "mineralogy:slate_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate" + } + }, + "result": { + "item": "mineralogy:slate_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_wall_from_slate_stonecutting.json b/src/main/resources/data/mineralogy/recipes/slate_wall_from_slate_stonecutting.json deleted file mode 100644 index e1d6665f8..000000000 --- a/src/main/resources/data/mineralogy/recipes/slate_wall_from_slate_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/slate" - }, - "result": "mineralogy:slate_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/sulfur_block.json b/src/main/resources/data/mineralogy/recipes/sulfur_block.json index 14c16e14f..d3be94c09 100644 --- a/src/main/resources/data/mineralogy/recipes/sulfur_block.json +++ b/src/main/resources/data/mineralogy/recipes/sulfur_block.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_block" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,10 +17,11 @@ ], "key": { "x": { - "tag": "forge:dusts/sulfur" + "item": "mineralogy:sulfur_dust" } }, "result": { - "item": "mineralogy:sulfur_block" + "item": "mineralogy:sulfur_block", + "count": 1 } } diff --git a/src/main/resources/data/mineralogy/recipes/sulfur_dust.json b/src/main/resources/data/mineralogy/recipes/sulfur_dust.json index f4ff1920d..8c5e0aef4 100644 --- a/src/main/resources/data/mineralogy/recipes/sulfur_dust.json +++ b/src/main/resources/data/mineralogy/recipes/sulfur_dust.json @@ -1,4 +1,14 @@ { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_dust" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_brick.json index 6d6a29a22..c01221a43 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/tuff" - } - }, - "result": { - "item": "mineralogy:tuff_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff" + } + }, + "result": { + "item": "mineralogy:tuff_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_block_polishing.json new file mode 100644 index 000000000..93dc670c9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_block_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_furnace.json index ec325d196..22bf881c6 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:tuff_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/tuff/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:tuff_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab.json index fc9ef82c8..a9093d33b 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_brick" - } - }, - "result": { - "item": "mineralogy:tuff_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_brick" + } + }, + "result": { + "item": "mineralogy:tuff_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_polishing.json new file mode 100644 index 000000000..9e3d8e8b1 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_brick_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_recombination.json new file mode 100644 index 000000000..65badb3fa --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick_slab" + }, + { + "item": "mineralogy:tuff_brick_slab" + } + ], + "result": { + "item": "mineralogy:tuff_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs.json index fb7f95007..5f601a638 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_brick" - } - }, - "result": { - "item": "mineralogy:tuff_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/brick" + } + }, + "result": { + "item": "mineralogy:tuff_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs_polishing.json new file mode 100644 index 000000000..59afd39a6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_brick_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_wall.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_wall.json index b76541236..f3f7448cf 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_brick" - } - }, - "result": { - "item": "mineralogy:tuff_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/brick" + } + }, + "result": { + "item": "mineralogy:tuff_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_wall_polishing.json new file mode 100644 index 000000000..ef2915893 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_brick_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_cobblestone.json b/src/main/resources/data/mineralogy/recipes/tuff_cobblestone.json index ba5cf7cea..d866b9398 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_cobblestone.json @@ -1,11 +1,12 @@ { + "conditions": [], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:crafting_materials/tuff" + "tag": "mineralogy:stones/tuff" }, { - "tag": "mineralogy:crafting_materials/tuff" + "tag": "mineralogy:stones/tuff" }, { "item": "minecraft:gravel" diff --git a/src/main/resources/data/mineralogy/recipes/tuff_furnace.json b/src/main/resources/data/mineralogy/recipes/tuff_furnace.json index 9ace31dd6..f4a3ebdcb 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_furnace.json @@ -1,36 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:tuff_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/tuff" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:tuff_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_furnace_from_rock.json b/src/main/resources/data/mineralogy/recipes/tuff_furnace_from_rock.json deleted file mode 100644 index 1560e574b..000000000 --- a/src/main/resources/data/mineralogy/recipes/tuff_furnace_from_rock.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/tuff" - } - }, - "result": { - "item": "mineralogy:tuff_furnace" - } - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_brick_slab_recombination.json new file mode 100644 index 000000000..20664f706 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_brick_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_smooth_brick_slab" + }, + { + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_brick", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_slab_recombination.json new file mode 100644 index 000000000..7415c9ed7 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_smooth_slab" + }, + { + "item": "mineralogy:tuff_smooth_slab" + } + ], + "result": { + "item": "mineralogy:tuff_smooth", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_slabs_to_brick.json new file mode 100644 index 000000000..c5ce97d4e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth_slab" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_stairs_to_brick.json new file mode 100644 index 000000000..a18d86d8b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_walls_to_brick.json new file mode 100644 index 000000000..60ffbdbad --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth_wall" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_polishing.json new file mode 100644 index 000000000..096904f0d --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_recombination.json new file mode 100644 index 000000000..e8035c5d6 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_recombination.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_slab" + }, + { + "item": "mineralogy:tuff_slab" + } + ], + "result": { + "item": "mineralogy:tuff", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_slabs_to_brick.json new file mode 100644 index 000000000..9e430f55a --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_slabs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_slab" + } + }, + "result": { + "item": "mineralogy:tuff_brick_slab", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_polishing.json new file mode 100644 index 000000000..130fce3f9 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_stairs", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_to_brick.json new file mode 100644 index 000000000..1e0b25a69 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_stairs" + } + }, + "result": { + "item": "mineralogy:tuff_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_wall_polishing.json new file mode 100644 index 000000000..c1616e202 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_wall_polishing.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_wall", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_walls_to_brick.json new file mode 100644 index 000000000..4e571bbaf --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_walls_to_brick.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_wall" + } + }, + "result": { + "item": "mineralogy:tuff_brick_wall", + "count": 4 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_axe.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_axe.json index 71e58f0d5..7b7a50861 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_axe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:tuff_relief_axe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "minecraft:stone_axe" } - ] + ], + "result": { + "item": "mineralogy:tuff_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_blank.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_blank.json index 606ff3cfd..74ea457be 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_blank.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - } - }, - "result": { - "item": "mineralogy:tuff_relief_blank", - "count": 16 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_blank" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth" + } + }, + "result": { + "item": "mineralogy:tuff_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_cross.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_cross.json index 25c409ee9..cfc7c01e3 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_cross.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_cross", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_cross" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_hammer.json index f1011b59a..bb3fb4a88 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_hammer.json @@ -1,40 +1,29 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_hammer", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hammer" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_hoe.json index 3ee6d98f1..92a17c63a 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_hoe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:tuff_relief_hoe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "minecraft:stone_hoe" } - ] + ], + "result": { + "item": "mineralogy:tuff_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_horizontal.json index 4f38b2a58..85ba22264 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_horizontal.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_horizontal", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_horizontal" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_i.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_i.json index 0aa99ab3b..1ece856c2 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_i.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_i", - "count": 7 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_i" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_left.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_left.json index 2416c5308..11fd5644e 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_left.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_left", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_left" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_pickaxe.json index 7136ec700..89cf7f037 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_pickaxe.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:tuff_relief_pickaxe", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" } - ] + ], + "result": { + "item": "mineralogy:tuff_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_plus.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_plus.json index a266826d0..483f77bb6 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_plus.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_plus", - "count": 5 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_plus" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_right.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_right.json index 3835a78cc..aa48bc21d 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_right.json @@ -1,34 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_left" - } - }, - "result": { - "item": "mineralogy:tuff_relief_right", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_right" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_left" + }, + { + "item": "mineralogy:tuff_relief_left" + } + ], + "result": { + "item": "mineralogy:tuff_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_sword.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_sword.json index 102151cb0..616051723 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_sword.json @@ -1,53 +1,42 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:tuff_relief_sword", - "count": 8 - } - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "minecraft:stone_sword" } - ] + ], + "result": { + "item": "mineralogy:tuff_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_vertical.json index 0d2964b2c..98fa873e9 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_vertical.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_vertical", - "count": 3 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_vertical" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_slab.json b/src/main/resources/data/mineralogy/recipes/tuff_slab.json index 3708090ad..0401d5a55 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_slab.json @@ -1,28 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/tuff" - } - }, - "result": { - "item": "mineralogy:tuff_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff" + } + }, + "result": { + "item": "mineralogy:tuff_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_slab_from_tuff_stonecutting.json b/src/main/resources/data/mineralogy/recipes/tuff_slab_from_tuff_stonecutting.json deleted file mode 100644 index 0638972d0..000000000 --- a/src/main/resources/data/mineralogy/recipes/tuff_slab_from_tuff_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/tuff" - }, - "result": "mineralogy:tuff_slab", - "count": 2 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth.json index 729a3d7ff..eee5b5cd1 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth.json @@ -1,27 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:crafting_materials/tuff" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:tuff_smooth" - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" } - ] + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/tuff" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick.json index 54a6fd591..01d29db93 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_furnace.json index b2d8d8f3a..950673561 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_furnace.json @@ -1,44 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth_brick_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/tuff/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_slab.json index 42c396119..eee157afb 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_slab.json @@ -1,36 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth_brick" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth_brick" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_stairs.json index 975a84d6b..e880b8624 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_stairs.json @@ -1,38 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth_brick" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth_brick" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_wall.json index eed6d2229..754f45038 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_wall.json @@ -1,37 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth_brick" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth_brick" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_furnace.json index 95afeda17..fff61b1b6 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_furnace.json @@ -1,40 +1,26 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth_slab" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_furnace" - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_furnace" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/tuff/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_slab.json index 6d1b1783d..d34f6fad5 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_slab.json @@ -1,32 +1,21 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_slab", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_stairs.json index e7e859359..30cad1fa4 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_stairs.json @@ -1,34 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_wall.json index f5a8095b8..f592d30d3 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_wall.json @@ -1,33 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_stairs.json b/src/main/resources/data/mineralogy/recipes/tuff_stairs.json index d3422cfe3..b922d6ede 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_stairs.json @@ -1,30 +1,23 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/tuff" - } - }, - "result": { - "item": "mineralogy:tuff_stairs", - "count": 4 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff" + } + }, + "result": { + "item": "mineralogy:tuff_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_stairs_from_tuff_stonecutting.json b/src/main/resources/data/mineralogy/recipes/tuff_stairs_from_tuff_stonecutting.json deleted file mode 100644 index 1ba4f52b0..000000000 --- a/src/main/resources/data/mineralogy/recipes/tuff_stairs_from_tuff_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/tuff" - }, - "result": "mineralogy:tuff_stairs", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_wall.json b/src/main/resources/data/mineralogy/recipes/tuff_wall.json index 26f78a679..8182a9816 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_wall.json @@ -1,29 +1,22 @@ { - "type": "forge:conditional", - "recipes": [ + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:crafting_materials/tuff" - } - }, - "result": { - "item": "mineralogy:tuff_wall", - "count": 6 - } - } + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" } - ] + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff" + } + }, + "result": { + "item": "mineralogy:tuff_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_wall_from_tuff_stonecutting.json b/src/main/resources/data/mineralogy/recipes/tuff_wall_from_tuff_stonecutting.json deleted file mode 100644 index a1b0305f9..000000000 --- a/src/main/resources/data/mineralogy/recipes/tuff_wall_from_tuff_stonecutting.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "tag": "mineralogy:crafting_materials/tuff" - }, - "result": "mineralogy:tuff_wall", - "count": 1 - } - } - ] -} diff --git a/src/main/resources/data/mineralogy/tags/items/drywall/white.json b/src/main/resources/data/mineralogy/tags/items/drywall/white.json new file mode 100644 index 000000000..3fcdb5b08 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/drywall/white.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:drywall_white" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite.json b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite.json new file mode 100644 index 000000000..6c69ddf73 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/brick.json new file mode 100644 index 000000000..46a24f9fd --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth.json new file mode 100644 index 000000000..67d861832 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth_brick.json new file mode 100644 index 000000000..789448072 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/andesite.json b/src/main/resources/data/mineralogy/tags/items/slabs/andesite.json new file mode 100644 index 000000000..92016734b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/andesite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/andesite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/brick.json new file mode 100644 index 000000000..86fc7b5f6 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json new file mode 100644 index 000000000..9ff263d85 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth_brick.json new file mode 100644 index 000000000..5318fc8be --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basalt.json b/src/main/resources/data/mineralogy/tags/items/slabs/basalt.json new file mode 100644 index 000000000..e9009b136 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basalt.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basalt/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/brick.json new file mode 100644 index 000000000..8473ca13e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth.json new file mode 100644 index 000000000..01fbe72a9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth_brick.json new file mode 100644 index 000000000..e7e72f896 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass.json b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass.json new file mode 100644 index 000000000..235c14f48 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/brick.json new file mode 100644 index 000000000..ed0d0dddc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth.json new file mode 100644 index 000000000..9d66a4f36 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth_brick.json new file mode 100644 index 000000000..8dc7c14e0 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate.json b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate.json new file mode 100644 index 000000000..87155b98c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/brick.json new file mode 100644 index 000000000..734d203f0 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth.json new file mode 100644 index 000000000..a91c0394b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth_brick.json new file mode 100644 index 000000000..8c5011c1b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diabase.json b/src/main/resources/data/mineralogy/tags/items/slabs/diabase.json new file mode 100644 index 000000000..eca7810bf --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diabase.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diabase/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/brick.json new file mode 100644 index 000000000..86dc2e36c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth.json new file mode 100644 index 000000000..7fe562492 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth_brick.json new file mode 100644 index 000000000..74411ad6d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diorite.json b/src/main/resources/data/mineralogy/tags/items/slabs/diorite.json new file mode 100644 index 000000000..950f6f4eb --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diorite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diorite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/brick.json new file mode 100644 index 000000000..ad21c87ef --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json new file mode 100644 index 000000000..19bd10112 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth_brick.json new file mode 100644 index 000000000..0fe1f24d4 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite.json b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite.json new file mode 100644 index 000000000..4629c21aa --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/brick.json new file mode 100644 index 000000000..38cf3c315 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth.json new file mode 100644 index 000000000..150097a68 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth_brick.json new file mode 100644 index 000000000..5be581a10 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro.json b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro.json new file mode 100644 index 000000000..a6417c016 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/brick.json new file mode 100644 index 000000000..86e301bf7 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth.json new file mode 100644 index 000000000..e76568c00 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth_brick.json new file mode 100644 index 000000000..377e70c5d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss.json b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss.json new file mode 100644 index 000000000..c277f959b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/brick.json new file mode 100644 index 000000000..c71a3b803 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth.json new file mode 100644 index 000000000..a41d0d512 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth_brick.json new file mode 100644 index 000000000..c4d892e20 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/granite.json b/src/main/resources/data/mineralogy/tags/items/slabs/granite.json new file mode 100644 index 000000000..5d2bbe225 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/granite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/granite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/granite/brick.json new file mode 100644 index 000000000..1f6a1049a --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/granite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json new file mode 100644 index 000000000..a4041ac03 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth_brick.json new file mode 100644 index 000000000..2aa54502a --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels.json b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels.json new file mode 100644 index 000000000..674535f32 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/brick.json new file mode 100644 index 000000000..547291ff0 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth.json new file mode 100644 index 000000000..d1265c838 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth_brick.json new file mode 100644 index 000000000..60132ec26 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/limestone.json b/src/main/resources/data/mineralogy/tags/items/slabs/limestone.json new file mode 100644 index 000000000..ff332e77d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/limestone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/limestone/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/brick.json new file mode 100644 index 000000000..94765e9fa --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth.json new file mode 100644 index 000000000..909a1d37b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth_brick.json new file mode 100644 index 000000000..c662796c3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/marble.json b/src/main/resources/data/mineralogy/tags/items/slabs/marble.json new file mode 100644 index 000000000..f0a05b980 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/marble.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/marble/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/marble/brick.json new file mode 100644 index 000000000..fc86044b6 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/marble/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth.json new file mode 100644 index 000000000..e92c5d02e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth_brick.json new file mode 100644 index 000000000..b7d2e550e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite.json b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite.json new file mode 100644 index 000000000..8f4c9718b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/brick.json new file mode 100644 index 000000000..73ad82e52 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth.json new file mode 100644 index 000000000..dc2b13442 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth_brick.json new file mode 100644 index 000000000..085648387 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite.json b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite.json new file mode 100644 index 000000000..52d50562a --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/brick.json new file mode 100644 index 000000000..70c0fb849 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth.json new file mode 100644 index 000000000..f22d74ab7 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth_brick.json new file mode 100644 index 000000000..d9ffedd98 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite.json b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite.json new file mode 100644 index 000000000..9425b4c32 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/brick.json new file mode 100644 index 000000000..4ea5079a6 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth.json new file mode 100644 index 000000000..940b05161 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth_brick.json new file mode 100644 index 000000000..215baec58 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite.json b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite.json new file mode 100644 index 000000000..fa9c15c9e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/brick.json new file mode 100644 index 000000000..4760ed624 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth.json new file mode 100644 index 000000000..842b451dd --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth_brick.json new file mode 100644 index 000000000..4ebdae194 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite.json b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite.json new file mode 100644 index 000000000..263571ea7 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/brick.json new file mode 100644 index 000000000..32035f3a7 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth.json new file mode 100644 index 000000000..1f73e700e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth_brick.json new file mode 100644 index 000000000..05d19d992 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite.json b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite.json new file mode 100644 index 000000000..9ec17b051 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/brick.json new file mode 100644 index 000000000..9caa4d7ed --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth.json new file mode 100644 index 000000000..8fda40f22 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth_brick.json new file mode 100644 index 000000000..b5858e7d4 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt.json b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt.json new file mode 100644 index 000000000..0a8068edd --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/brick.json new file mode 100644 index 000000000..211adf7dc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth.json new file mode 100644 index 000000000..0ca994774 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth_brick.json new file mode 100644 index 000000000..6c3f23062 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/schist.json b/src/main/resources/data/mineralogy/tags/items/slabs/schist.json new file mode 100644 index 000000000..a9fb96052 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/schist.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/schist/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/schist/brick.json new file mode 100644 index 000000000..2b3afdc2a --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/schist/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth.json new file mode 100644 index 000000000..06d30fc65 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth_brick.json new file mode 100644 index 000000000..be8e69417 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/scoria.json b/src/main/resources/data/mineralogy/tags/items/slabs/scoria.json new file mode 100644 index 000000000..c9944d9dc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/scoria.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/scoria/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/brick.json new file mode 100644 index 000000000..a5899b7e8 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth.json new file mode 100644 index 000000000..46f4c2bd5 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth_brick.json new file mode 100644 index 000000000..0151b0aa8 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/shale.json b/src/main/resources/data/mineralogy/tags/items/slabs/shale.json new file mode 100644 index 000000000..872602391 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/shale.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/shale/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/shale/brick.json new file mode 100644 index 000000000..be65235e7 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/shale/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth.json new file mode 100644 index 000000000..e5e9170c0 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth_brick.json new file mode 100644 index 000000000..630314255 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone.json b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone.json new file mode 100644 index 000000000..b7f38d8c2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/brick.json new file mode 100644 index 000000000..27c478fcb --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth.json new file mode 100644 index 000000000..abe13b010 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth_brick.json new file mode 100644 index 000000000..136c08404 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/slate.json b/src/main/resources/data/mineralogy/tags/items/slabs/slate.json new file mode 100644 index 000000000..4a53e2403 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/slate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/slate/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/slate/brick.json new file mode 100644 index 000000000..4933a4e75 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/slate/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth.json new file mode 100644 index 000000000..981c75014 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth_brick.json new file mode 100644 index 000000000..66b48d143 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/tuff.json b/src/main/resources/data/mineralogy/tags/items/slabs/tuff.json new file mode 100644 index 000000000..ab5c83bda --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/tuff.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/tuff/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/brick.json new file mode 100644 index 000000000..dd9e31c88 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth.json new file mode 100644 index 000000000..011c7bf65 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff_smooth_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth_brick.json new file mode 100644 index 000000000..bf5975824 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff_smooth_brick_slab" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite.json b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite.json new file mode 100644 index 000000000..26e1eac26 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/brick.json new file mode 100644 index 000000000..09c0bacbd --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth.json new file mode 100644 index 000000000..896936dfe --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth_brick.json new file mode 100644 index 000000000..42c31f259 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/andesite.json b/src/main/resources/data/mineralogy/tags/items/stones/andesite.json new file mode 100644 index 000000000..10d034db6 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/andesite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/andesite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/andesite/brick.json new file mode 100644 index 000000000..664447e78 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/andesite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json new file mode 100644 index 000000000..268914cf2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth_brick.json new file mode 100644 index 000000000..7d8ea7173 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basalt.json b/src/main/resources/data/mineralogy/tags/items/stones/basalt.json new file mode 100644 index 000000000..948bf4614 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basalt.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basalt/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/basalt/brick.json new file mode 100644 index 000000000..b11e0a450 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basalt/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json new file mode 100644 index 000000000..3f4e8ba44 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth_brick.json new file mode 100644 index 000000000..78d3151ba --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass.json b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass.json new file mode 100644 index 000000000..59c1e89a3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/brick.json new file mode 100644 index 000000000..c3e714d9b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth.json new file mode 100644 index 000000000..5d316108c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth_brick.json new file mode 100644 index 000000000..5683c3449 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate.json b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate.json new file mode 100644 index 000000000..e4e289fb2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/brick.json new file mode 100644 index 000000000..16c776423 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth.json new file mode 100644 index 000000000..ed03eccae --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth_brick.json new file mode 100644 index 000000000..eb4fade20 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diabase.json b/src/main/resources/data/mineralogy/tags/items/stones/diabase.json new file mode 100644 index 000000000..c53507246 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diabase.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diabase/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/diabase/brick.json new file mode 100644 index 000000000..e8f95bf2d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diabase/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth.json new file mode 100644 index 000000000..f82c21daa --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth_brick.json new file mode 100644 index 000000000..8f7a84978 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diorite.json b/src/main/resources/data/mineralogy/tags/items/stones/diorite.json new file mode 100644 index 000000000..58bfa2c7b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diorite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diorite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/diorite/brick.json new file mode 100644 index 000000000..bb7d68cd5 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diorite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json new file mode 100644 index 000000000..b06acd392 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth_brick.json new file mode 100644 index 000000000..82d7dba0f --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/dolomite.json b/src/main/resources/data/mineralogy/tags/items/stones/dolomite.json new file mode 100644 index 000000000..1ed6b212d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/dolomite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/dolomite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/brick.json new file mode 100644 index 000000000..7687e5979 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth.json new file mode 100644 index 000000000..80a03fa1f --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth_brick.json new file mode 100644 index 000000000..80d7e45bc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gabbro.json b/src/main/resources/data/mineralogy/tags/items/stones/gabbro.json new file mode 100644 index 000000000..d2d73ceb1 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gabbro.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gabbro/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/brick.json new file mode 100644 index 000000000..6ee0d9b94 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth.json new file mode 100644 index 000000000..2991c2caf --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth_brick.json new file mode 100644 index 000000000..dba246ae4 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gneiss.json b/src/main/resources/data/mineralogy/tags/items/stones/gneiss.json new file mode 100644 index 000000000..6d15d2677 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gneiss.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gneiss/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/brick.json new file mode 100644 index 000000000..b70ba68ac --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth.json new file mode 100644 index 000000000..bc0ba263f --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth_brick.json new file mode 100644 index 000000000..45acbec54 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/granite.json b/src/main/resources/data/mineralogy/tags/items/stones/granite.json new file mode 100644 index 000000000..587b69c7b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/granite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/granite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/granite/brick.json new file mode 100644 index 000000000..c16cf5c6b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/granite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json new file mode 100644 index 000000000..b4ef84e85 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth_brick.json new file mode 100644 index 000000000..404ac981b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/hornfels.json b/src/main/resources/data/mineralogy/tags/items/stones/hornfels.json new file mode 100644 index 000000000..59acdf116 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/hornfels.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/hornfels/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/brick.json new file mode 100644 index 000000000..6aa77206d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth.json new file mode 100644 index 000000000..07cebd176 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth_brick.json new file mode 100644 index 000000000..ffea474be --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/limestone.json b/src/main/resources/data/mineralogy/tags/items/stones/limestone.json new file mode 100644 index 000000000..ae25aec9e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/limestone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/limestone/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/limestone/brick.json new file mode 100644 index 000000000..6b0d439c2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/limestone/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth.json new file mode 100644 index 000000000..507e26428 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth_brick.json new file mode 100644 index 000000000..4fdaa20ac --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/marble.json b/src/main/resources/data/mineralogy/tags/items/stones/marble.json new file mode 100644 index 000000000..e22e67bb1 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/marble.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/marble/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/marble/brick.json new file mode 100644 index 000000000..5929140c8 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/marble/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth.json new file mode 100644 index 000000000..4a4461db9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth_brick.json new file mode 100644 index 000000000..43df1bb35 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/novaculite.json b/src/main/resources/data/mineralogy/tags/items/stones/novaculite.json new file mode 100644 index 000000000..2339a11c9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/novaculite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/novaculite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/brick.json new file mode 100644 index 000000000..dbf80694b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth.json new file mode 100644 index 000000000..4051ebdc5 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth_brick.json new file mode 100644 index 000000000..08c1ee6dc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite.json b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite.json new file mode 100644 index 000000000..442dbf678 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/brick.json new file mode 100644 index 000000000..d3eb34db3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth.json new file mode 100644 index 000000000..08eed28b3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth_brick.json new file mode 100644 index 000000000..acd0d803f --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/peridotite.json b/src/main/resources/data/mineralogy/tags/items/stones/peridotite.json new file mode 100644 index 000000000..d774099e2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/peridotite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/peridotite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/brick.json new file mode 100644 index 000000000..63d016f1b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth.json new file mode 100644 index 000000000..df0eb7298 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth_brick.json new file mode 100644 index 000000000..8c09bb92d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/phyllite.json b/src/main/resources/data/mineralogy/tags/items/stones/phyllite.json new file mode 100644 index 000000000..f705ab15b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/phyllite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/phyllite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/brick.json new file mode 100644 index 000000000..48217ba35 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth.json new file mode 100644 index 000000000..0262774fc --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth_brick.json new file mode 100644 index 000000000..5a4d2ab25 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/quartzite.json b/src/main/resources/data/mineralogy/tags/items/stones/quartzite.json new file mode 100644 index 000000000..21db863d4 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/quartzite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/quartzite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/brick.json new file mode 100644 index 000000000..52e4999bb --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth.json new file mode 100644 index 000000000..93425eab3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth_brick.json new file mode 100644 index 000000000..2331a2b9b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite.json b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite.json new file mode 100644 index 000000000..77c7ece7b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/brick.json new file mode 100644 index 000000000..13795d330 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth.json new file mode 100644 index 000000000..c0efe6ff2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth_brick.json new file mode 100644 index 000000000..0d66a8397 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt.json b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt.json new file mode 100644 index 000000000..8133cee26 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/brick.json new file mode 100644 index 000000000..817a098e1 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth.json new file mode 100644 index 000000000..06d1768f9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth_brick.json new file mode 100644 index 000000000..a4201fe22 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/schist.json b/src/main/resources/data/mineralogy/tags/items/stones/schist.json new file mode 100644 index 000000000..61f16050a --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/schist.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/schist/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/schist/brick.json new file mode 100644 index 000000000..fc9085b03 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/schist/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth.json new file mode 100644 index 000000000..909bf8736 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth_brick.json new file mode 100644 index 000000000..2c5fef98b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/scoria.json b/src/main/resources/data/mineralogy/tags/items/stones/scoria.json new file mode 100644 index 000000000..064d4d35b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/scoria.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/scoria/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/scoria/brick.json new file mode 100644 index 000000000..e9b5259e7 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/scoria/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth.json new file mode 100644 index 000000000..4868f7e4d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth_brick.json new file mode 100644 index 000000000..ebe08dc1c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/shale.json b/src/main/resources/data/mineralogy/tags/items/stones/shale.json new file mode 100644 index 000000000..f5bb0657a --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/shale.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/shale/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/shale/brick.json new file mode 100644 index 000000000..fa80fcdf2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/shale/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth.json new file mode 100644 index 000000000..6459ae55c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth_brick.json new file mode 100644 index 000000000..91555bf03 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/siltstone.json b/src/main/resources/data/mineralogy/tags/items/stones/siltstone.json new file mode 100644 index 000000000..d09f8782d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/siltstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/siltstone/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/brick.json new file mode 100644 index 000000000..4938dfb4b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth.json new file mode 100644 index 000000000..c9102dbd7 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth_brick.json new file mode 100644 index 000000000..6a1503d2d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/slate.json b/src/main/resources/data/mineralogy/tags/items/stones/slate.json new file mode 100644 index 000000000..a9a6c28e5 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/slate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/slate/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/slate/brick.json new file mode 100644 index 000000000..615cf2cc3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/slate/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth.json new file mode 100644 index 000000000..00d738b2e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth_brick.json new file mode 100644 index 000000000..2296b997b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/tuff.json b/src/main/resources/data/mineralogy/tags/items/stones/tuff.json new file mode 100644 index 000000000..b28c5a07c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/tuff.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/tuff/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/tuff/brick.json new file mode 100644 index 000000000..f156dac18 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/tuff/brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth.json new file mode 100644 index 000000000..008c2f3a3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff_smooth" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth_brick.json new file mode 100644 index 000000000..08fc4afec --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth_brick.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff_smooth_brick" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/vanilla_furnace_materials.json b/src/main/resources/data/mineralogy/tags/items/vanilla_furnace_materials.json deleted file mode 100644 index d09a4b438..000000000 --- a/src/main/resources/data/mineralogy/tags/items/vanilla_furnace_materials.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:cobblestone", - "minecraft:blackstone", - "minecraft:cobbled_deepslate" - ] -} diff --git a/src/test/java/zone/moddev/mc/mineralogy/ConfigurationAndMigrationTest.java b/src/test/java/zone/moddev/mc/mineralogy/ConfigurationAndMigrationTest.java new file mode 100644 index 000000000..3ec3095f1 --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/ConfigurationAndMigrationTest.java @@ -0,0 +1,224 @@ +package zone.moddev.mc.mineralogy; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import org.junit.Test; +import zone.moddev.mc.mineralogy.documentation.DocumentationExporter; +import zone.moddev.mc.mineralogy.migration.LegacyOreConfigMigrator; + +import java.io.File; +import java.io.Reader; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.stream.Stream; + +import static org.junit.Assert.*; + +public class ConfigurationAndMigrationTest { + @Test + public void cleanConfigContainsOnlyContentOptionsAndSafeDefaults() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-clean-config"); + MineralogyConfig.load(directory); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + String text = new String(Files.readAllBytes(config), StandardCharsets.UTF_8); + assertTrue(text.contains("[options]")); + assertTrue(text.contains("COBBLESTONE_EQUIVILENT = true")); + assertTrue(text.contains("GROUP_TABS_BY_TYPE = false")); + assertTrue(text.contains("ENABLE_DRYWALLS = true")); + assertFalse(text.contains("world-gen")); + assertFalse(text.contains("PLACE_MINERALOGY_ROCK")); + assertTrue(MineralogyConfig.makeRockCobblestoneEquivilent()); + assertFalse(MineralogyConfig.groupCreativeTabItemsByType()); + assertTrue(MineralogyConfig.contentPolicy().drywallsEnabled()); + assertTrue(MineralogyConfig.contentPolicy().rockSaltLampsEnabled()); + assertTrue(MineralogyConfig.contentPolicy().mineralDustsEnabled()); + assertTrue(MineralogyConfig.contentPolicy().mineralFertilizerEnabled()); + } + + @Test + public void existingConfigIsReadWithoutBeingRewritten() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-existing-config"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + byte[] original = ("# retained legacy file\r\n[options]\r\n" + + "COBBLESTONE_EQUIVILENT = false\r\nGROUP_TABS_BY_TYPE = true\r\n" + + "ENABLE_DRYWALLS = false\r\nENABLE_ROCK_SALT_LAMPS = false\r\n" + + "ENABLE_MINERAL_DUSTS = false\r\nENABLE_MINERAL_FERTILIZER = false\r\n" + + "[world-gen]\r\nGEOLOGY_MODE = \"GEOME\"\r\n").getBytes(StandardCharsets.UTF_8); + Files.write(config, original); + MineralogyConfig.load(directory); + assertArrayEquals(original, Files.readAllBytes(config)); + assertFalse(MineralogyConfig.makeRockCobblestoneEquivilent()); + assertTrue(MineralogyConfig.groupCreativeTabItemsByType()); + assertFalse(MineralogyConfig.contentPolicy().drywallsEnabled()); + assertFalse(MineralogyConfig.contentPolicy().rockSaltLampsEnabled()); + assertFalse(MineralogyConfig.contentPolicy().mineralDustsEnabled()); + assertFalse(MineralogyConfig.contentPolicy().mineralFertilizerEnabled()); + assertFalse(MineralogyConfig.isCreativeVisible("drywall_black")); + assertFalse(MineralogyConfig.isCreativeVisible("sulfur_dust")); + assertFalse(MineralogyConfig.isCreativeVisible("mineral_fertilizer")); + } + + @Test + public void missingMineralogySixKeysUseEnabledDefaultsWithoutRewriting() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-old-content-config"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + byte[] original = ("[options]\nDROP_COBBLESTONE = true # retained comment\n") + .getBytes(StandardCharsets.UTF_8); + Files.write(config, original); + MineralogyConfig.load(directory); + assertArrayEquals(original, Files.readAllBytes(config)); + assertTrue(MineralogyConfig.dropCobblestone()); + assertTrue(MineralogyConfig.contentPolicy().drywallsEnabled()); + assertTrue(MineralogyConfig.contentPolicy().rockSaltLampsEnabled()); + assertTrue(MineralogyConfig.contentPolicy().mineralDustsEnabled()); + assertTrue(MineralogyConfig.contentPolicy().mineralFertilizerEnabled()); + assertFalse(MineralogyConfig.groupCreativeTabItemsByType()); + } + + @Test + public void issue121SwitchesRemainIndependent() throws Exception { + String[] keys = { ContentPolicy.ENABLE_DRYWALLS, ContentPolicy.ENABLE_ROCK_SALT_LAMPS, + ContentPolicy.ENABLE_MINERAL_DUSTS, ContentPolicy.ENABLE_MINERAL_FERTILIZER }; + String[] hidden = { "drywall_black", "rocksaltlamp", "sulfur_dust", "mineral_fertilizer" }; + for (int selected = 0; selected < keys.length; selected++) { + Path directory = Files.createTempDirectory("mineralogy-policy-" + selected); + StringBuilder config = new StringBuilder("[options]\n"); + for (int index = 0; index < keys.length; index++) { + config.append(keys[index]).append(" = ").append(index != selected).append('\n'); + } + Files.write(directory.resolve(MineralogyConfig.FILE_NAME), + config.toString().getBytes(StandardCharsets.UTF_8)); + MineralogyConfig.load(directory); + for (int index = 0; index < hidden.length; index++) { + assertEquals(keys[selected] + " must be independent for " + hidden[index], + index != selected, MineralogyConfig.isCreativeVisible(hidden[index])); + } + } + } + + @Test + public void independentOreMigrationConvertsExclusiveMaximumAndIsIdempotent() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-ore-migration"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + byte[] source = ("[ores.sulfur_ore]\nminY = 7\nmaxY = 50\nfrequency = 2.5\nquantity = 9\n" + + "[ores.phosphorous_ore]\nminY = 16\nmaxY = 64\nfrequency = 1.0\nquantity = 16\n" + + "[ores.nitrate_ore]\nminY = 5\nmaxY = 40\nfrequency = nope\nquantity = 12\n") + .getBytes(StandardCharsets.UTF_8); + Files.write(config, source); + LegacyOreConfigMigrator.migrate(config, null); + Path override = directory.resolve(LegacyOreConfigMigrator.OVERRIDE_FILE); + Path report = directory.resolve(LegacyOreConfigMigrator.REPORT_FILE); + assertTrue(Files.isRegularFile(override)); + assertTrue(Files.isRegularFile(report)); + JsonObject root = parse(override.toFile()); + JsonObject sulfur = root.getAsJsonObject("ores") + .getAsJsonObject("mineralogy:ore/mineralogy/sulfur_ore") + .getAsJsonObject("dimensions").getAsJsonObject("minecraft:overworld"); + assertEquals(7, sulfur.get("min_y").getAsInt()); + assertEquals(49, sulfur.get("max_y").getAsInt()); + assertEquals(2.5D, sulfur.get("frequency").getAsDouble(), 0.0D); + assertEquals(9, sulfur.get("quantity").getAsInt()); + String reportText = new String(Files.readAllBytes(report), StandardCharsets.UTF_8); + assertTrue(reportText.contains("phosphorous_ore.result=default")); + assertTrue(reportText.contains("nitrate_ore.result=default-invalid")); + assertArrayEquals(source, Files.readAllBytes(config)); + + byte[] firstOverride = Files.readAllBytes(override); + byte[] firstReport = Files.readAllBytes(report); + LegacyOreConfigMigrator.migrate(config, null); + assertArrayEquals(firstOverride, Files.readAllBytes(override)); + assertArrayEquals(firstReport, Files.readAllBytes(report)); + } + + @Test + public void establishedOverridesRemainAuthoritative() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-established-override"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + Files.write(config, ("[ores.sulphur_ore]\nminY=1\nmaxY=20\nfrequency=3\nquantity=4\n") + .getBytes(StandardCharsets.UTF_8)); + Path override = directory.resolve(LegacyOreConfigMigrator.OVERRIDE_FILE); + byte[] established = "{\"established\":true}\n".getBytes(StandardCharsets.UTF_8); + Files.write(override, established); + LegacyOreConfigMigrator.migrate(config, null); + assertArrayEquals(established, Files.readAllBytes(override)); + String report = new String(Files.readAllBytes(directory.resolve( + LegacyOreConfigMigrator.REPORT_FILE)), StandardCharsets.UTF_8); + assertTrue(report.contains("existing Mineralogy provider override is authoritative")); + } + + @Test + public void establishedOreSpawnGlobalConfigurationPreventsMigration() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-established-global"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + Files.write(config, ("[ores.sulfur_ore]\nminY=1\nmaxY=20\nfrequency=3\nquantity=4\n") + .getBytes(StandardCharsets.UTF_8)); + byte[] global = "{\"schema_version\":6}\n".getBytes(StandardCharsets.UTF_8); + Files.write(directory.resolve(LegacyOreConfigMigrator.GLOBAL_FILE), global); + LegacyOreConfigMigrator.migrate(config, null); + assertFalse(Files.exists(directory.resolve(LegacyOreConfigMigrator.OVERRIDE_FILE))); + assertArrayEquals(global, Files.readAllBytes(directory.resolve(LegacyOreConfigMigrator.GLOBAL_FILE))); + assertTrue(new String(Files.readAllBytes(directory.resolve(LegacyOreConfigMigrator.REPORT_FILE)), + StandardCharsets.UTF_8).contains("existing OreSpawn global configuration is authoritative")); + } + + @Test + public void nativeSulfurCategoryWinsHistoricalFallbackAndMaximum256Becomes255() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-duplicate-sulfur"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + Files.write(config, ("[ores.sulphur_ore]\nminY=2\nmaxY=30\nfrequency=2\nquantity=3\n" + + "[ores.sulfur_ore]\nminY=8\nmaxY=256\nfrequency=0\nquantity=7\n") + .getBytes(StandardCharsets.UTF_8)); + LegacyOreConfigMigrator.migrate(config, null); + JsonObject sulfur = parse(directory.resolve(LegacyOreConfigMigrator.OVERRIDE_FILE).toFile()) + .getAsJsonObject("ores").getAsJsonObject("mineralogy:ore/mineralogy/sulfur_ore") + .getAsJsonObject("dimensions").getAsJsonObject("minecraft:overworld"); + assertEquals(8, sulfur.get("min_y").getAsInt()); + assertEquals(255, sulfur.get("max_y").getAsInt()); + assertEquals(0.0D, sulfur.get("frequency").getAsDouble(), 0.0D); + assertEquals(7, sulfur.get("quantity").getAsInt()); + } + + @Test + public void allDefaultsProduceOnlyAByteStableReport() throws Exception { + Path directory = Files.createTempDirectory("mineralogy-default-ores"); + Path config = directory.resolve(MineralogyConfig.FILE_NAME); + byte[] source = ("[ores.sulfur_ore]\nminY=16\nmaxY=64\nfrequency=1.0\nquantity=16\n" + + "[ores.phosphorous_ore]\nminY=16\nmaxY=64\nfrequency=1.0\nquantity=16\n" + + "[ores.nitrate_ore]\nminY=16\nmaxY=64\nfrequency=1.0\nquantity=16\n") + .getBytes(StandardCharsets.UTF_8); + Files.write(config, source); + LegacyOreConfigMigrator.migrate(config, null); + Path report = directory.resolve(LegacyOreConfigMigrator.REPORT_FILE); + byte[] first = Files.readAllBytes(report); + assertFalse(Files.exists(directory.resolve(LegacyOreConfigMigrator.OVERRIDE_FILE))); + LegacyOreConfigMigrator.migrate(config, null); + assertArrayEquals(first, Files.readAllBytes(report)); + assertArrayEquals(source, Files.readAllBytes(config)); + } + + @Test + public void documentationExportIsMissingOnlyAndCopiesExactProvider() throws Exception { + Path output = Files.createTempDirectory("mineralogy-guide"); + assertEquals(7, DocumentationExporter.exportMissing(output)); + assertEquals(0, DocumentationExporter.exportMissing(output)); + Path readme = output.resolve("README.md"); + byte[] edited = "player edit\n".getBytes(StandardCharsets.UTF_8); + Files.write(readme, edited); + Files.delete(output.resolve("PLAYER_GUIDE.md")); + assertEquals(1, DocumentationExporter.exportMissing(output)); + assertArrayEquals(edited, Files.readAllBytes(readme)); + assertArrayEquals(Files.readAllBytes(new File( + "src/main/resources/data/mineralogy/orespawn/provider.json").toPath()), + Files.readAllBytes(output.resolve("examples/mineralogy-provider.json"))); + try (Stream files = Files.walk(output)) { + assertFalse(files.anyMatch(path -> path.getFileName().toString().endsWith(".tmp"))); + } + } + + private static JsonObject parse(File file) throws Exception { + try (Reader reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { + return new JsonParser().parse(reader).getAsJsonObject(); + } + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java new file mode 100644 index 000000000..53c29df00 --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java @@ -0,0 +1,165 @@ +package zone.moddev.mc.mineralogy; + +import org.junit.Test; +import zone.moddev.mc.mineralogy.data.MaterialData; +import zone.moddev.mc.mineralogy.blocks.Ore; +import zone.moddev.mc.mineralogy.blocks.Rock; +import zone.moddev.mc.mineralogy.blocks.RockRelief; +import zone.moddev.mc.mineralogy.blocks.RockSlab; +import zone.moddev.mc.mineralogy.blocks.RockStairs; +import zone.moddev.mc.mineralogy.blocks.RockWall; + +import java.io.File; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.HashSet; +import java.util.Set; + +import static org.junit.Assert.*; + +public class GameplayContractTest { + @Test + public void novaculiteAndRockFamilyContractsAreStable() { + assertEquals(3.0D, MaterialData.NOVACULITE.hardness, 0.0D); + assertEquals(15.0D, MaterialData.NOVACULITE.blastResistance, 0.0D); + assertEquals(1, MaterialData.NOVACULITE.toolHardnessLevel); + assertEquals(27, MaterialData.allIncludingRockSalt().size()); + Set ids = new HashSet(); + MaterialData.allIncludingRockSalt().forEach(material -> ids.add(material.id())); + assertEquals(27, ids.size()); + assertTrue(ids.contains("rock_salt")); + } + + @Test + public void creativePolicyUsesReliefBeforeSlabAndFiveGroups() throws Exception { + String source = text("src/main/java/zone/moddev/mc/mineralogy/CreativeTabPolicy.java"); + assertTrue(source.indexOf("RockRelief.class") < source.indexOf("RockSlab.class")); + assertTrue(source.contains("enum ContentGroup { ROCK, STAIR, SLAB, WALL, ITEM }")); + String groups = text("src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java"); + assertTrue(groups.contains("create(\"rock\", \"basalt\")")); + assertTrue(groups.contains("create(\"stair\", \"basalt_stairs\")")); + assertTrue(groups.contains("create(\"slab\", \"basalt_slab\")")); + assertTrue(groups.contains("create(\"wall\", \"basalt_wall\")")); + assertTrue(groups.contains("create(\"item\", \"sulfur_dust\")")); + assertTrue(groups.contains("ItemGroup.MATERIALS")); + + CreativeTabPolicy grouped = new CreativeTabPolicy(true); + assertTrue(grouped.groupTabsByType()); + assertEquals(CreativeTabPolicy.ContentGroup.ROCK, grouped.groupFor(Rock.class)); + assertEquals(CreativeTabPolicy.ContentGroup.ROCK, grouped.groupFor(Ore.class)); + assertEquals(CreativeTabPolicy.ContentGroup.STAIR, grouped.groupFor(RockStairs.class)); + assertEquals(CreativeTabPolicy.ContentGroup.SLAB, grouped.groupFor(RockSlab.class)); + assertEquals(CreativeTabPolicy.ContentGroup.WALL, grouped.groupFor(RockWall.class)); + assertEquals(CreativeTabPolicy.ContentGroup.ITEM, grouped.groupFor(RockRelief.class)); + assertEquals(CreativeTabPolicy.ContentGroup.ITEM, grouped.groupFor(Object.class)); + assertFalse(new CreativeTabPolicy(false).groupTabsByType()); + } + + @Test + public void dropsSlabsAndFurnacePersistenceFollowAcceptedSemantics() throws Exception { + String chert = text("src/main/java/zone/moddev/mc/mineralogy/blocks/Chert.java"); + assertTrue(chert.contains("if (prng.nextInt(10) == 0)")); + assertTrue(chert.contains("return super.getDrops(state, builder);")); + String rock = text("src/main/java/zone/moddev/mc/mineralogy/blocks/Rock.java"); + assertTrue(rock.contains("return Collections.singletonList(new ItemStack(Blocks.COBBLESTONE));")); + String slab = text("src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java"); + assertTrue(slab.contains("new ItemStack(drops, 2)")); + assertTrue(slab.contains("Collections.singletonList(new ItemStack(fullBlock))")); + String furnace = text("src/main/java/zone/moddev/mc/mineralogy/tileentity/TileEntityRockFurnace.java"); + assertTrue(furnace.contains("public TileEntityRockFurnace()")); + assertTrue(furnace.contains("BlockState state = getBlockState()")); + assertTrue(furnace.contains("Block block = state.getBlock()")); + assertTrue(furnace.contains("getBurnModifier()")); + assertTrue(furnace.contains("ItemStackHelper.loadAllItems")); + + String lamp = text("src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java"); + assertTrue(lamp.contains("facing.getAxis().isVertical()")); + assertTrue(lamp.contains("Block.hasEnoughSolidSide(world, supportPos, facing)")); + } + + @Test + public void cobblestonePolicyReappliesAfterReloadAndKeepsSpecialCases() throws Exception { + String policy = text("src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java"); + assertTrue(policy.contains("onTagsUpdated(TagsUpdatedEvent event)")); + assertFalse(policy.contains("onServerAboutToStart")); + assertTrue(policy.contains("event.getTagManager()")); + assertTrue(policy.contains("MaterialData.allIncludingRockSalt()")); + assertTrue(policy.contains("addBlock(blocks, \"chert\")")); + assertTrue(policy.contains("addBlock(blocks, \"pumice\")")); + assertTrue(policy.contains("addItem(items, \"chert\")")); + assertTrue(policy.contains("addItem(items, \"pumice\")")); + assertTrue(policy.contains("ITagCollectionSupplier configured")); + assertTrue(policy.contains("return replace(blockTags, blocks)")); + assertTrue(policy.contains("return replace(itemTags, items)")); + assertTrue(policy.contains("ITagCollection.getTagCollectionFromMap(tags)")); + assertTrue(policy.contains("TagRegistryManager.fetchTags(configured)")); + assertTrue(policy.contains("Ingredient.invalidateAll()")); + assertTrue(policy.contains("return manager.getCustomTagTypes()")); + } + + @Test + public void optionalGunpowderDustsCannotCollapseToTwoIngredients() throws Exception { + String generator = text("scripts/generate-recipes.ps1"); + assertTrue(generator.contains("ItemTagNotEmptyCondition 'forge:dusts/carbon'")); + assertTrue(generator.contains("ItemTagNotEmptyCondition 'forge:dusts/coal'")); + assertTrue(generator.contains("type = 'forge:not'")); + assertTrue(generator.contains("type = 'forge:tag_empty'")); + } + + @Test + public void forge36OilUsesNativeFlowingFluidRendering() throws Exception { + String fluid = text("src/main/java/zone/moddev/mc/mineralogy/fluids/MineralogyFluids.java"); + assertTrue(fluid.contains("ForgeFlowingFluid.Source")); + assertTrue(fluid.contains("ForgeFlowingFluid.Flowing")); + assertTrue(fluid.contains("FlowingFluidBlock")); + assertTrue(fluid.contains("BucketItem")); + assertTrue(fluid.contains("blocks/crude_oil_still")); + assertTrue(fluid.contains("blocks/crude_oil_flow")); + String client = text("src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java"); + assertTrue(client.contains("RenderTypeLookup.setRenderLayer(MineralogyFluids.CRUDE_OIL")); + assertTrue(client.contains("RenderType.getTranslucent()")); + assertFalse(new File("src/main/java/zone/moddev/mc/mineralogy/client/ClientOilRenderer.java").exists()); + } + + @Test + public void legacyWorldConversionPreservesIndexedChunksAndFurnaces() throws Exception { + String hook = text("src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java"); + assertTrue(hook.contains("blocks.length != 4096")); + assertTrue(hook.contains("MineralogyLegacyPreserveChunk")); + assertTrue(hook.contains("TerrainPopulated")); + assertTrue(hook.contains("LightPopulated")); + assertTrue(hook.contains("rewriteLegacyRockFurnaceTileEntities")); + assertTrue(hook.contains("normalizeLegacyTileEntityIds(level)")); + assertTrue(new File("src/main/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizer.java").exists()); + + String transformer = text("src/main/resources/coremods/mineralogy_legacy_world_fix.js"); + assertTrue(transformer.contains("mineralogy_legacy_chunk_data")); + assertTrue(transformer.contains("net.minecraft.world.chunk.storage.ChunkLoader")); + assertTrue(transformer.contains("prepareLegacyChunk")); + assertTrue(transformer.contains("finalizeLegacyChunk")); + } + + @Test + public void legacyFlatteningUsesTheExpandedArrayAndReinstallsTheSelectedWorldMapping() throws Exception { + String hook = text("src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java"); + assertTrue(hook.contains("expandFlatteningTable(highestStateId + 1)")); + assertTrue(hook.contains("valuesField.getType().getComponentType() != Dynamic.class")); + assertTrue(hook.contains("addEntry.invoke")); + assertTrue(hook.contains("WorldPersistenceHooks.addHook")); + assertTrue(hook.contains("writeSidecar(levelDat.getParentFile(), blocks)")); + assertTrue(hook.contains("install(levelDat.getParentFile(), CompressedStreamTools.readCompressed(input)")); + + String build = text("build.gradle"); + assertTrue(build.contains("dependsOn tasks.named('processResources')")); + assertTrue(build.contains("mineralogy%%${mainOutput}${File.pathSeparator}")); + assertTrue(build.contains("from processedResources")); + assertTrue(build.contains("data/mineralogy/orespawn/provider.json")); + assertTrue(build.contains("Eclipse output contains stale processed production resources")); + assertTrue(build.contains("examples/mineralogy-provider.json")); + assertTrue(build.contains("Eclipse output is missing bundled documentation")); + } + + private static String text(String path) throws Exception { + return new String(Files.readAllBytes(new File(path).toPath()), StandardCharsets.UTF_8); + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java b/src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java new file mode 100644 index 000000000..9d92569dd --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java @@ -0,0 +1,179 @@ +package zone.moddev.mc.mineralogy; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import org.junit.Test; + +import java.io.File; +import java.io.Reader; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import static org.junit.Assert.*; + +/** Quality policy for the reviewed 1.16.5 JSON localization inventory. */ +public class LocalizationQualityTest { + private static final File LANG_DIR = new File("src/main/resources/assets/mineralogy/lang"); + private static final Set ENGLISH_LOCALES = new HashSet(Arrays.asList( + "en_ca.json", "en_en.json", "en_gb.json", "en_pt.json", "en_us.json")); + private static final Set NON_LATIN_LOCALES = new HashSet(Arrays.asList( + "ja_jp.json", "ko_kr.json", "ru_ru.json", "zh_cn.json")); + private static final Pattern FORMAT_ARGUMENT = Pattern.compile("%(?:\\d+\\$)?[a-zA-Z%]"); + private static final Pattern LATIN_WORD = Pattern.compile("[A-HJ-Za-hj-z]{2,}"); + + @Test + public void everyLocaleIsUtf8JsonWithStableFormatting() throws Exception { + Map english = read(new File(LANG_DIR, "en_us.json")); + File[] files = LANG_DIR.listFiles((dir, name) -> name.endsWith(".json")); + assertNotNull(files); + assertEquals(17, files.length); + + for (File file : files) { + byte[] bytes = Files.readAllBytes(file.toPath()); + assertFalse(file.getName() + " must not contain a UTF-8 BOM", + bytes.length >= 3 && bytes[0] == (byte) 0xef + && bytes[1] == (byte) 0xbb && bytes[2] == (byte) 0xbf); + String content = new String(bytes, StandardCharsets.UTF_8); + assertFalse(file.getName() + " contains a replacement character", content.contains("\ufffd")); + assertTrue(file.getName() + " must end with a newline", content.endsWith("\n")); + for (String line : content.split("\\n", -1)) { + assertEquals(file.getName() + " has trailing whitespace", line, line.replaceFirst("[ \\t]+$", "")); + } + + Map translations = read(file); + assertEquals(file.getName(), new ArrayList(english.keySet()), + new ArrayList(translations.keySet())); + for (String key : english.keySet()) { + assertFalse(file.getName() + " has a blank value for " + key, translations.get(key).trim().isEmpty()); + assertEquals(file.getName() + " changes formatting arguments for " + key, + formatArguments(english.get(key)), formatArguments(translations.get(key))); + } + } + } + + @Test + public void nonEnglishLocalesOnlyMatchReviewedTechnicalTerms() throws Exception { + Map english = read(new File(LANG_DIR, "en_us.json")); + Map> allowed = reviewedEnglishMatches(); + File[] files = LANG_DIR.listFiles((dir, name) -> name.endsWith(".json")); + assertNotNull(files); + + for (File file : files) { + if (ENGLISH_LOCALES.contains(file.getName())) continue; + Map translations = read(file); + Set actual = new HashSet(); + for (String key : english.keySet()) { + if (english.get(key).equals(translations.get(key))) actual.add(key); + } + assertEquals(file.getName() + " has an unreviewed English fallback", + allowed.containsKey(file.getName()) ? allowed.get(file.getName()) : Collections.emptySet(), actual); + } + } + + @Test + public void nonEnglishLocalesContainNoEmbeddedEnglishUiFragments() throws Exception { + Map forbidden = forbiddenEnglishByLocale(); + File[] files = LANG_DIR.listFiles((dir, name) -> name.endsWith(".json")); + assertNotNull(files); + for (File file : files) { + if (ENGLISH_LOCALES.contains(file.getName())) continue; + for (Map.Entry entry : read(file).entrySet()) { + if (NON_LATIN_LOCALES.contains(file.getName())) { + assertFalse(file.getName() + " contains an English word in " + entry, + LATIN_WORD.matcher(entry.getValue()).find()); + } else { + Pattern pattern = forbidden.get(file.getName()); + assertNotNull("Missing forbidden-word policy for " + file.getName(), pattern); + assertFalse(file.getName() + " contains an English UI fragment in " + entry, + pattern.matcher(entry.getValue()).find()); + } + } + } + } + + @Test + public void representativeTranslationsCoverGeologyTabsAndOil() throws Exception { + assertLocale("de_de.json", "block.mineralogy.shale", "Tonschiefer"); + assertLocale("de_de.json", "item.mineralogy.crude_oil_bucket", "Roh\u00f6leimer"); + assertLocale("es_es.json", "block.mineralogy.siltstone", "Limolita"); + assertLocale("fr_fr.json", "block.mineralogy.hornfels", "Corn\u00e9enne"); + assertLocale("pt_br.json", "block.mineralogy.shale", "Folhelho"); + assertLocale("ja_jp.json", "block.mineralogy.conglomerate", "\u792b\u5ca9"); + assertLocale("ko_kr.json", "block.mineralogy.gabbro", "\ubc18\ub824\uc554"); + assertLocale("ru_ru.json", "item.mineralogy.crude_oil_bucket", "\u0412\u0435\u0434\u0440\u043e \u0441\u044b\u0440\u043e\u0439 \u043d\u0435\u0444\u0442\u0438"); + assertLocale("zh_cn.json", "itemGroup.mineralogy.item", "\u77ff\u7269\u5b66\u7269\u54c1"); + } + + private static void assertLocale(String locale, String key, String expected) throws Exception { + assertEquals(expected, read(new File(LANG_DIR, locale)).get(key)); + } + + private static Map> reviewedEnglishMatches() { + Set german = new HashSet(Arrays.asList( + "block.mineralogy.basalt", "block.mineralogy.gabbro", "block.mineralogy.hornfels")); + Set french = new HashSet(Arrays.asList( + "block.mineralogy.amphibolite", "block.mineralogy.chert", "block.mineralogy.diabase", + "block.mineralogy.diorite", "block.mineralogy.gabbro", "block.mineralogy.gneiss", + "block.mineralogy.granite", "block.mineralogy.nitrate_block", + "block.mineralogy.novaculite", "block.mineralogy.pegmatite", + "block.mineralogy.quartzite", "block.mineralogy.rhyolite")); + Map> allowed = new HashMap>(); + allowed.put("de_au.json", german); + allowed.put("de_de.json", german); + allowed.put("fr_ca.json", french); + allowed.put("fr_fr.json", french); + return allowed; + } + + private static Map forbiddenEnglishByLocale() { + String common = "Polished|Wall|Furnace|Hoe|Pickaxe|Sword|Blank|Left|Right|Street|" + + "Dust|Ore|Bucket|Fertilizer|Crude|Oil|Stairs|Slab|Brick|Smooth|Drywall|Axe|Cross"; + Map forbidden = new HashMap(); + forbidden.put("de_au.json", words(common)); + forbidden.put("de_de.json", words(common)); + forbidden.put("es_es.json", words(common + "|Hammer|Relief|Gabbro|Siltstone|Phyllite|Hornfels|Tuff|Slate|Scoria|Plus")); + forbidden.put("es_mx.json", forbidden.get("es_es.json")); + forbidden.put("fr_ca.json", words(common + "|Hammer|Siltstone|Phyllite|Tuff|Slate|Scoria")); + forbidden.put("fr_fr.json", forbidden.get("fr_ca.json")); + forbidden.put("pt_br.json", words(common + "|Hammer|Relief|Gabbro|Siltstone|Phyllite|Hornfels|Tuff|Slate|Scoria|Plus")); + forbidden.put("pt_pt.json", forbidden.get("pt_br.json")); + return forbidden; + } + + private static Pattern words(String alternatives) { + return Pattern.compile("\\b(?:" + alternatives + ")\\b", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE); + } + + private static List formatArguments(String value) { + List result = new ArrayList(); + Matcher matcher = FORMAT_ARGUMENT.matcher(value); + while (matcher.find()) result.add(matcher.group()); + return result; + } + + private static Map read(File file) throws Exception { + JsonObject object; + try (Reader reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { + object = new JsonParser().parse(reader).getAsJsonObject(); + } + Map values = new LinkedHashMap(); + for (Map.Entry entry : object.entrySet()) { + assertTrue(file.getName() + " contains a non-string value for " + entry.getKey(), + entry.getValue().isJsonPrimitive() && entry.getValue().getAsJsonPrimitive().isString()); + values.put(entry.getKey(), entry.getValue().getAsString()); + } + return values; + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java new file mode 100644 index 000000000..f6ef4433c --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java @@ -0,0 +1,296 @@ +package zone.moddev.mc.mineralogy; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import org.junit.Test; + +import java.io.File; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.junit.Assert.*; + +public class ResourceContractTest { + private static final File ROOT = new File("src/main/resources"); + + @Test + public void providerUsesOreSpawnFourAndOwnsNoVanillaGeneration() throws Exception { + JsonObject provider = json(new File(ROOT, "data/mineralogy/orespawn/provider.json")); + assertEquals(4, provider.get("schema_version").getAsInt()); + assertEquals(3, provider.get("provider_revision").getAsInt()); + assertEquals("mineralogy", provider.get("provider_modid").getAsString()); + assertEquals(32, provider.getAsJsonObject("rocks").size()); + assertEquals(3, provider.getAsJsonObject("ores").size()); + assertEquals(1, provider.getAsJsonObject("fluid_deposits").size()); + assertFalse(provider.getAsJsonObject("profile_defaults").get("manage_vanilla_ores").getAsBoolean()); + JsonObject dimensions = provider.getAsJsonObject("profile_defaults").getAsJsonObject("terrain_dimensions"); + assertEquals(1, dimensions.size()); + assertTrue(dimensions.has("minecraft:overworld")); + String text = new String(Files.readAllBytes(new File(ROOT, + "data/mineralogy/orespawn/provider.json").toPath()), StandardCharsets.UTF_8); + assertTrue(text.contains("\"minecraft:andesite\"")); + assertTrue(text.contains("\"minecraft:diorite\"")); + assertTrue(text.contains("\"minecraft:granite\"")); + JsonObject defaults = provider.getAsJsonObject("profile_defaults"); + assertEquals("minecraft:basalt", defaults.getAsJsonObject("worldgen_aliases") + .get("mineralogy:basalt").getAsString()); + assertEquals("minecraft:basalt", provider.getAsJsonObject("rocks") + .getAsJsonObject("mineralogy:rock/minecraft/basalt").get("block").getAsString()); + assertEquals("mineralogy:tuff", provider.getAsJsonObject("rocks") + .getAsJsonObject("mineralogy:rock/minecraft/tuff").get("block").getAsString()); + assertFalse(text.contains("metadata")); + assertFalse(text.contains("deepslate")); + } + + @Test + public void everyRecipeHasAProgressiveAdvancement() throws Exception { + File recipeDir = new File(ROOT, "data/mineralogy/recipes"); + File advancementDir = new File(ROOT, "data/mineralogy/advancements/recipes"); + File[] recipes = recipeDir.listFiles((dir, name) -> name.endsWith(".json")); + File[] advancements = advancementDir.listFiles((dir, name) -> name.endsWith(".json")); + assertNotNull(recipes); + assertNotNull(advancements); + assertEquals(1415, recipes.length); + assertEquals(1415, advancements.length); + + Set advancementNames = new HashSet(); + for (File file : advancements) advancementNames.add(file.getName()); + for (File recipeFile : recipes) { + JsonObject recipe = json(recipeFile); + assertFalse(recipeFile.getName(), recipe.get("type").getAsString().startsWith("forge:ore_")); + assertTrue(recipeFile.getName(), advancementNames.contains(recipeFile.getName())); + JsonObject advancement = json(new File(advancementDir, recipeFile.getName())); + assertEquals("mineralogy:" + stripJson(recipeFile.getName()), + advancement.getAsJsonObject("rewards").getAsJsonArray("recipes").get(0).getAsString()); + assertTrue(advancement.getAsJsonObject("criteria").has("has_the_recipe")); + assertTrue(advancement.getAsJsonObject("criteria").has("has_rock")); + if (recipe.has("conditions")) { + assertTrue(recipeFile.getName(), recipe.get("conditions").isJsonArray()); + assertTrue(recipeFile.getName(), advancement.has("conditions")); + assertEquals(recipeFile.getName(), recipe.get("conditions"), advancement.get("conditions")); + } else { + assertFalse(recipeFile.getName(), advancement.has("conditions")); + } + } + + JsonObject smooth = json(new File(advancementDir, "basalt_smooth.json")); + assertEquals("mineralogy:basalt", criterionItem(smooth, "has_rock")); + assertTrue(smooth.getAsJsonObject("criteria").has("has_sand")); + JsonObject stairs = json(new File(advancementDir, "basalt_smooth_stairs.json")); + assertEquals("mineralogy:basalt_smooth", criterionItem(stairs, "has_rock")); + JsonObject blank = json(new File(advancementDir, "basalt_relief_blank.json")); + assertEquals("mineralogy:basalt_smooth", criterionItem(blank, "has_rock")); + JsonObject marked = json(new File(advancementDir, "basalt_relief_pickaxe.json")); + assertEquals("mineralogy:basalt_relief_blank", criterionItem(marked, "has_rock")); + JsonObject right = json(new File(advancementDir, "basalt_relief_right.json")); + assertEquals("mineralogy:basalt_relief_left", criterionItem(right, "has_rock")); + } + + @Test + public void acceptedRecipeDetailsArePresent() throws Exception { + File recipes = new File(ROOT, "data/mineralogy/recipes"); + assertEquals(4, json(new File(recipes, "gypsum_dust.json")) + .getAsJsonObject("result").get("count").getAsInt()); + assertEquals(2, json(new File(recipes, "gypsum.json")).getAsJsonArray("pattern").size()); + assertEquals("minecraft:charcoal", json(new File(recipes, "gunpowder_from_charcoal.json")) + .getAsJsonArray("ingredients").get(0).getAsJsonObject().get("item").getAsString()); + assertFalse(new File(recipes, "gunpowder_from_coal.json").exists()); + assertGunpowderRecipe(recipes, "gunpowder_from_sugar", null); + assertGunpowderRecipe(recipes, "gunpowder_from_charcoal", null); + assertGunpowderRecipe(recipes, "gunpowder_from_carbon_dust", "forge:dusts/carbon"); + assertGunpowderRecipe(recipes, "gunpowder_from_coal_dust", "forge:dusts/coal"); + assertEquals("mineralogy:basalt", json(new File(recipes, "basalt_slab.json")) + .getAsJsonObject("key").getAsJsonObject("x").get("item").getAsString()); + assertEquals("mineralogy:basalt", json(new File(recipes, "basalt_raw_slab_recombination.json")) + .getAsJsonObject("result").get("item").getAsString()); + assertEquals("forge:sand", json(new File(recipes, "basalt_brick_block_polishing.json")) + .getAsJsonArray("ingredients").get(1).getAsJsonObject().get("tag").getAsString()); + JsonObject furnace = json(new File(recipes, "basalt_furnace.json")); + assertEquals("mineralogy:slabs/basalt", furnace.getAsJsonObject("key") + .getAsJsonObject("x").get("tag").getAsString()); + assertEquals("minecraft:furnace", furnace.getAsJsonObject("key") + .getAsJsonObject("y").get("item").getAsString()); + assertFalse(new File(recipes, "basalt_furnace_from_rock.json").exists()); + assertFalse(new File(ROOT, "data/minecraft/recipes/furnace.json").exists()); + assertFalse(new File(ROOT, "data/minecraft/recipes/stone_pickaxe.json").exists()); + assertEquals("#forge:cobblestone", json(new File(ROOT, + "data/minecraft/tags/items/stone_crafting_materials.json")) + .getAsJsonArray("values").get(0).getAsString()); + assertEquals("#forge:cobblestone", json(new File(ROOT, + "data/minecraft/tags/items/stone_tool_materials.json")) + .getAsJsonArray("values").get(0).getAsString()); + assertFalse(new File(ROOT, "data/mineralogy/tags/items/vanilla_furnace_materials.json").exists()); + assertEquals("minecraft:red_dye", json(new File(recipes, "drywall_red.json")) + .getAsJsonArray("ingredients").get(1).getAsJsonObject().get("item").getAsString()); + assertEquals("minecraft:green_dye", json(new File(recipes, "drywall_green.json")) + .getAsJsonArray("ingredients").get(1).getAsJsonObject().get("item").getAsString()); + assertEquals("minecraft:yellow_dye", json(new File(recipes, "drywall_yellow.json")) + .getAsJsonArray("ingredients").get(1).getAsJsonObject().get("item").getAsString()); + } + + @Test + public void allSeventeenLocalesHaveOrdered938KeyParity() throws Exception { + File directory = new File(ROOT, "assets/mineralogy/lang"); + Set expectedFiles = new HashSet(Arrays.asList( + "de_au.json", "de_de.json", "en_ca.json", "en_en.json", "en_gb.json", + "en_pt.json", "en_us.json", "es_es.json", "es_mx.json", "fr_ca.json", + "fr_fr.json", "ja_jp.json", "ko_kr.json", "pt_br.json", "pt_pt.json", + "ru_ru.json", "zh_cn.json")); + File[] files = directory.listFiles((dir, name) -> name.endsWith(".json")); + assertNotNull(files); + Set actual = new HashSet(); + for (File file : files) actual.add(file.getName()); + assertEquals(expectedFiles, actual); + + List keys = keys(json(new File(directory, "en_us.json"))); + assertEquals(938, keys.size()); + for (File file : files) { + byte[] bytes = Files.readAllBytes(file.toPath()); + assertFalse(file.getName(), bytes.length >= 3 && bytes[0] == (byte) 0xef + && bytes[1] == (byte) 0xbb && bytes[2] == (byte) 0xbf); + String text = new String(bytes, StandardCharsets.UTF_8); + assertFalse(file.getName(), text.contains("\ufffd")); + assertTrue(file.getName(), text.endsWith("\n")); + assertEquals(file.getName(), keys, keys(json(file))); + } + assertPair(directory, "de_au.json", "de_de.json"); + assertPair(directory, "es_es.json", "es_mx.json"); + assertPair(directory, "fr_ca.json", "fr_fr.json"); + assertPair(directory, "pt_br.json", "pt_pt.json"); + JsonObject japanese = json(new File(directory, "ja_jp.json")); + assertEquals("原油入りãƒã‚±ãƒ„", japanese.get("item.mineralogy.crude_oil_bucket").getAsString()); + JsonObject russian = json(new File(directory, "ru_ru.json")); + assertEquals("Ведро Ñырой нефти", russian.get("item.mineralogy.crude_oil_bucket").getAsString()); + } + + @Test + public void forge36ResourcesRetainNativeWallsTagsAndPackFormat() throws Exception { + JsonObject pack = json(new File(ROOT, "pack.mcmeta")); + assertEquals(6, pack.getAsJsonObject("pack").get("pack_format").getAsInt()); + + File blockstates = new File(ROOT, "assets/mineralogy/blockstates"); + File[] wallStates = blockstates.listFiles((dir, name) -> name.endsWith("_wall.json")); + assertNotNull(wallStates); + assertEquals(108, wallStates.length); + for (File state : wallStates) { + assertTrue(state.getName(), new String(Files.readAllBytes(state.toPath()), StandardCharsets.UTF_8) + .contains("_wall_side_tall")); + } + File models = new File(ROOT, "assets/mineralogy/models/block"); + File[] tallSides = models.listFiles((dir, name) -> name.endsWith("_wall_side_tall.json")); + assertNotNull(tallSides); + assertEquals(108, tallSides.length); + + assertTrue(new File(ROOT, "data/minecraft/tags/blocks/walls.json").isFile()); + assertTrue(new File(ROOT, "data/minecraft/tags/items/walls.json").isFile()); + File minecraftRecipes = new File(ROOT, "data/minecraft/recipes"); + File[] overrides = minecraftRecipes.listFiles((dir, name) -> name.endsWith(".json")); + assertTrue(overrides == null || overrides.length == 0); + File[] stonecutting = new File(ROOT, "data/mineralogy/recipes") + .listFiles((dir, name) -> name.contains("stonecutting")); + assertNotNull(stonecutting); + assertEquals(0, stonecutting.length); + } + + @Test + public void oilAndBuildMetadataUseStableTargetIdentities() throws Exception { + String properties = new String(Files.readAllBytes(new File("gradle.properties").toPath()), StandardCharsets.UTF_8); + assertTrue(properties.contains("mod_version=6.0.1.116051")); + assertTrue(properties.contains("orespawn_curse_file_id=8742102")); + String build = new String(Files.readAllBytes(new File("build.gradle").toPath()), StandardCharsets.UTF_8); + assertTrue(build.contains("runtimeOnly renamer.dependency(\"curse.maven:mmd-orespawn-")); + assertTrue(build.contains("orespawnRelease")); + String metadata = new String(Files.readAllBytes(new File(ROOT, "META-INF/mods.toml").toPath()), StandardCharsets.UTF_8); + assertTrue(metadata.contains("loaderVersion=\"[36,)\"")); + assertTrue(metadata.contains("versionRange=\"[36.2.34,37)\"")); + assertTrue(metadata.contains("versionRange=\"[4.0.6,5.0.0)\"")); + assertTrue(metadata.contains("ordering=\"AFTER\"")); + assertTrue(new File(ROOT, "assets/mineralogy/textures/items/crude_oil_bucket.png").isFile()); + assertTrue(new File(ROOT, "assets/mineralogy/textures/blocks/crude_oil_still.png").isFile()); + String fluidSource = new String(Files.readAllBytes(new File( + "src/main/java/zone/moddev/mc/mineralogy/fluids/MineralogyFluids.java").toPath()), StandardCharsets.UTF_8); + assertTrue(fluidSource.contains("\"flowing_crude_oil\"")); + assertTrue(fluidSource.contains("\"crude_oil_bucket\"")); + assertFalse(fluidSource.contains("new ResourceLocation(\"crude_oil\")")); + } + + @Test + public void internalWorldgenAndRetiredPackagesAreAbsent() throws Exception { + assertFalse(containsJava(new File("src/main/java/com/mcmoddev/mineralogy"))); + assertFalse(containsJava(new File("src/main/java/zone/moddev/mc/mineralogy/worldgen"))); + String main = new String(Files.readAllBytes(new File( + "src/main/java/zone/moddev/mc/mineralogy/Mineralogy.java").toPath()), StandardCharsets.UTF_8); + assertFalse(main.contains("registerWorldGenerator")); + assertFalse(main.contains("StoneReplacer")); + assertFalse(main.contains("OreSpawner")); + } + + private static String criterionItem(JsonObject advancement, String criterion) { + return advancement.getAsJsonObject("criteria").getAsJsonObject(criterion) + .getAsJsonObject("conditions").getAsJsonArray("items").get(0) + .getAsJsonObject().get("item").getAsString(); + } + + private static JsonObject json(File file) throws Exception { + try (java.io.Reader reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { + return new JsonParser().parse(reader).getAsJsonObject(); + } + } + + private static void assertGunpowderRecipe(File recipes, String name, String requiredTag) throws Exception { + JsonObject recipe = json(new File(recipes, name + ".json")); + assertEquals(name, 3, recipe.getAsJsonArray("ingredients").size()); + assertGunpowderConditions(name, requiredTag, recipe.getAsJsonArray("conditions")); + JsonObject advancement = json(new File(ROOT, + "data/mineralogy/advancements/recipes/" + name + ".json")); + assertGunpowderConditions(name + " advancement", requiredTag, + advancement.getAsJsonArray("conditions")); + } + + private static void assertGunpowderConditions(String name, String requiredTag, JsonArray conditions) { + assertEquals(name, requiredTag == null ? 1 : 2, conditions.size()); + assertEquals(name, "mineralogy:config", + conditions.get(0).getAsJsonObject().get("type").getAsString()); + if (requiredTag != null) { + JsonObject tagCondition = conditions.get(1).getAsJsonObject(); + assertEquals(name, "forge:not", tagCondition.get("type").getAsString()); + JsonObject value = tagCondition.getAsJsonObject("value"); + assertEquals(name, "forge:tag_empty", value.get("type").getAsString()); + assertEquals(name, requiredTag, value.get("tag").getAsString()); + } + } + + private static List keys(JsonObject object) { + List result = new ArrayList(); + for (Map.Entry entry : object.entrySet()) result.add(entry.getKey()); + return result; + } + + private static void assertPair(File directory, String first, String second) throws Exception { + assertArrayEquals(Files.readAllBytes(new File(directory, first).toPath()), + Files.readAllBytes(new File(directory, second).toPath())); + } + + private static String stripJson(String name) { + return name.substring(0, name.length() - ".json".length()); + } + + private static boolean containsJava(File directory) { + if (!directory.isDirectory()) return false; + File[] children = directory.listFiles(); + if (children == null) return false; + for (File child : children) { + if (child.isFile() && child.getName().endsWith(".java")) return true; + if (containsJava(child)) return true; + } + return false; + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java new file mode 100644 index 000000000..d5a395638 --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java @@ -0,0 +1,107 @@ +package zone.moddev.mc.mineralogy; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.FileInputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.Properties; + +import org.junit.Test; + +public class WorkflowContractTest { + @Test + public void releaseMetadataIdentifiesTheGenericForgeTarget() throws Exception { + Properties properties = new Properties(); + try (FileInputStream input = new FileInputStream("gradle.properties")) { + properties.load(input); + } + assertEquals("6.0.1.116051", properties.getProperty("mod_version")); + assertEquals("1.16.5", properties.getProperty("minecraft_version")); + assertEquals(properties.getProperty("mc_version"), properties.getProperty("minecraft_version")); + assertEquals("forge", properties.getProperty("loader_name")); + assertEquals("1", properties.getProperty("loader_code")); + assertEquals("8", properties.getProperty("java_version")); + assertEquals("8.0.502+7", properties.getProperty("java_toolchain_version")); + assertEquals("17", properties.getProperty("gradle_java_version")); + assertEquals("240974", properties.getProperty("curseforge_project_id")); + assertEquals("zone.moddev.mc.mineralogy", properties.getProperty("mod_group")); + assertEquals("4.0.9.116051", properties.getProperty("orespawn_version")); + assertEquals("8742102", properties.getProperty("orespawn_curse_file_id")); + assertEquals("6F5E61E89547BBF779C18EDFCF4D1D47BED8D6FA0FE9EDECE87B376F117D1147", + properties.getProperty("orespawn_sha256")); + } + + @Test + public void ciAndSecurityChecksUsePinnedTargetNativeBuilds() throws Exception { + String ci = text(".github/workflows/ci.yml"); + String codeql = text(".github/workflows/codeql-analysis.yml"); + String wrapper = text(".github/workflows/validate-gradle-build.yml"); + String staging = text("gradle/stage-orespawn-release.sh"); + assertTrue(ci.contains("name: Build, test, and audit")); + assertTrue(ci.contains("master-1.16.5")); + assertTrue(ci.contains("java-version: '8.0.502+7'")); + assertTrue(ci.contains("Install Java 17 for Gradle")); + assertTrue(ci.contains("verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums")); + assertTrue(ci.contains("genEclipseRuns eclipse isolateEclipseProductionRuns verifyEclipseProductionClasspath")); + assertTrue(ci.contains("CHANGELOG.txt")); + assertTrue(ci.contains("-PorespawnVerificationRepository=${{ steps.orespawn.outputs.repository }}")); + assertTrue(staging.contains("https://www.curseforge.com/api/v1/mods/$project_id/files/$file_id/download")); + assertTrue(staging.contains("sha256sum")); + assertTrue(codeql.contains("github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28")); + assertTrue(codeql.contains("./gradlew clean classes")); + assertTrue(codeql.contains("--rerun-tasks --no-build-cache")); + assertTrue(wrapper.contains("gradle/actions/wrapper-validation@9c971963bec38e04b3d30dcc455b5382be2fdbfb")); + } + + @Test + public void tagValidatorIsGenericAndDoesNotDispatchPublication() throws Exception { + String tag = text(".github/workflows/release-on-tag.yml"); + assertTrue(tag.contains("'*.*.*.*'")); + assertTrue(tag.contains("loader_name:$loader_code")); + assertTrue(tag.contains("Build, test, and audit")); + assertTrue(tag.contains("Release tag must equal mod_version")); + assertTrue(tag.contains("confirm live publication: checked")); + assertFalse(tag.contains("gh workflow run")); + assertFalse(tag.contains("actions: write")); + } + + @Test + public void buildPublishesOnlyThePreparedRemoteBundle() throws Exception { + String build = text("build.gradle"); + assertTrue(build.contains("options.addBooleanOption('notimestamp', true)")); + assertTrue(build.contains("id 'net.minecraftforge.renamer' version '1.1.5'")); + assertTrue(build.contains("def releaseJar = renamer.classes")); + assertTrue(build.contains("preserveFileTimestamps = false")); + assertTrue(build.contains("reproducibleFileOrder = true")); + assertTrue(build.contains("def preparedReleaseDir = project.findProperty('preparedReleaseDir')")); + assertTrue(build.contains("tasks.register('verifyPreparedReleaseArtifacts')")); + assertTrue(build.contains("tasks.withType(PublishToMavenRepository).configureEach")); + assertTrue(build.contains("tasks.register('verifyMavenCoordinates')")); + assertTrue(build.contains("generatePomFileForMavenJavaPublication")); + assertTrue(build.contains("dependsOn tasks.named('verifyMavenCoordinates')")); + assertTrue(build.contains("expectedMavenGroup = 'zone.moddev.mc.mineralogy'")); + assertTrue(build.contains("expectedMavenArtifact = 'Mineralogy'")); + assertTrue(build.contains("'Maven-Artifact'")); + assertTrue(build.contains("Maven release publication must use a remote repository")); + assertTrue(build.contains("name = 'release'")); + assertFalse(build.contains("file:///${project.projectDir}/mcmodsrepo")); + } + + @Test + public void stagedOreSpawnDependencyCannotFallThroughToPublicRepositories() throws Exception { + String build = text("build.gradle"); + assertTrue(build.contains("exclusiveContent")); + assertTrue(build.contains("forRepository")); + assertTrue(build.contains("includeModule('curse.maven', orespawnModule)")); + assertTrue(build.contains("'OreSpawnReleaseVerificationMirror'")); + } + + private static String text(String path) throws Exception { + return new String(Files.readAllBytes(new File(path).toPath()), StandardCharsets.UTF_8) + .replace("\r\n", "\n").replace('\r', '\n'); + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizerTest.java b/src/test/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizerTest.java new file mode 100644 index 000000000..4f48d196a --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizerTest.java @@ -0,0 +1,33 @@ +package zone.moddev.mc.mineralogy.patching; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class LegacyTileEntityIdNormalizerTest { + @Test + public void mapsEveryLegacyVanillaTileSeenByPreFlatteningWorlds() { + assertEquals("minecraft:chest", LegacyTileEntityIdNormalizer.normalize("Chest")); + assertEquals("minecraft:furnace", LegacyTileEntityIdNormalizer.normalize("Furnace")); + assertEquals("minecraft:enchanting_table", LegacyTileEntityIdNormalizer.normalize("EnchantTable")); + assertEquals("minecraft:flower_pot", LegacyTileEntityIdNormalizer.normalize("FlowerPot")); + assertEquals("minecraft:hopper", LegacyTileEntityIdNormalizer.normalize("Hopper")); + assertEquals("minecraft:mob_spawner", LegacyTileEntityIdNormalizer.normalize("MobSpawner")); + assertEquals("minecraft:jukebox", LegacyTileEntityIdNormalizer.normalize("RecordPlayer")); + assertEquals("minecraft:brewing_stand", LegacyTileEntityIdNormalizer.normalize("Cauldron")); + } + + @Test + public void preservesAlreadyValidNamespacedModTiles() { + assertEquals("mineralogy:rock_furnace", + LegacyTileEntityIdNormalizer.normalize("mineralogy:rock_furnace")); + assertEquals("poweradvantage.item_conveyor", + LegacyTileEntityIdNormalizer.normalize("poweradvantage.item_conveyor")); + } + + @Test + public void makesUnknownOldModIdentifiersParseableWithoutDiscardingTheirNbt() { + assertEquals("minecraft:pamapiary", LegacyTileEntityIdNormalizer.normalize("PamApiary")); + assertEquals("old_mod:odd_tile", LegacyTileEntityIdNormalizer.normalize("Old Mod:Odd Tile")); + } +} From e3ea2695822e141f65dc7d3639af695714608c2d Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 27 Aug 2026 12:42:20 +0100 Subject: [PATCH 02/10] Fix vanilla furnace cobblestone compatibility --- CHANGELOG.txt | 7 +++++-- build.gradle | 6 ++++-- docs/DEVELOPER_GUIDE.md | 17 +++++++++++------ .../data/minecraft/recipes/furnace.json | 16 ++++++++++++++++ .../mc/mineralogy/ResourceContractTest.java | 8 ++++++-- 5 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/data/minecraft/recipes/furnace.json diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a30501406..924f37b1e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -38,8 +38,11 @@ Mineralogy 6.0.1.116051 for Minecraft 1.16.5 blank-to-marked relief progression. - Extended Minecraft 1.16's native stone crafting and tool-material tags so every enabled Forge cobblestone equivalent, including all 27 Mineralogy rock - families, works in vanilla furnaces and tools without overriding vanilla - recipes or conflicting with matching-slab rock-furnace upgrades. + families, works in vanilla tools. The vanilla furnace recipe is also + data-overridden to consume the live `forge:cobblestone` tag because Forge 36 + does not refresh its nested crafting-material tag after Mineralogy applies + the configured membership. Matching-slab rock-furnace upgrades remain + distinct. - Prevented Forge 36 from silently reducing optional carbon- or coal-dust gunpowder recipes to nitrate plus sulfur when their compatibility tag is empty; every loaded gunpowder recipe now requires all three components. diff --git a/build.gradle b/build.gradle index 46cf6f250..3f4d0bce3 100644 --- a/build.gradle +++ b/build.gradle @@ -483,8 +483,10 @@ tasks.register('verifyReleaseArtifacts') { if (recipes.size() != 1415 || advancements.size() != 1415) { throw new GradleException("Release jar must contain 1415 recipes and advancements, found ${recipes.size()} and ${advancements.size()}") } - if (names.any { it.startsWith('data/minecraft/recipes/') || it.contains('/stonecutting/') }) { - throw new GradleException('Release jar contains retired vanilla overrides or stonecutting recipes') + def minecraftRecipes = names.findAll { it.startsWith('data/minecraft/recipes/') && it.endsWith('.json') } + if (minecraftRecipes.size() != 1 || !minecraftRecipes.contains('data/minecraft/recipes/furnace.json') || + names.any { it.contains('/stonecutting/') }) { + throw new GradleException('Release jar must contain only the required vanilla furnace override and no stonecutting recipes') } def wallBlockstates = names.findAll { it ==~ /assets\/mineralogy\/blockstates\/.+_wall\.json/ } def tallWallModels = names.findAll { it ==~ /assets\/mineralogy\/models\/block\/.+_wall_side_tall\.json/ } diff --git a/docs/DEVELOPER_GUIDE.md b/docs/DEVELOPER_GUIDE.md index ef7ee719e..62c85909a 100644 --- a/docs/DEVELOPER_GUIDE.md +++ b/docs/DEVELOPER_GUIDE.md @@ -40,12 +40,17 @@ specialty aliases. Minecraft 1.16's `minecraft:stone_crafting_materials` and `minecraft:stone_tool_materials` item tags include `#forge:cobblestone`, so -enabled Mineralogy rocks work in native tool and furnace-style recipes without -overriding Minecraft recipe files. Forge 36 exposes immutable tag snapshots; -Mineralogy rebuilds only the block and item tag collections after initial tag -loading and every data reload, preserves other mods' members, then invalidates -recipe ingredient caches. Do not replace this with startup-only mutation or -restore the retired `data/minecraft/recipes` overrides. +enabled Mineralogy rocks work in native tool recipes. Forge 36 exposes +immutable tag snapshots; Mineralogy rebuilds only the block and item tag +collections after initial tag loading and every data reload, preserves other +mods' members, then invalidates recipe ingredient caches. + +The vanilla furnace recipe is the one required exception: it is packaged at +`data/minecraft/recipes/furnace.json` with a direct `forge:cobblestone` +ingredient. Forge 36's already-resolved nested crafting-material tag does not +observe the configured runtime membership reliably, while the direct tag does. +Do not broaden vanilla slab, stair, or wall recipes; Mineralogy owns exact +material variants for those outputs. Use broad `stone` or `cobblestone` inputs only when any matching material is valid. Recipes returning a Mineralogy construction form must use the exact diff --git a/src/main/resources/data/minecraft/recipes/furnace.json b/src/main/resources/data/minecraft/recipes/furnace.json new file mode 100644 index 000000000..7b098ff9d --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/furnace.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "# #", + "###" + ], + "key": { + "#": { + "tag": "forge:cobblestone" + } + }, + "result": { + "item": "minecraft:furnace" + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java index f6ef4433c..a9f933f12 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java @@ -119,7 +119,9 @@ public void acceptedRecipeDetailsArePresent() throws Exception { assertEquals("minecraft:furnace", furnace.getAsJsonObject("key") .getAsJsonObject("y").get("item").getAsString()); assertFalse(new File(recipes, "basalt_furnace_from_rock.json").exists()); - assertFalse(new File(ROOT, "data/minecraft/recipes/furnace.json").exists()); + JsonObject vanillaFurnace = json(new File(ROOT, "data/minecraft/recipes/furnace.json")); + assertEquals("forge:cobblestone", vanillaFurnace.getAsJsonObject("key") + .getAsJsonObject("#").get("tag").getAsString()); assertFalse(new File(ROOT, "data/minecraft/recipes/stone_pickaxe.json").exists()); assertEquals("#forge:cobblestone", json(new File(ROOT, "data/minecraft/tags/items/stone_crafting_materials.json")) @@ -193,7 +195,9 @@ public void forge36ResourcesRetainNativeWallsTagsAndPackFormat() throws Exceptio assertTrue(new File(ROOT, "data/minecraft/tags/items/walls.json").isFile()); File minecraftRecipes = new File(ROOT, "data/minecraft/recipes"); File[] overrides = minecraftRecipes.listFiles((dir, name) -> name.endsWith(".json")); - assertTrue(overrides == null || overrides.length == 0); + assertNotNull(overrides); + assertEquals(1, overrides.length); + assertEquals("furnace.json", overrides[0].getName()); File[] stonecutting = new File(ROOT, "data/mineralogy/recipes") .listFiles((dir, name) -> name.contains("stonecutting")); assertNotNull(stonecutting); From bbb887f808bf263981cd741a9b863a970e4b96e1 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 27 Aug 2026 13:16:55 +0100 Subject: [PATCH 03/10] Repair Forge 36 recipe tags and Eclipse guide loading --- CHANGELOG.txt | 18 +-- docs/DEVELOPER_GUIDE.md | 13 +- .../compat/CobblestoneTagPolicy.java | 133 ++++++++++++------ .../documentation/DocumentationExporter.java | 46 +++++- .../mc/mineralogy/GameplayContractTest.java | 12 +- .../compat/CobblestoneTagPolicyTest.java | 34 +++++ .../DocumentationExporterSourceTest.java | 44 ++++++ 7 files changed, 231 insertions(+), 69 deletions(-) create mode 100644 src/test/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicyTest.java create mode 100644 src/test/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporterSourceTest.java diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 924f37b1e..0edc6a9ea 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -20,9 +20,9 @@ Mineralogy 6.0.1.116051 for Minecraft 1.16.5 - Preserved vertically mounted legacy rock-salt lamps on torch-supporting blocks such as fences during pre-flattening world conversion. - Made the historical `COBBLESTONE_EQUIVILENT` option functional through - target-native block and item tags, reapplied after data reloads and reflected - in already-parsed recipe ingredients. Chert and pumice remain unconditional - cobblestone equivalents. + target-native block and item tags, reapplied after data reloads by updating + the exact immutable tag objects retained by already-parsed Forge 36 recipe + ingredients. Chert and pumice remain unconditional cobblestone equivalents. - Added isolated Mineralogy crude-oil source and flowing fluids, block, bucket, rendering resources, and the covered Ocean deposit declaration. - Uses Minecraft 1.16's native basalt for new OreSpawn terrain while retaining @@ -39,10 +39,9 @@ Mineralogy 6.0.1.116051 for Minecraft 1.16.5 - Extended Minecraft 1.16's native stone crafting and tool-material tags so every enabled Forge cobblestone equivalent, including all 27 Mineralogy rock families, works in vanilla tools. The vanilla furnace recipe is also - data-overridden to consume the live `forge:cobblestone` tag because Forge 36 - does not refresh its nested crafting-material tag after Mineralogy applies - the configured membership. Matching-slab rock-furnace upgrades remain - distinct. + data-overridden to consume the live `forge:cobblestone` tag; both it and the + nested vanilla crafting/tool tags now observe the configured membership. + Matching-slab rock-furnace upgrades remain distinct. - Prevented Forge 36 from silently reducing optional carbon- or coal-dust gunpowder recipes to nitrate plus sulfur when their compatibility tag is empty; every loaded gunpowder recipe now requires all three components. @@ -52,8 +51,9 @@ Mineralogy 6.0.1.116051 for Minecraft 1.16.5 - Added first-start player, developer, content, provider, and version guides, plus an exact provider example. Existing exported guides are never overwritten. Forge 36 Eclipse launches keep their required merged - `bin/main` mod output while synchronizing the same processed guide resources - used by ordinary Gradle and packaged launches. + `bin/main` mod output; if Eclipse removes Gradle's staged guide copies, the + exporter reads the authoritative source-checkout guides without weakening + packaged-jar validation. - Added independent, atomic migration of valid non-default legacy ore settings into a Mineralogy OreSpawn provider override, including deterministic reports and exclusive-to-inclusive maximum-height conversion. diff --git a/docs/DEVELOPER_GUIDE.md b/docs/DEVELOPER_GUIDE.md index 62c85909a..d78e01710 100644 --- a/docs/DEVELOPER_GUIDE.md +++ b/docs/DEVELOPER_GUIDE.md @@ -42,15 +42,18 @@ Minecraft 1.16's `minecraft:stone_crafting_materials` and `minecraft:stone_tool_materials` item tags include `#forge:cobblestone`, so enabled Mineralogy rocks work in native tool recipes. Forge 36 exposes immutable tag snapshots; Mineralogy rebuilds only the block and item tag -collections after initial tag loading and every data reload, preserves other -mods' members, then invalidates recipe ingredient caches. +membership after initial tag loading and every data reload, preserves other +mods' members, updates the exact tag instances retained by parsed recipes, +then invalidates recipe ingredient caches. The nested Minecraft crafting and +tool tags are updated alongside the direct Forge tag. The vanilla furnace recipe is the one required exception: it is packaged at `data/minecraft/recipes/furnace.json` with a direct `forge:cobblestone` ingredient. Forge 36's already-resolved nested crafting-material tag does not -observe the configured runtime membership reliably, while the direct tag does. -Do not broaden vanilla slab, stair, or wall recipes; Mineralogy owns exact -material variants for those outputs. +observe a replacement tag collection, so Mineralogy mutates retained tag +instances rather than swapping the collection. Do not broaden vanilla slab, +stair, or wall recipes; Mineralogy owns exact material variants for those +outputs. Use broad `stone` or `cobblestone` inputs only when any matching material is valid. Recipes returning a Mineralogy construction form must use the exact diff --git a/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java b/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java index b136eaf8a..0ca7a71db 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java +++ b/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java @@ -1,19 +1,20 @@ package zone.moddev.mc.mineralogy.compat; -import java.util.LinkedHashMap; +import java.lang.reflect.Field; import java.util.LinkedHashSet; -import java.util.Map; +import java.util.List; import java.util.Set; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; + import net.minecraft.block.Block; -import net.minecraft.entity.EntityType; -import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; import net.minecraft.item.crafting.Ingredient; import net.minecraft.tags.ITag; import net.minecraft.tags.ITagCollection; import net.minecraft.tags.ITagCollectionSupplier; -import net.minecraft.tags.TagRegistryManager; +import net.minecraft.tags.Tag; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.TagsUpdatedEvent; import net.minecraftforge.registries.ForgeRegistries; @@ -26,6 +27,10 @@ /** Applies the legacy cobblestone option to target-native block and item tags. */ public final class CobblestoneTagPolicy { private static final ResourceLocation COBBLESTONE = new ResourceLocation("forge", "cobblestone"); + private static final ResourceLocation STONE_CRAFTING_MATERIALS = + new ResourceLocation("minecraft", "stone_crafting_materials"); + private static final ResourceLocation STONE_TOOL_MATERIALS = + new ResourceLocation("minecraft", "stone_tool_materials"); private CobblestoneTagPolicy() { } @@ -40,54 +45,38 @@ static void apply(ITagCollectionSupplier manager) { Set configuredItems = new LinkedHashSet<>(); for (Block block : configuredBlocks) configuredItems.add(block.asItem()); + boolean enabled = MineralogyConfig.makeRockCobblestoneEquivilent(); + ITagCollection blockTags = manager.getBlockTags(); Set blocks = existing(blockTags, COBBLESTONE); blocks.removeAll(configuredBlocks); - if (MineralogyConfig.makeRockCobblestoneEquivilent()) blocks.addAll(configuredBlocks); + if (enabled) blocks.addAll(configuredBlocks); addBlock(blocks, "chert"); addBlock(blocks, "pumice"); + replaceElementsInPlace(required(blockTags, COBBLESTONE), blocks); ITagCollection itemTags = manager.getItemTags(); Set items = existing(itemTags, COBBLESTONE); items.removeAll(configuredItems); - if (MineralogyConfig.makeRockCobblestoneEquivilent()) items.addAll(configuredItems); + if (enabled) items.addAll(configuredItems); addItem(items, "chert"); addItem(items, "pumice"); + replaceElementsInPlace(required(itemTags, COBBLESTONE), items); - ITagCollectionSupplier configured = new ITagCollectionSupplier() { - @Override - public ITagCollection getBlockTags() { - return replace(blockTags, blocks); - } - - @Override - public ITagCollection getItemTags() { - return replace(itemTags, items); - } - - @Override - public ITagCollection getFluidTags() { - return manager.getFluidTags(); - } - - @Override - public ITagCollection> getEntityTypeTags() { - return manager.getEntityTypeTags(); - } + // Nested tags were already expanded before this event. Update their + // retained objects as well so vanilla tool recipes see the same + // configured membership as recipes that use forge:cobblestone directly. + updateDerivedItemTag(itemTags, STONE_CRAFTING_MATERIALS, configuredItems, enabled); + updateDerivedItemTag(itemTags, STONE_TOOL_MATERIALS, configuredItems, enabled); - @Override - public Map> getCustomTagTypes() { - return manager.getCustomTagTypes(); - } - }; - - // Forge 36 snapshots the loaded tags in immutable collections before - // firing TagsUpdatedEvent. Rebuild only the two cobblestone collections - // and refetch the named wrappers used by blocks, items and recipes. - TagRegistryManager.fetchTags(configured); + Mineralogy.LOGGER.debug("Applied Forge 36 cobblestone policy: enabled={}, rocks={}, " + + "forgeItems={}, craftingItems={}, toolItems={}", enabled, configuredItems.size(), + required(itemTags, COBBLESTONE).getAllElements().size(), + required(itemTags, STONE_CRAFTING_MATERIALS).getAllElements().size(), + required(itemTags, STONE_TOOL_MATERIALS).getAllElements().size()); // Ingredients cache their expanded matching stacks independently of the - // named tag wrapper, so invalidate them after every initial load/reload. + // retained tag object, so invalidate them after every initial load/reload. Ingredient.invalidateAll(); } @@ -105,13 +94,69 @@ private static Set existing(ITagCollection collection, ResourceLocatio return tag == null ? new LinkedHashSet<>() : new LinkedHashSet<>(tag.getAllElements()); } - private static ITagCollection replace(ITagCollection collection, Set values) { - if (collection.get(COBBLESTONE) == null) { - throw new IllegalStateException("Missing required tag " + COBBLESTONE); + private static void updateDerivedItemTag(ITagCollection tags, ResourceLocation id, + Set configuredItems, boolean enabled) { + Set values = existing(tags, id); + values.removeAll(configuredItems); + if (enabled) values.addAll(configuredItems); + addItem(values, "chert"); + addItem(values, "pumice"); + replaceElementsInPlace(required(tags, id), values); + } + + private static ITag required(ITagCollection collection, ResourceLocation id) { + ITag tag = collection.get(id); + if (tag == null) { + throw new IllegalStateException("Missing required tag " + id); + } + return tag; + } + + /** + * Forge 36 recipes retain the concrete tag instance resolved while their + * ingredients are parsed. Replacing the surrounding collection therefore + * leaves recipes pointing at stale immutable contents. Update both fields + * on that exact instance so membership tests and expanded stack lists agree. + */ + @SuppressWarnings("unchecked") + static void replaceElementsInPlace(ITag tag, Set values) { + if (!(tag instanceof Tag)) { + throw new IllegalStateException("Unsupported Forge 36 tag implementation " + + tag.getClass().getName()); + } + Tag retained = (Tag) tag; + setRetainedField(retained, "field_241282_b_", List.class, ImmutableList.copyOf(values)); + setRetainedField(retained, "field_241283_c_", Set.class, ImmutableSet.copyOf(values)); + } + + private static void setRetainedField(Tag retained, String mappedName, + Class fieldType, Object value) { + Field selected = null; + try { + selected = Tag.class.getDeclaredField(mappedName); + } catch (NoSuchFieldException ignored) { + // The production jar uses obfuscated field names. Their distinct + // List/Set types are stable on Forge 36 and identify them safely. + for (Field field : Tag.class.getDeclaredFields()) { + if (fieldType.isAssignableFrom(field.getType())) { + if (selected != null) { + throw new IllegalStateException("Ambiguous Forge 36 tag " + + fieldType.getSimpleName() + " field"); + } + selected = field; + } + } + } + if (selected == null) { + throw new IllegalStateException("Missing Forge 36 tag " + + fieldType.getSimpleName() + " field"); + } + try { + selected.setAccessible(true); + selected.set(retained, value); + } catch (IllegalAccessException ex) { + throw new IllegalStateException("Could not update retained Forge 36 tag", ex); } - Map> tags = new LinkedHashMap<>(collection.getIDTagMap()); - tags.put(COBBLESTONE, ITag.getTagOf(values)); - return ITagCollection.getTagCollectionFromMap(tags); } private static void addBlock(Set blocks, String name) { diff --git a/src/main/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporter.java b/src/main/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporter.java index 373880331..abd4a7cc7 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporter.java +++ b/src/main/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporter.java @@ -5,6 +5,7 @@ import java.nio.file.AtomicMoveNotSupportedException; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import org.apache.logging.log4j.LogManager; @@ -18,7 +19,8 @@ public final class DocumentationExporter { private static final GuideFile[] FILES = { guide("README.md"), guide("PLAYER_GUIDE.md"), guide("DEVELOPER_GUIDE.md"), guide("CONTENT_CONFIG.md"), guide("PROVIDER.md"), guide("VERSIONS.md"), - new GuideFile("examples/mineralogy-provider.json", "/data/mineralogy/orespawn/provider.json") + new GuideFile("examples/mineralogy-provider.json", "/data/mineralogy/orespawn/provider.json", + "src/main/resources/data/mineralogy/orespawn/provider.json") }; private DocumentationExporter() { @@ -39,8 +41,7 @@ public static int exportMissing(Path targetRoot) throws IOException { for (GuideFile file : FILES) { Path target = targetRoot.resolve(file.target); if (Files.exists(target)) continue; - try (InputStream source = DocumentationExporter.class.getResourceAsStream(file.resource)) { - if (source == null) throw new IOException("Missing bundled documentation resource " + file.resource); + try (InputStream source = openSource(file)) { Files.createDirectories(target.getParent()); Path temporary = Files.createTempFile(target.getParent(), target.getFileName().toString(), ".tmp"); try { @@ -55,6 +56,36 @@ public static int exportMissing(Path targetRoot) throws IOException { return exported; } + private static InputStream openSource(GuideFile file) throws IOException { + return openSource(file.resource, file.developmentSource); + } + + static InputStream openSource(String resource, String developmentSource) throws IOException { + InputStream bundled = DocumentationExporter.class.getResourceAsStream(resource); + if (bundled != null) return bundled; + + // Eclipse rebuilds bin/main from source folders and removes the guide + // files Gradle stages there. In an actual source checkout, recover from + // the authoritative files without weakening packaged-jar validation. + Path source = findDevelopmentSource(Paths.get("").toAbsolutePath(), developmentSource); + if (source != null) { + LOGGER.debug("Using source-checkout Mineralogy guide resource {}", source); + return Files.newInputStream(source); + } + throw new IOException("Missing bundled documentation resource " + resource); + } + + static Path findDevelopmentSource(Path start, String relative) { + Path root = start.toAbsolutePath().normalize(); + for (int depth = 0; root != null && depth < 3; depth++, root = root.getParent()) { + Path candidate = root.resolve(relative).normalize(); + if (Files.isRegularFile(root.resolve("build.gradle")) && Files.isRegularFile(candidate)) { + return candidate; + } + } + return null; + } + private static void moveIntoPlace(Path source, Path target) throws IOException { try { Files.move(source, target, StandardCopyOption.ATOMIC_MOVE); @@ -64,12 +95,17 @@ private static void moveIntoPlace(Path source, Path target) throws IOException { } private static GuideFile guide(String name) { - return new GuideFile(name, "/META-INF/mineralogy/docs/" + name); + return new GuideFile(name, "/META-INF/mineralogy/docs/" + name, "docs/" + name); } private static final class GuideFile { private final String target; private final String resource; - private GuideFile(String target, String resource) { this.target = target; this.resource = resource; } + private final String developmentSource; + private GuideFile(String target, String resource, String developmentSource) { + this.target = target; + this.resource = resource; + this.developmentSource = developmentSource; + } } } diff --git a/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java index 53c29df00..6f09bf741 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java @@ -88,13 +88,13 @@ public void cobblestonePolicyReappliesAfterReloadAndKeepsSpecialCases() throws E assertTrue(policy.contains("addBlock(blocks, \"pumice\")")); assertTrue(policy.contains("addItem(items, \"chert\")")); assertTrue(policy.contains("addItem(items, \"pumice\")")); - assertTrue(policy.contains("ITagCollectionSupplier configured")); - assertTrue(policy.contains("return replace(blockTags, blocks)")); - assertTrue(policy.contains("return replace(itemTags, items)")); - assertTrue(policy.contains("ITagCollection.getTagCollectionFromMap(tags)")); - assertTrue(policy.contains("TagRegistryManager.fetchTags(configured)")); + assertTrue(policy.contains("replaceElementsInPlace(required(blockTags, COBBLESTONE), blocks)")); + assertTrue(policy.contains("replaceElementsInPlace(required(itemTags, COBBLESTONE), items)")); + assertTrue(policy.contains("STONE_CRAFTING_MATERIALS")); + assertTrue(policy.contains("STONE_TOOL_MATERIALS")); + assertTrue(policy.contains("setRetainedField")); + assertFalse(policy.contains("TagRegistryManager.fetchTags")); assertTrue(policy.contains("Ingredient.invalidateAll()")); - assertTrue(policy.contains("return manager.getCustomTagTypes()")); } @Test diff --git a/src/test/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicyTest.java b/src/test/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicyTest.java new file mode 100644 index 000000000..11976268f --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicyTest.java @@ -0,0 +1,34 @@ +package zone.moddev.mc.mineralogy.compat; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.Arrays; +import java.util.LinkedHashSet; +import java.util.Set; + +import net.minecraft.tags.ITag; + +import org.junit.Test; + +public class CobblestoneTagPolicyTest { + @Test + public void retainedRecipeTagSeesAddedAndRemovedElements() { + Object vanilla = new Object(); + Object mineralogy = new Object(); + ITag retainedByRecipe = ITag.getTagOf(set(vanilla)); + + CobblestoneTagPolicy.replaceElementsInPlace(retainedByRecipe, set(vanilla, mineralogy)); + assertEquals(Arrays.asList(vanilla, mineralogy), retainedByRecipe.getAllElements()); + assertTrue(retainedByRecipe.contains(mineralogy)); + + CobblestoneTagPolicy.replaceElementsInPlace(retainedByRecipe, set(vanilla)); + assertEquals(Arrays.asList(vanilla), retainedByRecipe.getAllElements()); + assertFalse(retainedByRecipe.contains(mineralogy)); + } + + private static Set set(Object... values) { + return new LinkedHashSet<>(Arrays.asList(values)); + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporterSourceTest.java b/src/test/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporterSourceTest.java new file mode 100644 index 000000000..b1f2f476f --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/documentation/DocumentationExporterSourceTest.java @@ -0,0 +1,44 @@ +package zone.moddev.mc.mineralogy.documentation; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.io.InputStream; + +import org.junit.Test; + +public class DocumentationExporterSourceTest { + @Test + public void eclipseRunDirectoryFindsAuthoritativeGuideSources() { + Path project = Paths.get("").toAbsolutePath().normalize(); + Path expected = project.resolve("docs/README.md").normalize(); + assertEquals(expected, + DocumentationExporter.findDevelopmentSource(project.resolve("run"), "docs/README.md")); + } + + @Test + public void unrelatedDirectoryDoesNotBecomeADevelopmentFallback() throws Exception { + Path unrelated = Files.createTempDirectory("mineralogy-guide-unrelated"); + assertNull(DocumentationExporter.findDevelopmentSource(unrelated, "docs/README.md")); + } + + @Test + public void missingEclipseClasspathResourceReadsAuthoritativeSourceFile() throws Exception { + byte[] expected = Files.readAllBytes(Paths.get("docs/README.md")); + byte[] actual = new byte[expected.length]; + try (InputStream source = DocumentationExporter.openSource( + "/missing-from-eclipse-bin-main.md", "docs/README.md")) { + int offset = 0; + while (offset < actual.length) { + int read = source.read(actual, offset, actual.length - offset); + if (read < 0) break; + offset += read; + } + assertEquals(expected.length, offset); + } + org.junit.Assert.assertArrayEquals(expected, actual); + } +} From f8771b2430630e300a50b90f4eab9224d7525453 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 27 Aug 2026 14:29:34 +0100 Subject: [PATCH 04/10] Reveal rock furnace recipes from matching slabs --- CHANGELOG.txt | 3 ++- docs/DEVELOPER_GUIDE.md | 4 ++- scripts/generate-recipes.ps1 | 12 +-------- .../recipes/amphibolite_brick_furnace.json | 14 ----------- .../recipes/amphibolite_furnace.json | 14 ----------- .../amphibolite_smooth_brick_furnace.json | 14 ----------- .../recipes/amphibolite_smooth_furnace.json | 14 ----------- .../recipes/andesite_brick_furnace.json | 14 ----------- .../recipes/andesite_furnace.json | 14 ----------- .../andesite_smooth_brick_furnace.json | 14 ----------- .../recipes/andesite_smooth_furnace.json | 14 ----------- .../recipes/basalt_brick_furnace.json | 14 ----------- .../advancements/recipes/basalt_furnace.json | 14 ----------- .../recipes/basalt_smooth_brick_furnace.json | 14 ----------- .../recipes/basalt_smooth_furnace.json | 14 ----------- .../recipes/basaltic_glass_brick_furnace.json | 14 ----------- .../recipes/basaltic_glass_furnace.json | 14 ----------- .../basaltic_glass_smooth_brick_furnace.json | 14 ----------- .../basaltic_glass_smooth_furnace.json | 14 ----------- .../recipes/conglomerate_brick_furnace.json | 14 ----------- .../recipes/conglomerate_furnace.json | 14 ----------- .../conglomerate_smooth_brick_furnace.json | 14 ----------- .../recipes/conglomerate_smooth_furnace.json | 14 ----------- .../recipes/diabase_brick_furnace.json | 14 ----------- .../advancements/recipes/diabase_furnace.json | 14 ----------- .../recipes/diabase_smooth_brick_furnace.json | 14 ----------- .../recipes/diabase_smooth_furnace.json | 14 ----------- .../recipes/diorite_brick_furnace.json | 14 ----------- .../advancements/recipes/diorite_furnace.json | 14 ----------- .../recipes/diorite_smooth_brick_furnace.json | 14 ----------- .../recipes/diorite_smooth_furnace.json | 14 ----------- .../recipes/dolomite_brick_furnace.json | 14 ----------- .../recipes/dolomite_furnace.json | 14 ----------- .../dolomite_smooth_brick_furnace.json | 14 ----------- .../recipes/dolomite_smooth_furnace.json | 14 ----------- .../recipes/gabbro_brick_furnace.json | 14 ----------- .../advancements/recipes/gabbro_furnace.json | 14 ----------- .../recipes/gabbro_smooth_brick_furnace.json | 14 ----------- .../recipes/gabbro_smooth_furnace.json | 14 ----------- .../recipes/gneiss_brick_furnace.json | 14 ----------- .../advancements/recipes/gneiss_furnace.json | 14 ----------- .../recipes/gneiss_smooth_brick_furnace.json | 14 ----------- .../recipes/gneiss_smooth_furnace.json | 14 ----------- .../recipes/granite_brick_furnace.json | 14 ----------- .../advancements/recipes/granite_furnace.json | 14 ----------- .../recipes/granite_smooth_brick_furnace.json | 14 ----------- .../recipes/granite_smooth_furnace.json | 14 ----------- .../recipes/hornfels_brick_furnace.json | 14 ----------- .../recipes/hornfels_furnace.json | 14 ----------- .../hornfels_smooth_brick_furnace.json | 14 ----------- .../recipes/hornfels_smooth_furnace.json | 14 ----------- .../recipes/limestone_brick_furnace.json | 14 ----------- .../recipes/limestone_furnace.json | 14 ----------- .../limestone_smooth_brick_furnace.json | 14 ----------- .../recipes/limestone_smooth_furnace.json | 14 ----------- .../recipes/marble_brick_furnace.json | 14 ----------- .../advancements/recipes/marble_furnace.json | 14 ----------- .../recipes/marble_smooth_brick_furnace.json | 14 ----------- .../recipes/marble_smooth_furnace.json | 14 ----------- .../recipes/novaculite_brick_furnace.json | 14 ----------- .../recipes/novaculite_furnace.json | 14 ----------- .../novaculite_smooth_brick_furnace.json | 14 ----------- .../recipes/novaculite_smooth_furnace.json | 14 ----------- .../recipes/pegmatite_brick_furnace.json | 14 ----------- .../recipes/pegmatite_furnace.json | 14 ----------- .../pegmatite_smooth_brick_furnace.json | 14 ----------- .../recipes/pegmatite_smooth_furnace.json | 14 ----------- .../recipes/peridotite_brick_furnace.json | 14 ----------- .../recipes/peridotite_furnace.json | 14 ----------- .../peridotite_smooth_brick_furnace.json | 14 ----------- .../recipes/peridotite_smooth_furnace.json | 14 ----------- .../recipes/phyllite_brick_furnace.json | 14 ----------- .../recipes/phyllite_furnace.json | 14 ----------- .../phyllite_smooth_brick_furnace.json | 14 ----------- .../recipes/phyllite_smooth_furnace.json | 14 ----------- .../recipes/quartzite_brick_furnace.json | 14 ----------- .../recipes/quartzite_furnace.json | 14 ----------- .../quartzite_smooth_brick_furnace.json | 14 ----------- .../recipes/quartzite_smooth_furnace.json | 14 ----------- .../recipes/rhyolite_brick_furnace.json | 14 ----------- .../recipes/rhyolite_furnace.json | 14 ----------- .../rhyolite_smooth_brick_furnace.json | 14 ----------- .../recipes/rhyolite_smooth_furnace.json | 14 ----------- .../recipes/rock_salt_brick_furnace.json | 14 ----------- .../recipes/rock_salt_furnace.json | 14 ----------- .../rock_salt_smooth_brick_furnace.json | 14 ----------- .../recipes/rock_salt_smooth_furnace.json | 14 ----------- .../recipes/schist_brick_furnace.json | 14 ----------- .../advancements/recipes/schist_furnace.json | 14 ----------- .../recipes/schist_smooth_brick_furnace.json | 14 ----------- .../recipes/schist_smooth_furnace.json | 14 ----------- .../recipes/scoria_brick_furnace.json | 14 ----------- .../advancements/recipes/scoria_furnace.json | 14 ----------- .../recipes/scoria_smooth_brick_furnace.json | 14 ----------- .../recipes/scoria_smooth_furnace.json | 14 ----------- .../recipes/shale_brick_furnace.json | 14 ----------- .../advancements/recipes/shale_furnace.json | 14 ----------- .../recipes/shale_smooth_brick_furnace.json | 14 ----------- .../recipes/shale_smooth_furnace.json | 14 ----------- .../recipes/siltstone_brick_furnace.json | 14 ----------- .../recipes/siltstone_furnace.json | 14 ----------- .../siltstone_smooth_brick_furnace.json | 14 ----------- .../recipes/siltstone_smooth_furnace.json | 14 ----------- .../recipes/slate_brick_furnace.json | 14 ----------- .../advancements/recipes/slate_furnace.json | 14 ----------- .../recipes/slate_smooth_brick_furnace.json | 14 ----------- .../recipes/slate_smooth_furnace.json | 14 ----------- .../recipes/tuff_brick_furnace.json | 14 ----------- .../advancements/recipes/tuff_furnace.json | 14 ----------- .../recipes/tuff_smooth_brick_furnace.json | 14 ----------- .../recipes/tuff_smooth_furnace.json | 14 ----------- .../mc/mineralogy/ResourceContractTest.java | 25 +++++++++++++++++++ 112 files changed, 31 insertions(+), 1525 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0edc6a9ea..7a4bddaf9 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -35,7 +35,8 @@ Mineralogy 6.0.1.116051 for Minecraft 1.16.5 advancements: safe 4-to-1 mineral packing, charcoal and Base Metals dust gunpowder routes, exact slabs, slab recombination, construction-form brick conversions, progressive sand polishing, matching-slab rock furnaces, and - blank-to-marked relief progression. + blank-to-marked relief progression. Each rock-furnace recipe is revealed as + soon as its matching slab is acquired, before a vanilla furnace is crafted. - Extended Minecraft 1.16's native stone crafting and tool-material tags so every enabled Forge cobblestone equivalent, including all 27 Mineralogy rock families, works in vanilla tools. The vanilla furnace recipe is also diff --git a/docs/DEVELOPER_GUIDE.md b/docs/DEVELOPER_GUIDE.md index d78e01710..7266ee201 100644 --- a/docs/DEVELOPER_GUIDE.md +++ b/docs/DEVELOPER_GUIDE.md @@ -71,7 +71,9 @@ other recipe unlocks, which would recursively reveal an entire construction tree. Polishing uses Minecraft 1.16.5's advancement requirements matrix to require the matching source plus accepted sand; manually crafting a recipe is the target-native fallback for Forge's delayed crafting-output inventory -trigger. +trigger. Rock-furnace advancements use the exact matching slab as their sole +material criterion. They deliberately do not require an already-owned vanilla +furnace, so the upgrade route is visible before that intermediate is crafted. Reliefs preserve the historical two-stage contract. Nine exact matching polished blocks produce 16 blank reliefs; the blank relief is then the input to diff --git a/scripts/generate-recipes.ps1 b/scripts/generate-recipes.ps1 index 3f2fb0ce1..1621ad398 100644 --- a/scripts/generate-recipes.ps1 +++ b/scripts/generate-recipes.ps1 @@ -535,13 +535,6 @@ function Ensure-MissingRecipeAdvancements() { $sandMode = Get-SandUnlockMode $recipeName Add-SandUnlockCriteria $criteria $sandMode $requirements = Get-UnlockRequirements $sandMode - if ($recipeName -match '_furnace$') { - $criteria['has_furnace'] = [ordered]@{ - trigger = 'minecraft:inventory_changed' - conditions = [ordered]@{ items = @([ordered]@{ item = 'minecraft:furnace' }) } - } - $requirements += ,@('has_the_recipe', 'has_furnace') - } $generatedAdvancement = [ordered]@{} if ($null -ne $recipe.conditions) { @@ -589,16 +582,13 @@ function Synchronize-AdvancementConditions() { } $criteria = [ordered]@{} foreach ($criterion in $advancement.criteria.PSObject.Properties) { - if ($criterion.Name -notin @('has_material_recipe', 'has_sand', 'has_red_sand')) { + if ($criterion.Name -notin @('has_material_recipe', 'has_sand', 'has_red_sand', 'has_furnace')) { $criteria[$criterion.Name] = $criterion.Value } } $sandMode = Get-SandUnlockMode $recipeName Add-SandUnlockCriteria $criteria $sandMode $requirements = Get-UnlockRequirements $sandMode - if ($recipeName -match '_furnace$') { - $requirements += ,@('has_the_recipe', 'has_furnace') - } $ordered = [ordered]@{} if ($null -ne $recipe.conditions) { diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json index cc057b192..c515bb2bf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json index e2f4e34c1..53af343be 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json index 7c7b70295..59117e361 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json index daaef571d..84f05dba9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json index 01e51bbe0..b76856360 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json index 76f4c1359..13fc4b36f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json index fcf7b64de..a655c3d7e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json index db82c35bb..559781695 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json index e0860685c..ec3cf5c2f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json index 51869233e..c96a92e4d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json index 0100b8938..89806d879 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json index 656cc90f0..5b1dcea60 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json index 81cfbc7e1..5e9a614bd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json index d2bb5af1b..76161a892 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json index 2d3ed7119..92e67b90d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json index 579a0304f..50f4434cf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json index 1fca06527..4a55dfb6b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json index 945927081..4ebe85467 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json index c4d25d86f..3a42d2b9e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json index 05e19732d..4f7804769 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json index aa524c8e4..58b750c68 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json index ae887d7ec..64345c477 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json index c063fc666..c6414ca65 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json index 739ed87fc..e9d16673e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json index f72875313..af7a955f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json index 0112fb748..70bf696aa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json index ff15ee07b..aecb3b8e0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json index 6ada70f46..8b2ed87fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json index db1c25573..66d5967af 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json index 6f2535cbb..e323181a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json index ef78baa44..4bc1f5bce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json index 5b6b31280..8490cc169 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json index 3ff00717f..8a8a9a81a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json index 95b12f7ce..383d420c9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json index 47e57cf43..4cbb0e4c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json index 0ace44b9b..7b73eb8f1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json index 26869f4df..c101a2b66 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json index 1442b6d67..22c1617a7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json index ea0766225..d38f46318 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json index 78a496eb7..614d3d260 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json index b08d3d814..2153fc261 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json index a3e11b118..edeea0c9f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json index 4b9030331..c8eb28ad2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json index 3a6cfb596..21cce629a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json index 0b08cc9a2..d8ca895ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json index bd4cde9d0..37d2ca732 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json index d25ba8a4a..66605819e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json index ca5828120..5c53cc9ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json index ba99dc1f5..0c32538b8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json index 9c946cfe6..d6ec0833a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json index 20320430a..e5ff72d03 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json index 7d389e2c3..084ea0cbf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json index 125a84293..7cfd0d4af 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json index 707846cd2..2e30f25ee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json index fa7c1751e..62619be81 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json index 192befe06..36c6a7a9b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json index d7ce13a0b..6242ddbca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json index 42d5e023e..e05ee8b2d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json index e5eabd323..7bca98fdb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json index b129e6f4e..85df95c14 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json index d9384dc84..a16c52ad2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json index 9578279a3..1e7e6b1bb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json index c799123b9..eab23e3eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json index 5dd3c182a..b42725479 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json index 3a2f93025..048eb0cc0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json index 4f063168b..49f207d0b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json index 1b3486fc1..2b83dabb6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json index d52182012..1d670e063 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json index 1e268c61f..80b0d3187 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json index a8e366eb3..bf71f7890 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json index a24fedfa3..0195e2b9f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json index 7f7f119ed..8dc2041db 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json index 9f8a0733d..762db98ec 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json index f7430c3fc..cb4865eea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json index cf284cb5b..862a8dcfb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json index 6d97fa2eb..a2a185d1b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json index 80a46423a..16b255e89 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json index da747f8ec..9808c39fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json index 067ec87ba..4fa7915e8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json index b6b1521e2..67f5975f9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json index 52707d17a..53baf5775 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json index e2d718306..e99aa0c97 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json index 1b7062b34..5a47d177d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json index 24ff8589e..5288dc3b3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json index 18c197281..97af883d8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json index e0b07a0dd..c2c042873 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json index b2849147f..9763fbc26 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json index 03caaa243..32f5310d5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json index 9e9a6eb2c..8d59cfb9c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json index a782d060e..030e77a52 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json index 3e97a9ad1..015f9160f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json index 2490f9329..6458a5fd3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json index 734db2fca..cc973e73e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json index 267e1748f..266fa2ef3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json index 552d76b84..6e3cc971d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json index f2e360f2c..16006f4d4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json index 281f53bf2..a13c66b31 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json index 58c18677f..fbc8f6a11 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json index 4e79e144c..551a049ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json index dda88531f..654eb149b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json index fd16de3a4..86cf4d107 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json index 9c683e289..82814fcf4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json index 085912626..ba25d8190 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json index 3d9b50e6b..edf49538d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json index 8c0d4004e..60da94b78 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json index 5d4b50059..79833219c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json index 1fec636db..ced9c5d99 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json index 57b8f5bb1..e6b4a7bae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json @@ -26,26 +26,12 @@ } ] } - }, - "has_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:furnace" - } - ] - } } }, "requirements": [ [ "has_the_recipe", "has_rock" - ], - [ - "has_the_recipe", - "has_furnace" ] ] } diff --git a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java index a9f933f12..c66915417 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java @@ -94,6 +94,31 @@ public void everyRecipeHasAProgressiveAdvancement() throws Exception { assertEquals("mineralogy:basalt_relief_left", criterionItem(right, "has_rock")); } + @Test + public void rockFurnacesUnlockFromTheirMatchingSlabs() throws Exception { + File advancementDir = new File(ROOT, "data/mineralogy/advancements/recipes"); + File[] furnaces = advancementDir.listFiles((dir, name) -> name.endsWith("_furnace.json")); + assertNotNull(furnaces); + assertEquals(108, furnaces.length); + + for (File file : furnaces) { + JsonObject advancement = json(file); + JsonObject criteria = advancement.getAsJsonObject("criteria"); + assertTrue(file.getName(), criteria.has("has_rock")); + assertFalse(file.getName(), criteria.has("has_furnace")); + String expectedSlab = "mineralogy:" + + stripJson(file.getName()).replaceFirst("_furnace$", "_slab"); + assertEquals(file.getName(), expectedSlab, criterionItem(advancement, "has_rock")); + + JsonArray requirements = advancement.getAsJsonArray("requirements"); + assertEquals(file.getName(), 1, requirements.size()); + JsonArray unlockAlternatives = requirements.get(0).getAsJsonArray(); + assertEquals(file.getName(), 2, unlockAlternatives.size()); + assertEquals(file.getName(), "has_the_recipe", unlockAlternatives.get(0).getAsString()); + assertEquals(file.getName(), "has_rock", unlockAlternatives.get(1).getAsString()); + } + } + @Test public void acceptedRecipeDetailsArePresent() throws Exception { File recipes = new File(ROOT, "data/mineralogy/recipes"); From bcc39e45c7f5a4b03bad91f3cf85b1b30005ba28 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 27 Aug 2026 15:23:52 +0100 Subject: [PATCH 05/10] Reconcile native rock recipes and advancements --- CHANGELOG.txt | 7 + build.gradle | 21 +- docs/DEVELOPER_GUIDE.md | 57 +++-- scripts/generate-recipes.ps1 | 213 +++++++++++++++--- .../building_blocks/polished_andesite.json | 46 ++++ .../building_blocks/polished_basalt.json | 46 ++++ .../building_blocks/polished_diorite.json | 46 ++++ .../building_blocks/polished_granite.json | 46 ++++ .../minecraft/recipes/polished_andesite.json | 15 ++ .../minecraft/recipes/polished_basalt.json | 15 ++ .../minecraft/recipes/polished_diorite.json | 15 ++ .../minecraft/recipes/polished_granite.json | 15 ++ .../recipes/amphibolite_brick.json | 4 +- .../recipes/amphibolite_brick_furnace.json | 2 +- .../recipes/amphibolite_brick_stairs.json | 2 +- .../recipes/amphibolite_brick_wall.json | 2 +- .../recipes/amphibolite_cobblestone.json | 2 +- .../recipes/amphibolite_furnace.json | 2 +- .../recipes/amphibolite_smooth.json | 4 +- .../recipes/amphibolite_smooth_brick.json | 2 +- .../amphibolite_smooth_brick_furnace.json | 2 +- .../amphibolite_smooth_brick_stairs.json | 2 +- .../amphibolite_smooth_brick_wall.json | 2 +- .../recipes/amphibolite_smooth_furnace.json | 2 +- .../recipes/amphibolite_smooth_stairs.json | 2 +- .../recipes/amphibolite_smooth_wall.json | 2 +- .../recipes/amphibolite_stairs.json | 4 +- .../recipes/amphibolite_wall.json | 4 +- .../advancements/recipes/andesite_brick.json | 4 +- .../recipes/andesite_brick_furnace.json | 2 +- .../recipes/andesite_brick_stairs.json | 2 +- .../recipes/andesite_brick_wall.json | 2 +- .../recipes/andesite_cobblestone.json | 2 +- .../recipes/andesite_furnace.json | 2 +- .../recipes/andesite_relief_blank.json | 2 +- .../recipes/andesite_smooth_brick.json | 2 +- .../andesite_smooth_brick_furnace.json | 2 +- .../recipes/andesite_smooth_brick_stairs.json | 2 +- .../recipes/andesite_smooth_brick_wall.json | 2 +- .../recipes/andesite_smooth_furnace.json | 2 +- .../recipes/andesite_smooth_wall.json | 2 +- .../advancements/recipes/basalt_brick.json | 4 +- .../recipes/basalt_brick_furnace.json | 2 +- .../recipes/basalt_brick_stairs.json | 2 +- .../recipes/basalt_brick_wall.json | 2 +- .../recipes/basalt_cobblestone.json | 2 +- .../advancements/recipes/basalt_furnace.json | 2 +- .../recipes/basalt_relief_blank.json | 2 +- .../advancements/recipes/basalt_slab.json | 2 +- .../recipes/basalt_smooth_brick.json | 2 +- .../recipes/basalt_smooth_brick_furnace.json | 2 +- .../recipes/basalt_smooth_brick_stairs.json | 2 +- .../recipes/basalt_smooth_brick_wall.json | 2 +- .../recipes/basalt_smooth_furnace.json | 2 +- .../recipes/basalt_smooth_slab.json | 2 +- .../recipes/basalt_smooth_stairs.json | 2 +- .../recipes/basalt_smooth_wall.json | 2 +- .../advancements/recipes/basalt_stairs.json | 2 +- .../advancements/recipes/basalt_wall.json | 2 +- .../recipes/basaltic_glass_brick.json | 4 +- .../recipes/basaltic_glass_brick_furnace.json | 2 +- .../recipes/basaltic_glass_brick_stairs.json | 2 +- .../recipes/basaltic_glass_brick_wall.json | 2 +- .../recipes/basaltic_glass_cobblestone.json | 2 +- .../recipes/basaltic_glass_furnace.json | 2 +- .../recipes/basaltic_glass_smooth.json | 4 +- .../recipes/basaltic_glass_smooth_brick.json | 2 +- .../basaltic_glass_smooth_brick_furnace.json | 2 +- .../basaltic_glass_smooth_brick_stairs.json | 2 +- .../basaltic_glass_smooth_brick_wall.json | 2 +- .../basaltic_glass_smooth_furnace.json | 2 +- .../recipes/basaltic_glass_smooth_stairs.json | 2 +- .../recipes/basaltic_glass_smooth_wall.json | 2 +- .../recipes/basaltic_glass_stairs.json | 4 +- .../recipes/basaltic_glass_wall.json | 4 +- .../recipes/conglomerate_brick.json | 4 +- .../recipes/conglomerate_brick_furnace.json | 2 +- .../recipes/conglomerate_brick_stairs.json | 2 +- .../recipes/conglomerate_brick_wall.json | 2 +- .../recipes/conglomerate_cobblestone.json | 2 +- .../recipes/conglomerate_furnace.json | 2 +- .../recipes/conglomerate_smooth.json | 4 +- .../recipes/conglomerate_smooth_brick.json | 2 +- .../conglomerate_smooth_brick_furnace.json | 2 +- .../conglomerate_smooth_brick_stairs.json | 2 +- .../conglomerate_smooth_brick_wall.json | 2 +- .../recipes/conglomerate_smooth_furnace.json | 2 +- .../recipes/conglomerate_smooth_stairs.json | 2 +- .../recipes/conglomerate_smooth_wall.json | 2 +- .../recipes/conglomerate_stairs.json | 4 +- .../recipes/conglomerate_wall.json | 4 +- .../advancements/recipes/diabase_brick.json | 4 +- .../recipes/diabase_brick_furnace.json | 2 +- .../recipes/diabase_brick_stairs.json | 2 +- .../recipes/diabase_brick_wall.json | 2 +- .../recipes/diabase_cobblestone.json | 2 +- .../advancements/recipes/diabase_furnace.json | 2 +- .../advancements/recipes/diabase_smooth.json | 4 +- .../recipes/diabase_smooth_brick.json | 2 +- .../recipes/diabase_smooth_brick_furnace.json | 2 +- .../recipes/diabase_smooth_brick_stairs.json | 2 +- .../recipes/diabase_smooth_brick_wall.json | 2 +- .../recipes/diabase_smooth_furnace.json | 2 +- .../recipes/diabase_smooth_stairs.json | 2 +- .../recipes/diabase_smooth_wall.json | 2 +- .../advancements/recipes/diabase_stairs.json | 4 +- .../advancements/recipes/diabase_wall.json | 4 +- .../advancements/recipes/diorite_brick.json | 4 +- .../recipes/diorite_brick_furnace.json | 2 +- .../recipes/diorite_brick_stairs.json | 2 +- .../recipes/diorite_brick_wall.json | 2 +- .../recipes/diorite_cobblestone.json | 2 +- .../advancements/recipes/diorite_furnace.json | 2 +- .../recipes/diorite_relief_blank.json | 2 +- .../recipes/diorite_smooth_brick.json | 2 +- .../recipes/diorite_smooth_brick_furnace.json | 2 +- .../recipes/diorite_smooth_brick_stairs.json | 2 +- .../recipes/diorite_smooth_brick_wall.json | 2 +- .../recipes/diorite_smooth_furnace.json | 2 +- .../recipes/diorite_smooth_wall.json | 2 +- .../advancements/recipes/dolomite_brick.json | 4 +- .../recipes/dolomite_brick_furnace.json | 2 +- .../recipes/dolomite_brick_stairs.json | 2 +- .../recipes/dolomite_brick_wall.json | 2 +- .../recipes/dolomite_cobblestone.json | 2 +- .../recipes/dolomite_furnace.json | 2 +- .../advancements/recipes/dolomite_smooth.json | 4 +- .../recipes/dolomite_smooth_brick.json | 2 +- .../dolomite_smooth_brick_furnace.json | 2 +- .../recipes/dolomite_smooth_brick_stairs.json | 2 +- .../recipes/dolomite_smooth_brick_wall.json | 2 +- .../recipes/dolomite_smooth_furnace.json | 2 +- .../recipes/dolomite_smooth_stairs.json | 2 +- .../recipes/dolomite_smooth_wall.json | 2 +- .../advancements/recipes/dolomite_stairs.json | 4 +- .../advancements/recipes/dolomite_wall.json | 4 +- .../advancements/recipes/gabbro_brick.json | 4 +- .../recipes/gabbro_brick_furnace.json | 2 +- .../recipes/gabbro_brick_stairs.json | 2 +- .../recipes/gabbro_brick_wall.json | 2 +- .../recipes/gabbro_cobblestone.json | 2 +- .../advancements/recipes/gabbro_furnace.json | 2 +- .../advancements/recipes/gabbro_smooth.json | 4 +- .../recipes/gabbro_smooth_brick.json | 2 +- .../recipes/gabbro_smooth_brick_furnace.json | 2 +- .../recipes/gabbro_smooth_brick_stairs.json | 2 +- .../recipes/gabbro_smooth_brick_wall.json | 2 +- .../recipes/gabbro_smooth_furnace.json | 2 +- .../recipes/gabbro_smooth_stairs.json | 2 +- .../recipes/gabbro_smooth_wall.json | 2 +- .../advancements/recipes/gabbro_stairs.json | 4 +- .../advancements/recipes/gabbro_wall.json | 4 +- .../advancements/recipes/gneiss_brick.json | 4 +- .../recipes/gneiss_brick_furnace.json | 2 +- .../recipes/gneiss_brick_stairs.json | 2 +- .../recipes/gneiss_brick_wall.json | 2 +- .../recipes/gneiss_cobblestone.json | 2 +- .../advancements/recipes/gneiss_furnace.json | 2 +- .../advancements/recipes/gneiss_smooth.json | 4 +- .../recipes/gneiss_smooth_brick.json | 2 +- .../recipes/gneiss_smooth_brick_furnace.json | 2 +- .../recipes/gneiss_smooth_brick_stairs.json | 2 +- .../recipes/gneiss_smooth_brick_wall.json | 2 +- .../recipes/gneiss_smooth_furnace.json | 2 +- .../recipes/gneiss_smooth_stairs.json | 2 +- .../recipes/gneiss_smooth_wall.json | 2 +- .../advancements/recipes/gneiss_stairs.json | 4 +- .../advancements/recipes/gneiss_wall.json | 4 +- .../advancements/recipes/granite_brick.json | 4 +- .../recipes/granite_brick_furnace.json | 2 +- .../recipes/granite_brick_stairs.json | 2 +- .../recipes/granite_brick_wall.json | 2 +- .../recipes/granite_cobblestone.json | 2 +- .../advancements/recipes/granite_furnace.json | 2 +- .../recipes/granite_relief_blank.json | 2 +- .../recipes/granite_smooth_brick.json | 2 +- .../recipes/granite_smooth_brick_furnace.json | 2 +- .../recipes/granite_smooth_brick_stairs.json | 2 +- .../recipes/granite_smooth_brick_wall.json | 2 +- .../recipes/granite_smooth_furnace.json | 2 +- .../recipes/granite_smooth_wall.json | 2 +- .../advancements/recipes/hornfels_brick.json | 4 +- .../recipes/hornfels_brick_furnace.json | 2 +- .../recipes/hornfels_brick_stairs.json | 2 +- .../recipes/hornfels_brick_wall.json | 2 +- .../recipes/hornfels_cobblestone.json | 2 +- .../recipes/hornfels_furnace.json | 2 +- .../advancements/recipes/hornfels_smooth.json | 4 +- .../recipes/hornfels_smooth_brick.json | 2 +- .../hornfels_smooth_brick_furnace.json | 2 +- .../recipes/hornfels_smooth_brick_stairs.json | 2 +- .../recipes/hornfels_smooth_brick_wall.json | 2 +- .../recipes/hornfels_smooth_furnace.json | 2 +- .../recipes/hornfels_smooth_stairs.json | 2 +- .../recipes/hornfels_smooth_wall.json | 2 +- .../advancements/recipes/hornfels_stairs.json | 4 +- .../advancements/recipes/hornfels_wall.json | 4 +- .../advancements/recipes/limestone_brick.json | 4 +- .../recipes/limestone_brick_furnace.json | 2 +- .../recipes/limestone_brick_stairs.json | 2 +- .../recipes/limestone_brick_wall.json | 2 +- .../recipes/limestone_cobblestone.json | 2 +- .../recipes/limestone_furnace.json | 2 +- .../recipes/limestone_smooth.json | 4 +- .../recipes/limestone_smooth_brick.json | 2 +- .../limestone_smooth_brick_furnace.json | 2 +- .../limestone_smooth_brick_stairs.json | 2 +- .../recipes/limestone_smooth_brick_wall.json | 2 +- .../recipes/limestone_smooth_furnace.json | 2 +- .../recipes/limestone_smooth_stairs.json | 2 +- .../recipes/limestone_smooth_wall.json | 2 +- .../recipes/limestone_stairs.json | 4 +- .../advancements/recipes/limestone_wall.json | 4 +- .../advancements/recipes/marble_brick.json | 4 +- .../recipes/marble_brick_furnace.json | 2 +- .../recipes/marble_brick_stairs.json | 2 +- .../recipes/marble_brick_wall.json | 2 +- .../recipes/marble_cobblestone.json | 2 +- .../advancements/recipes/marble_furnace.json | 2 +- .../advancements/recipes/marble_smooth.json | 4 +- .../recipes/marble_smooth_brick.json | 2 +- .../recipes/marble_smooth_brick_furnace.json | 2 +- .../recipes/marble_smooth_brick_stairs.json | 2 +- .../recipes/marble_smooth_brick_wall.json | 2 +- .../recipes/marble_smooth_furnace.json | 2 +- .../recipes/marble_smooth_stairs.json | 2 +- .../recipes/marble_smooth_wall.json | 2 +- .../advancements/recipes/marble_stairs.json | 4 +- .../advancements/recipes/marble_wall.json | 4 +- .../recipes/novaculite_brick.json | 4 +- .../recipes/novaculite_brick_furnace.json | 2 +- .../recipes/novaculite_brick_stairs.json | 2 +- .../recipes/novaculite_brick_wall.json | 2 +- .../recipes/novaculite_cobblestone.json | 2 +- .../recipes/novaculite_furnace.json | 2 +- .../recipes/novaculite_smooth.json | 4 +- .../recipes/novaculite_smooth_brick.json | 2 +- .../novaculite_smooth_brick_furnace.json | 2 +- .../novaculite_smooth_brick_stairs.json | 2 +- .../recipes/novaculite_smooth_brick_wall.json | 2 +- .../recipes/novaculite_smooth_furnace.json | 2 +- .../recipes/novaculite_smooth_stairs.json | 2 +- .../recipes/novaculite_smooth_wall.json | 2 +- .../recipes/novaculite_stairs.json | 4 +- .../advancements/recipes/novaculite_wall.json | 4 +- .../advancements/recipes/pegmatite_brick.json | 4 +- .../recipes/pegmatite_brick_furnace.json | 2 +- .../recipes/pegmatite_brick_stairs.json | 2 +- .../recipes/pegmatite_brick_wall.json | 2 +- .../recipes/pegmatite_cobblestone.json | 2 +- .../recipes/pegmatite_furnace.json | 2 +- .../recipes/pegmatite_smooth.json | 4 +- .../recipes/pegmatite_smooth_brick.json | 2 +- .../pegmatite_smooth_brick_furnace.json | 2 +- .../pegmatite_smooth_brick_stairs.json | 2 +- .../recipes/pegmatite_smooth_brick_wall.json | 2 +- .../recipes/pegmatite_smooth_furnace.json | 2 +- .../recipes/pegmatite_smooth_stairs.json | 2 +- .../recipes/pegmatite_smooth_wall.json | 2 +- .../recipes/pegmatite_stairs.json | 4 +- .../advancements/recipes/pegmatite_wall.json | 4 +- .../recipes/peridotite_brick.json | 4 +- .../recipes/peridotite_brick_furnace.json | 2 +- .../recipes/peridotite_brick_stairs.json | 2 +- .../recipes/peridotite_brick_wall.json | 2 +- .../recipes/peridotite_cobblestone.json | 2 +- .../recipes/peridotite_furnace.json | 2 +- .../recipes/peridotite_smooth.json | 4 +- .../recipes/peridotite_smooth_brick.json | 2 +- .../peridotite_smooth_brick_furnace.json | 2 +- .../peridotite_smooth_brick_stairs.json | 2 +- .../recipes/peridotite_smooth_brick_wall.json | 2 +- .../recipes/peridotite_smooth_furnace.json | 2 +- .../recipes/peridotite_smooth_stairs.json | 2 +- .../recipes/peridotite_smooth_wall.json | 2 +- .../recipes/peridotite_stairs.json | 4 +- .../advancements/recipes/peridotite_wall.json | 4 +- .../advancements/recipes/phyllite_brick.json | 4 +- .../recipes/phyllite_brick_furnace.json | 2 +- .../recipes/phyllite_brick_stairs.json | 2 +- .../recipes/phyllite_brick_wall.json | 2 +- .../recipes/phyllite_cobblestone.json | 2 +- .../recipes/phyllite_furnace.json | 2 +- .../advancements/recipes/phyllite_smooth.json | 4 +- .../recipes/phyllite_smooth_brick.json | 2 +- .../phyllite_smooth_brick_furnace.json | 2 +- .../recipes/phyllite_smooth_brick_stairs.json | 2 +- .../recipes/phyllite_smooth_brick_wall.json | 2 +- .../recipes/phyllite_smooth_furnace.json | 2 +- .../recipes/phyllite_smooth_stairs.json | 2 +- .../recipes/phyllite_smooth_wall.json | 2 +- .../advancements/recipes/phyllite_stairs.json | 4 +- .../advancements/recipes/phyllite_wall.json | 4 +- .../advancements/recipes/quartzite_brick.json | 4 +- .../recipes/quartzite_brick_furnace.json | 2 +- .../recipes/quartzite_brick_stairs.json | 2 +- .../recipes/quartzite_brick_wall.json | 2 +- .../recipes/quartzite_cobblestone.json | 2 +- .../recipes/quartzite_furnace.json | 2 +- .../recipes/quartzite_smooth.json | 4 +- .../recipes/quartzite_smooth_brick.json | 2 +- .../quartzite_smooth_brick_furnace.json | 2 +- .../quartzite_smooth_brick_stairs.json | 2 +- .../recipes/quartzite_smooth_brick_wall.json | 2 +- .../recipes/quartzite_smooth_furnace.json | 2 +- .../recipes/quartzite_smooth_stairs.json | 2 +- .../recipes/quartzite_smooth_wall.json | 2 +- .../recipes/quartzite_stairs.json | 4 +- .../advancements/recipes/quartzite_wall.json | 4 +- .../advancements/recipes/rhyolite_brick.json | 4 +- .../recipes/rhyolite_brick_furnace.json | 2 +- .../recipes/rhyolite_brick_stairs.json | 2 +- .../recipes/rhyolite_brick_wall.json | 2 +- .../recipes/rhyolite_cobblestone.json | 2 +- .../recipes/rhyolite_furnace.json | 2 +- .../advancements/recipes/rhyolite_smooth.json | 4 +- .../recipes/rhyolite_smooth_brick.json | 2 +- .../rhyolite_smooth_brick_furnace.json | 2 +- .../recipes/rhyolite_smooth_brick_stairs.json | 2 +- .../recipes/rhyolite_smooth_brick_wall.json | 2 +- .../recipes/rhyolite_smooth_furnace.json | 2 +- .../recipes/rhyolite_smooth_stairs.json | 2 +- .../recipes/rhyolite_smooth_wall.json | 2 +- .../advancements/recipes/rhyolite_stairs.json | 4 +- .../advancements/recipes/rhyolite_wall.json | 4 +- .../advancements/recipes/rock_salt_brick.json | 4 +- .../recipes/rock_salt_brick_furnace.json | 2 +- .../recipes/rock_salt_brick_stairs.json | 2 +- .../recipes/rock_salt_brick_wall.json | 2 +- .../recipes/rock_salt_cobblestone.json | 2 +- .../recipes/rock_salt_furnace.json | 2 +- .../recipes/rock_salt_smooth.json | 4 +- .../recipes/rock_salt_smooth_brick.json | 2 +- .../rock_salt_smooth_brick_furnace.json | 2 +- .../rock_salt_smooth_brick_stairs.json | 2 +- .../recipes/rock_salt_smooth_brick_wall.json | 2 +- .../recipes/rock_salt_smooth_furnace.json | 2 +- .../recipes/rock_salt_smooth_stairs.json | 2 +- .../recipes/rock_salt_smooth_wall.json | 2 +- .../recipes/rock_salt_stairs.json | 4 +- .../advancements/recipes/rock_salt_wall.json | 4 +- .../advancements/recipes/schist_brick.json | 4 +- .../recipes/schist_brick_furnace.json | 2 +- .../recipes/schist_brick_stairs.json | 2 +- .../recipes/schist_brick_wall.json | 2 +- .../recipes/schist_cobblestone.json | 2 +- .../advancements/recipes/schist_furnace.json | 2 +- .../advancements/recipes/schist_smooth.json | 4 +- .../recipes/schist_smooth_brick.json | 2 +- .../recipes/schist_smooth_brick_furnace.json | 2 +- .../recipes/schist_smooth_brick_stairs.json | 2 +- .../recipes/schist_smooth_brick_wall.json | 2 +- .../recipes/schist_smooth_furnace.json | 2 +- .../recipes/schist_smooth_stairs.json | 2 +- .../recipes/schist_smooth_wall.json | 2 +- .../advancements/recipes/schist_stairs.json | 4 +- .../advancements/recipes/schist_wall.json | 4 +- .../advancements/recipes/scoria_brick.json | 4 +- .../recipes/scoria_brick_furnace.json | 2 +- .../recipes/scoria_brick_stairs.json | 2 +- .../recipes/scoria_brick_wall.json | 2 +- .../recipes/scoria_cobblestone.json | 2 +- .../advancements/recipes/scoria_furnace.json | 2 +- .../advancements/recipes/scoria_smooth.json | 4 +- .../recipes/scoria_smooth_brick.json | 2 +- .../recipes/scoria_smooth_brick_furnace.json | 2 +- .../recipes/scoria_smooth_brick_stairs.json | 2 +- .../recipes/scoria_smooth_brick_wall.json | 2 +- .../recipes/scoria_smooth_furnace.json | 2 +- .../recipes/scoria_smooth_stairs.json | 2 +- .../recipes/scoria_smooth_wall.json | 2 +- .../advancements/recipes/scoria_stairs.json | 4 +- .../advancements/recipes/scoria_wall.json | 4 +- .../advancements/recipes/shale_brick.json | 4 +- .../recipes/shale_brick_furnace.json | 2 +- .../recipes/shale_brick_stairs.json | 2 +- .../recipes/shale_brick_wall.json | 2 +- .../recipes/shale_cobblestone.json | 2 +- .../advancements/recipes/shale_furnace.json | 2 +- .../advancements/recipes/shale_smooth.json | 4 +- .../recipes/shale_smooth_brick.json | 2 +- .../recipes/shale_smooth_brick_furnace.json | 2 +- .../recipes/shale_smooth_brick_stairs.json | 2 +- .../recipes/shale_smooth_brick_wall.json | 2 +- .../recipes/shale_smooth_furnace.json | 2 +- .../recipes/shale_smooth_stairs.json | 2 +- .../recipes/shale_smooth_wall.json | 2 +- .../advancements/recipes/shale_stairs.json | 4 +- .../advancements/recipes/shale_wall.json | 4 +- .../advancements/recipes/siltstone_brick.json | 4 +- .../recipes/siltstone_brick_furnace.json | 2 +- .../recipes/siltstone_brick_stairs.json | 2 +- .../recipes/siltstone_brick_wall.json | 2 +- .../recipes/siltstone_cobblestone.json | 2 +- .../recipes/siltstone_furnace.json | 2 +- .../recipes/siltstone_smooth.json | 4 +- .../recipes/siltstone_smooth_brick.json | 2 +- .../siltstone_smooth_brick_furnace.json | 2 +- .../siltstone_smooth_brick_stairs.json | 2 +- .../recipes/siltstone_smooth_brick_wall.json | 2 +- .../recipes/siltstone_smooth_furnace.json | 2 +- .../recipes/siltstone_smooth_stairs.json | 2 +- .../recipes/siltstone_smooth_wall.json | 2 +- .../recipes/siltstone_stairs.json | 4 +- .../advancements/recipes/siltstone_wall.json | 4 +- .../advancements/recipes/slate_brick.json | 4 +- .../recipes/slate_brick_furnace.json | 2 +- .../recipes/slate_brick_stairs.json | 2 +- .../recipes/slate_brick_wall.json | 2 +- .../recipes/slate_cobblestone.json | 2 +- .../advancements/recipes/slate_furnace.json | 2 +- .../advancements/recipes/slate_smooth.json | 4 +- .../recipes/slate_smooth_brick.json | 2 +- .../recipes/slate_smooth_brick_furnace.json | 2 +- .../recipes/slate_smooth_brick_stairs.json | 2 +- .../recipes/slate_smooth_brick_wall.json | 2 +- .../recipes/slate_smooth_furnace.json | 2 +- .../recipes/slate_smooth_stairs.json | 2 +- .../recipes/slate_smooth_wall.json | 2 +- .../advancements/recipes/slate_stairs.json | 4 +- .../advancements/recipes/slate_wall.json | 4 +- .../advancements/recipes/tuff_brick.json | 2 +- .../recipes/tuff_brick_furnace.json | 2 +- .../recipes/tuff_brick_stairs.json | 2 +- .../advancements/recipes/tuff_brick_wall.json | 2 +- .../recipes/tuff_cobblestone.json | 2 +- .../advancements/recipes/tuff_furnace.json | 2 +- .../advancements/recipes/tuff_smooth.json | 2 +- .../recipes/tuff_smooth_brick.json | 2 +- .../recipes/tuff_smooth_brick_furnace.json | 2 +- .../recipes/tuff_smooth_brick_stairs.json | 2 +- .../recipes/tuff_smooth_brick_wall.json | 2 +- .../recipes/tuff_smooth_furnace.json | 2 +- .../recipes/tuff_smooth_stairs.json | 2 +- .../recipes/tuff_smooth_wall.json | 2 +- .../advancements/recipes/tuff_stairs.json | 2 +- .../advancements/recipes/tuff_wall.json | 2 +- .../recipes/andesite_relief_blank.json | 2 +- .../mineralogy/recipes/andesite_smooth.json | 2 +- .../recipes/andesite_smooth_stairs.json | 2 +- .../mineralogy/recipes/andesite_stairs.json | 2 +- .../mineralogy/recipes/andesite_wall.json | 2 +- .../recipes/basalt_relief_blank.json | 2 +- .../data/mineralogy/recipes/basalt_slab.json | 2 +- .../mineralogy/recipes/basalt_smooth.json | 2 +- .../recipes/basalt_smooth_slab.json | 2 +- .../recipes/diorite_relief_blank.json | 2 +- .../mineralogy/recipes/diorite_smooth.json | 2 +- .../recipes/diorite_smooth_stairs.json | 2 +- .../mineralogy/recipes/diorite_stairs.json | 2 +- .../data/mineralogy/recipes/diorite_wall.json | 2 +- .../recipes/granite_relief_blank.json | 2 +- .../mineralogy/recipes/granite_smooth.json | 2 +- .../recipes/granite_smooth_stairs.json | 2 +- .../mineralogy/recipes/granite_stairs.json | 2 +- .../data/mineralogy/recipes/granite_wall.json | 2 +- .../mineralogy/tags/items/slabs/andesite.json | 3 +- .../tags/items/slabs/andesite/smooth.json | 3 +- .../mineralogy/tags/items/slabs/diorite.json | 3 +- .../tags/items/slabs/diorite/smooth.json | 3 +- .../mineralogy/tags/items/slabs/granite.json | 3 +- .../tags/items/slabs/granite/smooth.json | 3 +- .../tags/items/stones/andesite.json | 3 +- .../tags/items/stones/andesite/smooth.json | 3 +- .../mineralogy/tags/items/stones/basalt.json | 3 +- .../tags/items/stones/basalt/smooth.json | 3 +- .../mineralogy/tags/items/stones/diorite.json | 3 +- .../tags/items/stones/diorite/smooth.json | 3 +- .../mineralogy/tags/items/stones/granite.json | 3 +- .../tags/items/stones/granite/smooth.json | 3 +- .../mc/mineralogy/ResourceContractTest.java | 149 +++++++++++- 471 files changed, 1094 insertions(+), 711 deletions(-) create mode 100644 src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_andesite.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_basalt.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_diorite.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_granite.json create mode 100644 src/main/resources/data/minecraft/recipes/polished_andesite.json create mode 100644 src/main/resources/data/minecraft/recipes/polished_basalt.json create mode 100644 src/main/resources/data/minecraft/recipes/polished_diorite.json create mode 100644 src/main/resources/data/minecraft/recipes/polished_granite.json diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 7a4bddaf9..41afed646 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -37,6 +37,13 @@ Mineralogy 6.0.1.116051 for Minecraft 1.16.5 conversions, progressive sand polishing, matching-slab rock furnaces, and blank-to-marked relief progression. Each rock-furnace recipe is revealed as soon as its matching slab is acquired, before a vanilla furnace is crafted. +- Reconciled Minecraft's native andesite, basalt, diorite, and granite with + their retained Mineralogy world-compatibility blocks. Native blocks now + unlock and feed every non-conflicting matching Mineralogy recipe. The four + vanilla 2x2 polished-block recipes are replaced by block-plus-sand routes so + the 2x2 recipes remain available for Mineralogy bricks; matching vanilla + slabs/stairs/walls keep their native recipes, and recipe advancements use the + same exact item or family tag as the recipe they reveal. - Extended Minecraft 1.16's native stone crafting and tool-material tags so every enabled Forge cobblestone equivalent, including all 27 Mineralogy rock families, works in vanilla tools. The vanilla furnace recipe is also diff --git a/build.gradle b/build.gradle index 3f4d0bce3..600b91ec8 100644 --- a/build.gradle +++ b/build.gradle @@ -484,9 +484,26 @@ tasks.register('verifyReleaseArtifacts') { throw new GradleException("Release jar must contain 1415 recipes and advancements, found ${recipes.size()} and ${advancements.size()}") } def minecraftRecipes = names.findAll { it.startsWith('data/minecraft/recipes/') && it.endsWith('.json') } - if (minecraftRecipes.size() != 1 || !minecraftRecipes.contains('data/minecraft/recipes/furnace.json') || + def expectedMinecraftRecipes = [ + 'data/minecraft/recipes/furnace.json', + 'data/minecraft/recipes/polished_andesite.json', + 'data/minecraft/recipes/polished_basalt.json', + 'data/minecraft/recipes/polished_diorite.json', + 'data/minecraft/recipes/polished_granite.json' + ] as Set + if ((minecraftRecipes as Set) != expectedMinecraftRecipes || names.any { it.contains('/stonecutting/') }) { - throw new GradleException('Release jar must contain only the required vanilla furnace override and no stonecutting recipes') + throw new GradleException('Release jar must contain only the required furnace/polished-block overrides and no stonecutting recipes') + } + def expectedMinecraftAdvancements = ['andesite', 'basalt', 'diorite', 'granite'].collect { + "data/minecraft/advancements/recipes/building_blocks/polished_${it}.json" + } as Set + def minecraftAdvancements = names.findAll { + it.startsWith('data/minecraft/advancements/recipes/building_blocks/polished_') && + it.endsWith('.json') + } as Set + if (minecraftAdvancements != expectedMinecraftAdvancements) { + throw new GradleException('Release jar must contain the four native polished-block advancement overrides') } def wallBlockstates = names.findAll { it ==~ /assets\/mineralogy\/blockstates\/.+_wall\.json/ } def tallWallModels = names.findAll { it ==~ /assets\/mineralogy\/models\/block\/.+_wall_side_tall\.json/ } diff --git a/docs/DEVELOPER_GUIDE.md b/docs/DEVELOPER_GUIDE.md index 7266ee201..163af9d68 100644 --- a/docs/DEVELOPER_GUIDE.md +++ b/docs/DEVELOPER_GUIDE.md @@ -47,13 +47,27 @@ mods' members, updates the exact tag instances retained by parsed recipes, then invalidates recipe ingredient caches. The nested Minecraft crafting and tool tags are updated alongside the direct Forge tag. -The vanilla furnace recipe is the one required exception: it is packaged at +The vanilla furnace recipe is one required exception: it is packaged at `data/minecraft/recipes/furnace.json` with a direct `forge:cobblestone` ingredient. Forge 36's already-resolved nested crafting-material tag does not observe a replacement tag collection, so Mineralogy mutates retained tag -instances rather than swapping the collection. Do not broaden vanilla slab, -stair, or wall recipes; Mineralogy owns exact material variants for those -outputs. +instances rather than swapping the collection. + +Minecraft 1.16 also owns andesite, basalt, diorite, granite, and their polished +full blocks. Mineralogy's family tags include both native and retained legacy +identities. Four `data/minecraft/recipes/polished_*.json` overrides move the +native polished-block route from 2x2 crafting to one exact native block plus +sand. That leaves 2x2 matching raw blocks available for Mineralogy bricks. +The matching vanilla advancements are overridden too, so native polishing is +revealed only after the player has both the exact native rock and sand. + +Do not broaden vanilla slab, stair, or wall recipes. Where Minecraft already +owns a matching form (raw and polished andesite/diorite/granite slabs and +stairs, plus their raw walls), the Mineralogy-output recipe keeps an exact +legacy Mineralogy input. Basalt has no native construction forms in 1.16.5, so +its raw and polished family tags safely feed Mineralogy slabs, stairs, and +walls. Polished andesite/diorite/granite have no native walls, so those three +Mineralogy wall recipes may also accept the matching family tag. Use broad `stone` or `cobblestone` inputs only when any matching material is valid. Recipes returning a Mineralogy construction form must use the exact @@ -63,22 +77,25 @@ material and finish so basalt cannot produce a different rock's slab or wall. All Mineralogy recipes are native Minecraft/Forge 1.16.5 JSON under `data/mineralogy/recipes/`. Run `scripts/generate-recipes.ps1` after changing -the recipe matrix; it generates the 27 stone families and global recipes, then -retains the target-native smelting data, and ensures every recipe has a matching -unlock advancement with the same Forge -conditions. Unlocks use direct inventory ingredients instead of listening to -other recipe unlocks, which would recursively reveal an entire construction -tree. Polishing uses Minecraft 1.16.5's advancement requirements matrix to -require the matching source plus accepted sand; manually crafting a recipe is -the target-native fallback for Forge's delayed crafting-output inventory -trigger. Rock-furnace advancements use the exact matching slab as their sole -material criterion. They deliberately do not require an already-owned vanilla -furnace, so the upgrade route is visible before that intermediate is crafted. - -Reliefs preserve the historical two-stage contract. Nine exact matching -polished blocks produce 16 blank reliefs; the blank relief is then the input to -the marked relief recipes. Two matching left reliefs shapelessly produce two -right reliefs. Do not substitute unrelated tags for these exact items. +the recipe matrix; it generates the 27 stone families and global recipes, the +four target-native polished-block recipe/advancement overrides, then retains +the target-native smelting data. Every Mineralogy recipe has a matching unlock +advancement with the same Forge conditions and the same exact-item or +family-tag material predicate as the recipe. Unlocks use direct inventory +ingredients instead of listening to other recipe unlocks, which would +recursively reveal an entire construction tree. Polishing uses Minecraft +1.16.5's advancement requirements matrix to require the matching source plus +accepted sand; manually crafting a recipe is the target-native fallback for +Forge's delayed crafting-output inventory trigger. Rock-furnace advancements +use the matching slab-family tag as their sole material criterion. They +deliberately do not require an already-owned vanilla furnace, so the upgrade +route is visible before that intermediate is crafted. + +Reliefs preserve the historical two-stage contract. Nine matching polished +blocks produce 16 blank reliefs; a target-native synonym may satisfy the exact +rock-family tag. The blank relief is then the exact input to the marked relief +recipes. Two matching left reliefs shapelessly produce two right reliefs. Do +not substitute unrelated materials or broad stone tags for these inputs. Do not reintroduce a parallel Java crafting registry. ## Backward Compatibility diff --git a/scripts/generate-recipes.ps1 b/scripts/generate-recipes.ps1 index 1621ad398..57e2f22a0 100644 --- a/scripts/generate-recipes.ps1 +++ b/scripts/generate-recipes.ps1 @@ -1,9 +1,13 @@ [CmdletBinding()] param() +$ErrorActionPreference = 'Stop' + $projectRoot = Split-Path -Parent $PSScriptRoot $recipeRoot = Join-Path $projectRoot 'src\main\resources\data\mineralogy\recipes' $advancementRoot = Join-Path $projectRoot 'src\main\resources\data\mineralogy\advancements\recipes' +$minecraftRecipeRoot = Join-Path $projectRoot 'src\main\resources\data\minecraft\recipes' +$minecraftBuildingAdvancementRoot = Join-Path $projectRoot 'src\main\resources\data\minecraft\advancements\recipes\building_blocks' $itemTagRoot = Join-Path $projectRoot 'src\main\resources\data\mineralogy\tags\items' $utf8NoBom = New-Object System.Text.UTF8Encoding($false) $generatedNames = New-Object 'System.Collections.Generic.HashSet[string]' @@ -22,6 +26,31 @@ $colors = @( 'gray', 'pink', 'lime', 'yellow', 'light_blue', 'magenta', 'orange', 'white' ) +# Minecraft owns these full-block identities in 1.16.5. Mineralogy keeps its +# legacy blocks registered, but recipes may accept either identity where doing +# so cannot compete with a native recipe. +$nativeFullBlocks = @{ + andesite = @{ raw = 'minecraft:andesite'; smooth = 'minecraft:polished_andesite' } + basalt = @{ raw = 'minecraft:basalt'; smooth = 'minecraft:polished_basalt' } + diorite = @{ raw = 'minecraft:diorite'; smooth = 'minecraft:polished_diorite' } + granite = @{ raw = 'minecraft:granite'; smooth = 'minecraft:polished_granite' } +} + +$nativeConstructionForms = @{ + andesite = @{ raw = @('stairs', 'slab', 'wall'); smooth = @('stairs', 'slab') } + diorite = @{ raw = @('stairs', 'slab', 'wall'); smooth = @('stairs', 'slab') } + granite = @{ raw = @('stairs', 'slab', 'wall'); smooth = @('stairs', 'slab') } +} + +$nativeExactRecipeInputs = @{ + # Raw-to-smooth remains exact because the native polished override uses + # the same block-plus-sand route. Native construction forms remain native. + andesite = @{ raw = @('smooth', 'stairs', 'slab', 'wall'); smooth = @('stairs', 'slab') } + basalt = @{ raw = @('smooth') } + diorite = @{ raw = @('smooth', 'stairs', 'slab', 'wall'); smooth = @('stairs', 'slab') } + granite = @{ raw = @('smooth', 'stairs', 'slab', 'wall'); smooth = @('stairs', 'slab') } +} + function ItemId([string] $path) { return "mineralogy:$path" } @@ -113,12 +142,17 @@ function Write-Recipe([string] $name, [System.Collections.IDictionary] $recipe) function Register-UnlockSource( [string] $name, - [string] $sourceItem + [object] $sourceIngredient ) { if ($unlockSources.ContainsKey($name)) { throw "Duplicate recipe-book unlock source: $name" } - $unlockSources[$name] = $sourceItem + $unlockSources[$name] = if ($sourceIngredient -is [string]) { + ItemIngredient ([string]$sourceIngredient) + } + else { + $sourceIngredient + } } function Get-SandUnlockMode([string] $recipeName) { @@ -168,31 +202,79 @@ function Get-UnlockRequirements([string] $sandMode) { return ,$requirements } -function Resolve-IngredientItem([object] $ingredient) { - if ($null -ne $ingredient.item) { return [string]$ingredient.item } - $tag = [string]$ingredient.tag - if ($tag -match '^mineralogy:(stones|slabs)/([^/]+)(?:/(brick|smooth|smooth_brick))?$') { - $family = $Matches[2] - $finish = [string]$Matches[3] - if ($Matches[1] -eq 'slabs') { - return "mineralogy:${family}_$(if ($finish) { "${finish}_" })slab" - } - return "mineralogy:${family}$(if ($finish) { "_${finish}" })" +function Resolve-UnlockIngredient([object] $ingredient) { + if ($null -ne $ingredient.item) { + return [ordered]@{ item = [string]$ingredient.item } } - return '' + if ($null -ne $ingredient.tag) { + return [ordered]@{ tag = [string]$ingredient.tag } + } + return $null } function Infer-UnlockSource([string] $recipeName, [object] $recipe) { - if ($unlockSources.ContainsKey($recipeName)) { return [string]$unlockSources[$recipeName] } + if ($unlockSources.ContainsKey($recipeName)) { return $unlockSources[$recipeName] } if ($null -ne $recipe.ingredients -and $recipe.ingredients.Count -gt 0) { - return Resolve-IngredientItem $recipe.ingredients[0] + return Resolve-UnlockIngredient $recipe.ingredients[0] } - if ($null -ne $recipe.ingredient) { return Resolve-IngredientItem $recipe.ingredient } + if ($null -ne $recipe.ingredient) { return Resolve-UnlockIngredient $recipe.ingredient } if ($null -ne $recipe.key) { $first = $recipe.key.PSObject.Properties | Select-Object -First 1 - if ($null -ne $first) { return Resolve-IngredientItem $first.Value } + if ($null -ne $first) { return Resolve-UnlockIngredient $first.Value } } - return '' + return $null +} + +function Matrix-Contains( + [System.Collections.IDictionary] $matrix, + [string] $family, + [string] $finish, + [string] $form +) { + return $matrix.ContainsKey($family) -and + $matrix[$family].ContainsKey($finish) -and + $matrix[$family][$finish] -contains $form +} + +function ConstructionFormIngredient( + [string] $family, + [string] $finish, + [string] $form, + [string] $mineralogyItem, + [string] $familyOreName +) { + if (Matrix-Contains $nativeExactRecipeInputs $family $finish $form) { + return ItemIngredient $mineralogyItem + } + # Slabs historically use exact inputs. Widen only a native family whose + # matching vanilla block has no target-native slab recipe (basalt here). + if ($form -eq 'slab' -and -not $nativeFullBlocks.ContainsKey($family)) { + return ItemIngredient $mineralogyItem + } + return OreIngredient $familyOreName +} + +function NativeTagAliases( + [string] $kind, + [string] $family, + [string] $finish +) { + if (-not $nativeFullBlocks.ContainsKey($family)) { + return @() + } + $nativeFinish = if ([string]::IsNullOrWhiteSpace($finish)) { 'raw' } else { $finish } + if ($nativeFinish -notin @('raw', 'smooth')) { + return @() + } + if ($kind -eq 'stones') { + return @($nativeFullBlocks[$family][$nativeFinish]) + } + if ($kind -eq 'slabs' -and + (Matrix-Contains $nativeConstructionForms $family $nativeFinish 'slab')) { + $prefix = if ($nativeFinish -eq 'smooth') { 'polished_' } else { '' } + return @("minecraft:${prefix}${family}_slab") + } + return @() } function Write-ShapedRecipe( @@ -250,23 +332,26 @@ function Write-BaseFamilyRecipes([string] $family) { (OreIngredient $rawOre), (OreIngredient $rawOre), (ItemIngredient 'minecraft:gravel'), (ItemIngredient 'minecraft:gravel') ) 'minecraft:cobblestone' 4 @() - Register-UnlockSource "${family}_cobblestone" $raw Write-ShapedRecipe "${family}_stairs" 'forge:ore_shaped' @('x ', 'xx ', 'xxx') ` - ([ordered]@{ x = OreIngredient $rawOre }) (ItemId "${family}_stairs") 4 ` + ([ordered]@{ x = ConstructionFormIngredient $family 'raw' 'stairs' $raw $rawOre }) ` + (ItemId "${family}_stairs") 4 ` (ConditionsFor (ItemId "${family}_stairs")) Write-ShapedRecipe "${family}_slab" 'minecraft:crafting_shaped' @('xxx') ` - ([ordered]@{ x = ItemIngredient $raw }) (ItemId "${family}_slab") 6 ` + ([ordered]@{ x = ConstructionFormIngredient $family 'raw' 'slab' $raw $rawOre }) ` + (ItemId "${family}_slab") 6 ` (ConditionsFor (ItemId "${family}_slab")) Write-ShapedRecipe "${family}_furnace" 'forge:ore_shaped' @('xxx', 'xyx', 'xxx') ` ([ordered]@{ x = OreIngredient (FamilyOreName 'slab' $family); y = ItemIngredient 'minecraft:furnace' }) ` (ItemId "${family}_furnace") 1 (ConditionsFor (ItemId "${family}_furnace")) Write-ShapedRecipe "${family}_wall" 'forge:ore_shaped' @('xxx', 'xxx') ` - ([ordered]@{ x = OreIngredient $rawOre }) (ItemId "${family}_wall") 6 ` + ([ordered]@{ x = ConstructionFormIngredient $family 'raw' 'wall' $raw $rawOre }) ` + (ItemId "${family}_wall") 6 ` (ConditionsFor (ItemId "${family}_wall")) Write-ShapedRecipe "${family}_brick" 'forge:ore_shaped' @('xx', 'xx') ` - ([ordered]@{ x = OreIngredient $rawOre }) $brick 4 (ConditionsFor $brick) + ([ordered]@{ x = ConstructionFormIngredient $family 'raw' 'brick' $raw $rawOre }) ` + $brick 4 (ConditionsFor $brick) Write-ShapedRecipe "${family}_brick_stairs" 'forge:ore_shaped' @('x ', 'xx ', 'xxx') ` ([ordered]@{ x = OreIngredient $brickOre }) (ItemId "${family}_brick_stairs") 4 ` (ConditionsFor (ItemId "${family}_brick_stairs")) @@ -281,19 +366,23 @@ function Write-BaseFamilyRecipes([string] $family) { (ConditionsFor (ItemId "${family}_brick_wall")) Write-ShapelessRecipe "${family}_smooth" 'forge:ore_shapeless' @( - (OreIngredient $rawOre), (ItemIngredient 'minecraft:sand' 0) + (ConstructionFormIngredient $family 'raw' 'smooth' $raw $rawOre), + (ItemIngredient 'minecraft:sand' 0) ) $smooth 1 (ConditionsFor $smooth) Write-ShapedRecipe "${family}_smooth_stairs" 'forge:ore_shaped' @('x ', 'xx ', 'xxx') ` - ([ordered]@{ x = OreIngredient $smoothOre }) (ItemId "${family}_smooth_stairs") 4 ` + ([ordered]@{ x = ConstructionFormIngredient $family 'smooth' 'stairs' $smooth $smoothOre }) ` + (ItemId "${family}_smooth_stairs") 4 ` (ConditionsFor (ItemId "${family}_smooth_stairs")) Write-ShapedRecipe "${family}_smooth_slab" 'minecraft:crafting_shaped' @('xxx') ` - ([ordered]@{ x = ItemIngredient $smooth }) (ItemId "${family}_smooth_slab") 6 ` + ([ordered]@{ x = ConstructionFormIngredient $family 'smooth' 'slab' $smooth $smoothOre }) ` + (ItemId "${family}_smooth_slab") 6 ` (ConditionsFor (ItemId "${family}_smooth_slab")) Write-ShapedRecipe "${family}_smooth_furnace" 'forge:ore_shaped' @('xxx', 'xyx', 'xxx') ` ([ordered]@{ x = OreIngredient (FamilyOreName 'slab' $family 'Smooth'); y = ItemIngredient 'minecraft:furnace' }) ` (ItemId "${family}_smooth_furnace") 1 (ConditionsFor (ItemId "${family}_smooth_furnace")) Write-ShapedRecipe "${family}_smooth_wall" 'forge:ore_shaped' @('xxx', 'xxx') ` - ([ordered]@{ x = OreIngredient $smoothOre }) (ItemId "${family}_smooth_wall") 6 ` + ([ordered]@{ x = ConstructionFormIngredient $family 'smooth' 'wall' $smooth $smoothOre }) ` + (ItemId "${family}_smooth_wall") 6 ` (ConditionsFor (ItemId "${family}_smooth_wall")) Write-ShapedRecipe "${family}_smooth_brick" 'forge:ore_shaped' @('xx', 'xx') ` @@ -314,11 +403,18 @@ function Write-BaseFamilyRecipes([string] $family) { function Write-ReliefRecipes([string] $family) { $smooth = ItemId "${family}_smooth" + $smoothOre = FamilyOreName 'stone' $family 'Smooth' + $smoothIngredient = if ($nativeFullBlocks.ContainsKey($family)) { + OreIngredient $smoothOre + } + else { + ItemIngredient $smooth + } $blank = ItemId "${family}_relief_blank" $left = ItemId "${family}_relief_left" Write-ShapedRecipe "${family}_relief_blank" 'minecraft:crafting_shaped' @('xxx', 'xxx', 'xxx') ` - ([ordered]@{ x = ItemIngredient $smooth }) $blank 16 (ConditionsFor $blank) + ([ordered]@{ x = $smoothIngredient }) $blank 16 (ConditionsFor $blank) Write-ShapedRecipe "${family}_relief_cross" 'minecraft:crafting_shaped' @('x x', ' ', 'x x') ` ([ordered]@{ x = ItemIngredient $blank }) (ItemId "${family}_relief_cross") 4 ` (ConditionsFor (ItemId "${family}_relief_cross")) @@ -516,8 +612,8 @@ function Ensure-MissingRecipeAdvancements() { continue } $recipe = Get-Content -LiteralPath $recipeFile.FullName -Raw | ConvertFrom-Json - $sourceItem = Infer-UnlockSource $recipeName $recipe - if ([string]::IsNullOrWhiteSpace($sourceItem)) { + $sourceIngredient = Infer-UnlockSource $recipeName $recipe + if ($null -eq $sourceIngredient) { throw "Generated recipe $recipeName has no direct recipe-book unlock source" } $criteria = [ordered]@{ @@ -528,7 +624,7 @@ function Ensure-MissingRecipeAdvancements() { has_rock = [ordered]@{ trigger = 'minecraft:inventory_changed' conditions = [ordered]@{ - items = @([ordered]@{ item = $sourceItem }) + items = @($sourceIngredient) } } } @@ -567,15 +663,20 @@ function Synchronize-AdvancementConditions() { $family = $Matches[1] $relief = $Matches[2] if ($relief -eq 'blank') { - $sourceItem = "mineralogy:${family}_smooth" + $sourceIngredient = if ($nativeFullBlocks.ContainsKey($family)) { + OreIngredient (FamilyOreName 'stone' $family 'Smooth') + } + else { + ItemIngredient "mineralogy:${family}_smooth" + } } elseif ($relief -eq 'right') { - $sourceItem = "mineralogy:${family}_relief_left" + $sourceIngredient = ItemIngredient "mineralogy:${family}_relief_left" } else { - $sourceItem = "mineralogy:${family}_relief_blank" + $sourceIngredient = ItemIngredient "mineralogy:${family}_relief_blank" } - $advancement.criteria.has_rock.conditions.items[0].item = $sourceItem + $advancement.criteria.has_rock.conditions.items = @($sourceIngredient) } if ($null -eq $advancement.criteria.has_the_recipe -or $null -eq $advancement.criteria.has_rock) { throw "Advancement $($file.Name) must have self-recipe and direct-input criteria" @@ -645,14 +746,54 @@ function Write-TargetTags() { } $destination = Join-Path $itemTagRoot "$kind\$family$pathSuffix.json" New-Item -ItemType Directory -Force -Path (Split-Path -Parent $destination) | Out-Null - Write-Json $destination ([ordered]@{ replace = $false; values = @($item) }) + $values = @($item) + $values += @(NativeTagAliases $kind $family $finish) + Write-Json $destination ([ordered]@{ replace = $false; values = $values }) } } } } +function Write-NativePolishedOverrides() { + New-Item -ItemType Directory -Force -Path $minecraftRecipeRoot | Out-Null + New-Item -ItemType Directory -Force -Path $minecraftBuildingAdvancementRoot | Out-Null + foreach ($family in $nativeFullBlocks.Keys) { + $raw = $nativeFullBlocks[$family].raw + $smooth = $nativeFullBlocks[$family].smooth + $recipeName = "polished_$family" + Write-Json (Join-Path $minecraftRecipeRoot "$recipeName.json") ([ordered]@{ + type = 'minecraft:crafting_shapeless' + ingredients = @((ItemIngredient $raw), (ItemIngredient 'minecraft:sand')) + result = RecipeResult $smooth 1 + }) + Write-Json (Join-Path $minecraftBuildingAdvancementRoot "$recipeName.json") ([ordered]@{ + parent = 'minecraft:recipes/root' + rewards = [ordered]@{ recipes = @("minecraft:$recipeName") } + criteria = [ordered]@{ + has_rock = [ordered]@{ + trigger = 'minecraft:inventory_changed' + conditions = [ordered]@{ items = @((ItemIngredient $raw)) } + } + has_sand = [ordered]@{ + trigger = 'minecraft:inventory_changed' + conditions = [ordered]@{ items = @((ItemIngredient 'minecraft:sand')) } + } + has_the_recipe = [ordered]@{ + trigger = 'minecraft:recipe_unlocked' + conditions = [ordered]@{ recipe = "minecraft:$recipeName" } + } + } + requirements = @( + @('has_the_recipe', 'has_rock'), + @('has_the_recipe', 'has_sand') + ) + }) + } +} + Prepare-TargetDirectories Write-TargetTags +Write-NativePolishedOverrides New-Item -ItemType Directory -Force -Path $recipeRoot | Out-Null foreach ($family in $families) { diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_andesite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_andesite.json new file mode 100644 index 000000000..e62fc10d5 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_andesite.json @@ -0,0 +1,46 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:polished_andesite" + ] + }, + "criteria": { + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:andesite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:polished_andesite" + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_basalt.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_basalt.json new file mode 100644 index 000000000..c1f16ec96 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_basalt.json @@ -0,0 +1,46 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:polished_basalt" + ] + }, + "criteria": { + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:basalt" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:polished_basalt" + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_diorite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_diorite.json new file mode 100644 index 000000000..28c349dba --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_diorite.json @@ -0,0 +1,46 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:polished_diorite" + ] + }, + "criteria": { + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:diorite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:polished_diorite" + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_granite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_granite.json new file mode 100644 index 000000000..a3362eb7a --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_granite.json @@ -0,0 +1,46 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:polished_granite" + ] + }, + "criteria": { + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:granite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:sand" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:polished_granite" + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] +} diff --git a/src/main/resources/data/minecraft/recipes/polished_andesite.json b/src/main/resources/data/minecraft/recipes/polished_andesite.json new file mode 100644 index 000000000..e712c2ae9 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_andesite.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:andesite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "minecraft:polished_andesite", + "count": 1 + } +} diff --git a/src/main/resources/data/minecraft/recipes/polished_basalt.json b/src/main/resources/data/minecraft/recipes/polished_basalt.json new file mode 100644 index 000000000..458afd4ae --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_basalt.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:basalt" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "minecraft:polished_basalt", + "count": 1 + } +} diff --git a/src/main/resources/data/minecraft/recipes/polished_diorite.json b/src/main/resources/data/minecraft/recipes/polished_diorite.json new file mode 100644 index 000000000..a85d79608 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_diorite.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:diorite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "minecraft:polished_diorite", + "count": 1 + } +} diff --git a/src/main/resources/data/minecraft/recipes/polished_granite.json b/src/main/resources/data/minecraft/recipes/polished_granite.json new file mode 100644 index 000000000..c714cfad2 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_granite.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:granite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "minecraft:polished_granite", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json index 260dcfa02..761920bd4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite" - ] + "tag": "mineralogy:stones/amphibolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json index c515bb2bf..c4888bf7d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:amphibolite_brick_slab" + "tag": "mineralogy:slabs/amphibolite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json index 16e65cb2f..b1f233bd6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:amphibolite_brick" + "tag": "mineralogy:stones/amphibolite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json index ce8198578..73f3b0a6e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:amphibolite_brick" + "tag": "mineralogy:stones/amphibolite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json index 5134c2ab2..862485ea9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:amphibolite" + "tag": "mineralogy:stones/amphibolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json index 53af343be..274546f5b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:amphibolite_slab" + "tag": "mineralogy:slabs/amphibolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json index 22ddf3690..7d539c0fb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite" - ] + "tag": "mineralogy:stones/amphibolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json index bbe632bfb..4a97581d0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:amphibolite_smooth" + "tag": "mineralogy:stones/amphibolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json index 59117e361..889d1ef75 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:amphibolite_smooth_brick_slab" + "tag": "mineralogy:slabs/amphibolite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json index 07174f01e..165058463 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:amphibolite_smooth_brick" + "tag": "mineralogy:stones/amphibolite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json index b32eb6d2d..76cc49e94 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:amphibolite_smooth_brick" + "tag": "mineralogy:stones/amphibolite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json index 84f05dba9..a032a67ef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:amphibolite_smooth_slab" + "tag": "mineralogy:slabs/amphibolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json index 86d897285..28cf3bd75 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:amphibolite_smooth" + "tag": "mineralogy:stones/amphibolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json index b5652cbe4..4b33cdf33 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:amphibolite_smooth" + "tag": "mineralogy:stones/amphibolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json index 809fc3df7..18e859e38 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite" - ] + "tag": "mineralogy:stones/amphibolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json index a5284c2eb..303f2b278 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:amphibolite" - ] + "tag": "mineralogy:stones/amphibolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json index df87171f3..4e18d1a62 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:andesite" - ] + "tag": "mineralogy:stones/andesite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json index b76856360..b989151a7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:andesite_brick_slab" + "tag": "mineralogy:slabs/andesite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json index 92c2c2b31..00e347e83 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:andesite_brick" + "tag": "mineralogy:stones/andesite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json index 99153df04..1ca49dca0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:andesite_brick" + "tag": "mineralogy:stones/andesite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json index d79fcae34..20341397f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:andesite" + "tag": "mineralogy:stones/andesite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json index 13fc4b36f..097ccc6e7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:andesite_slab" + "tag": "mineralogy:slabs/andesite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json index b8b4f01ef..d97ae1239 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:andesite_smooth" + "tag": "mineralogy:stones/andesite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json index 8050e7231..8e770b798 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:andesite_smooth" + "tag": "mineralogy:stones/andesite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json index a655c3d7e..331d01027 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:andesite_smooth_brick_slab" + "tag": "mineralogy:slabs/andesite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json index fdd419b30..79afc7369 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:andesite_smooth_brick" + "tag": "mineralogy:stones/andesite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json index 9c06e29e7..94d456028 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:andesite_smooth_brick" + "tag": "mineralogy:stones/andesite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json index 559781695..62bc78958 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:andesite_smooth_slab" + "tag": "mineralogy:slabs/andesite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json index ef2a0684a..1845e9105 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:andesite_smooth" + "tag": "mineralogy:stones/andesite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json index af8924a24..e474731e6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basalt" - ] + "tag": "mineralogy:stones/basalt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json index ec3cf5c2f..d0e44e667 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basalt_brick_slab" + "tag": "mineralogy:slabs/basalt/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json index 5d487117d..e2e0ae8d2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basalt_brick" + "tag": "mineralogy:stones/basalt/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json index e1beb5f9f..38a465623 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basalt_brick" + "tag": "mineralogy:stones/basalt/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json index 39ca21a76..751e4b621 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basalt" + "tag": "mineralogy:stones/basalt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json index c96a92e4d..5f2bcbac8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basalt_slab" + "tag": "mineralogy:slabs/basalt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json index aa3403abc..4c11e557a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basalt_smooth" + "tag": "mineralogy:stones/basalt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json index 9852d30cf..0b0bfd323 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:crafting_materials/basalt" + "tag": "mineralogy:stones/basalt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json index b5165fcae..68783984d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basalt_smooth" + "tag": "mineralogy:stones/basalt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json index 89806d879..92dc76139 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basalt_smooth_brick_slab" + "tag": "mineralogy:slabs/basalt/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json index 258d648ec..966e96821 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basalt_smooth_brick" + "tag": "mineralogy:stones/basalt/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json index 7f558444f..53ee64524 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basalt_smooth_brick" + "tag": "mineralogy:stones/basalt/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json index 5b1dcea60..657af34d6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basalt_smooth_slab" + "tag": "mineralogy:slabs/basalt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json index cbfe6c693..95793bf15 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basalt_smooth" + "tag": "mineralogy:stones/basalt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json index aeabf91da..3f0b47c9c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basalt_smooth" + "tag": "mineralogy:stones/basalt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json index f91092a2b..f44f84a63 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basalt_smooth" + "tag": "mineralogy:stones/basalt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json index ef04e7ee7..3bc918bff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:crafting_materials/basalt" + "tag": "mineralogy:stones/basalt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json index 4259b1cac..3aeaa6441 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:crafting_materials/basalt" + "tag": "mineralogy:stones/basalt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json index f716c3d22..296b5ff03 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass" - ] + "tag": "mineralogy:stones/basaltic_glass" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json index 5e9a614bd..49b8f56e7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basaltic_glass_brick_slab" + "tag": "mineralogy:slabs/basaltic_glass/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json index 104bd3ca6..61f06cc5f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basaltic_glass_brick" + "tag": "mineralogy:stones/basaltic_glass/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json index cf60191c6..93798d054 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basaltic_glass_brick" + "tag": "mineralogy:stones/basaltic_glass/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json index bbcf92bee..a9d08d00a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basaltic_glass" + "tag": "mineralogy:stones/basaltic_glass" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json index 76161a892..088d1736e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basaltic_glass_slab" + "tag": "mineralogy:slabs/basaltic_glass" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json index 5f9f20f0f..45327091a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass" - ] + "tag": "mineralogy:stones/basaltic_glass" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json index 1734794c7..4d61fd49d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basaltic_glass_smooth" + "tag": "mineralogy:stones/basaltic_glass/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json index 92e67b90d..a17b91b3f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basaltic_glass_smooth_brick_slab" + "tag": "mineralogy:slabs/basaltic_glass/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json index 558660305..8ba48d70b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basaltic_glass_smooth_brick" + "tag": "mineralogy:stones/basaltic_glass/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json index e50201b38..6dc9f7288 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basaltic_glass_smooth_brick" + "tag": "mineralogy:stones/basaltic_glass/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json index 50f4434cf..5d4d31b9e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basaltic_glass_smooth_slab" + "tag": "mineralogy:slabs/basaltic_glass/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json index 971bfecc3..e7725d79a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basaltic_glass_smooth" + "tag": "mineralogy:stones/basaltic_glass/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json index 991978015..e59af9813 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:basaltic_glass_smooth" + "tag": "mineralogy:stones/basaltic_glass/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json index 7f4917c6f..a278715c9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass" - ] + "tag": "mineralogy:stones/basaltic_glass" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json index 40a6c592f..70d4d8c6a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:basaltic_glass" - ] + "tag": "mineralogy:stones/basaltic_glass" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json index 6bc2f156a..c714680bd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate" - ] + "tag": "mineralogy:stones/conglomerate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json index 4a55dfb6b..cee1926f0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:conglomerate_brick_slab" + "tag": "mineralogy:slabs/conglomerate/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json index b68c2eab8..1dc413c86 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:conglomerate_brick" + "tag": "mineralogy:stones/conglomerate/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json index acb83ada6..e65d9196e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:conglomerate_brick" + "tag": "mineralogy:stones/conglomerate/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json index 893c43b81..b5a2c7c63 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:conglomerate" + "tag": "mineralogy:stones/conglomerate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json index 4ebe85467..f6349b431 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:conglomerate_slab" + "tag": "mineralogy:slabs/conglomerate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json index e64d22ea5..8e094ba96 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate" - ] + "tag": "mineralogy:stones/conglomerate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json index 0c1601bf2..c53fc370d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:conglomerate_smooth" + "tag": "mineralogy:stones/conglomerate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json index 3a42d2b9e..3f1e92ce7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:conglomerate_smooth_brick_slab" + "tag": "mineralogy:slabs/conglomerate/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json index f2f97015c..67134dff3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:conglomerate_smooth_brick" + "tag": "mineralogy:stones/conglomerate/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json index 5283005ce..b5121caea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:conglomerate_smooth_brick" + "tag": "mineralogy:stones/conglomerate/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json index 4f7804769..4a4b06994 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:conglomerate_smooth_slab" + "tag": "mineralogy:slabs/conglomerate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json index b109fe0c7..5e06028c9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:conglomerate_smooth" + "tag": "mineralogy:stones/conglomerate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json index 467f57e05..298171939 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:conglomerate_smooth" + "tag": "mineralogy:stones/conglomerate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json index 7f6367e1e..d5c46979a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate" - ] + "tag": "mineralogy:stones/conglomerate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json index 7210c1528..7d7e14edb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:conglomerate" - ] + "tag": "mineralogy:stones/conglomerate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json index 3bb94021d..20b52d435 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase" - ] + "tag": "mineralogy:stones/diabase" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json index 58b750c68..caa6c4247 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diabase_brick_slab" + "tag": "mineralogy:slabs/diabase/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json index 55bbc2aeb..3d240bdba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diabase_brick" + "tag": "mineralogy:stones/diabase/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json index 3c9448ba9..27d0117e9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diabase_brick" + "tag": "mineralogy:stones/diabase/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json index 94f6da355..60272f1b0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diabase" + "tag": "mineralogy:stones/diabase" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json index 64345c477..b404286d4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diabase_slab" + "tag": "mineralogy:slabs/diabase" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json index aecebea10..cffebea0b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase" - ] + "tag": "mineralogy:stones/diabase" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json index 7ceff6117..db68df839 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diabase_smooth" + "tag": "mineralogy:stones/diabase/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json index c6414ca65..d46955bd0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diabase_smooth_brick_slab" + "tag": "mineralogy:slabs/diabase/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json index 026803b1f..ca9d4a99b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diabase_smooth_brick" + "tag": "mineralogy:stones/diabase/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json index 75ef202f0..7009b8992 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diabase_smooth_brick" + "tag": "mineralogy:stones/diabase/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json index e9d16673e..821c199e5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diabase_smooth_slab" + "tag": "mineralogy:slabs/diabase/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json index 83e04941e..72a3c3107 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diabase_smooth" + "tag": "mineralogy:stones/diabase/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json index 3d257fc32..39adbbcbe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diabase_smooth" + "tag": "mineralogy:stones/diabase/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json index 1eca79346..d75a54909 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase" - ] + "tag": "mineralogy:stones/diabase" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json index 21035b0ed..7e2c67a32 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diabase" - ] + "tag": "mineralogy:stones/diabase" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json index ddbee2916..2fc1fd4d5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:diorite" - ] + "tag": "mineralogy:stones/diorite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json index af7a955f4..e9c88f68c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diorite_brick_slab" + "tag": "mineralogy:slabs/diorite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json index de65fa8c9..a1743db7f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diorite_brick" + "tag": "mineralogy:stones/diorite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json index 222718a33..26466301d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diorite_brick" + "tag": "mineralogy:stones/diorite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json index 901a5e320..90e08957f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diorite" + "tag": "mineralogy:stones/diorite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json index 70bf696aa..6c9befbd2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diorite_slab" + "tag": "mineralogy:slabs/diorite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json index 33cf1e5d1..260201a8f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diorite_smooth" + "tag": "mineralogy:stones/diorite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json index 286b2b822..259e83d7c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diorite_smooth" + "tag": "mineralogy:stones/diorite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json index aecb3b8e0..a344da9a9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diorite_smooth_brick_slab" + "tag": "mineralogy:slabs/diorite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json index fe77da3b2..38d4eca0f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diorite_smooth_brick" + "tag": "mineralogy:stones/diorite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json index 96d61824d..ed1f4828f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diorite_smooth_brick" + "tag": "mineralogy:stones/diorite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json index 8b2ed87fa..be3aeb85f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diorite_smooth_slab" + "tag": "mineralogy:slabs/diorite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json index 37cbc9a81..11c9fcddf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:diorite_smooth" + "tag": "mineralogy:stones/diorite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json index 8a427cf67..475f6490d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite" - ] + "tag": "mineralogy:stones/dolomite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json index 66d5967af..d2a6832bb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:dolomite_brick_slab" + "tag": "mineralogy:slabs/dolomite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json index a368c350d..92a76761c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:dolomite_brick" + "tag": "mineralogy:stones/dolomite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json index c02d755ce..3caeeb233 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:dolomite_brick" + "tag": "mineralogy:stones/dolomite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json index a6c5f0ecb..e00a211b4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:dolomite" + "tag": "mineralogy:stones/dolomite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json index e323181a2..314458f39 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:dolomite_slab" + "tag": "mineralogy:slabs/dolomite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json index a08b827a4..5c197d489 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite" - ] + "tag": "mineralogy:stones/dolomite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json index 543ba5003..b8125d4bc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:dolomite_smooth" + "tag": "mineralogy:stones/dolomite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json index 4bc1f5bce..2bc9dda3f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:dolomite_smooth_brick_slab" + "tag": "mineralogy:slabs/dolomite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json index 7888757c6..f47cfef76 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:dolomite_smooth_brick" + "tag": "mineralogy:stones/dolomite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json index 8607a2cc6..8d3007357 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:dolomite_smooth_brick" + "tag": "mineralogy:stones/dolomite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json index 8490cc169..17d009b69 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:dolomite_smooth_slab" + "tag": "mineralogy:slabs/dolomite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json index c60c3a47d..df38164af 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:dolomite_smooth" + "tag": "mineralogy:stones/dolomite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json index 2d06ba0c9..20c27b25f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:dolomite_smooth" + "tag": "mineralogy:stones/dolomite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json index a6a3d2d27..75033717f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite" - ] + "tag": "mineralogy:stones/dolomite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json index 56e67f770..a4809de93 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:dolomite" - ] + "tag": "mineralogy:stones/dolomite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json index 8b238beb7..6c230c30d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro" - ] + "tag": "mineralogy:stones/gabbro" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json index 8a8a9a81a..feefa5903 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gabbro_brick_slab" + "tag": "mineralogy:slabs/gabbro/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json index 9740a99d4..de9f2ca98 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gabbro_brick" + "tag": "mineralogy:stones/gabbro/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json index 16f4d2566..b935dfd58 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gabbro_brick" + "tag": "mineralogy:stones/gabbro/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json index 8ea15f0cc..211832c54 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gabbro" + "tag": "mineralogy:stones/gabbro" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json index 383d420c9..b3ff21ecd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gabbro_slab" + "tag": "mineralogy:slabs/gabbro" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json index 216a177c3..570029f94 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro" - ] + "tag": "mineralogy:stones/gabbro" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json index 0cd862edc..a84c64338 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gabbro_smooth" + "tag": "mineralogy:stones/gabbro/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json index 4cbb0e4c0..d8c38b61b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gabbro_smooth_brick_slab" + "tag": "mineralogy:slabs/gabbro/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json index b637a85ac..3228014c8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gabbro_smooth_brick" + "tag": "mineralogy:stones/gabbro/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json index 1cd1a1478..4b22fe23b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gabbro_smooth_brick" + "tag": "mineralogy:stones/gabbro/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json index 7b73eb8f1..5089ef29b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gabbro_smooth_slab" + "tag": "mineralogy:slabs/gabbro/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json index 904b21bd3..39aaaeb1b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gabbro_smooth" + "tag": "mineralogy:stones/gabbro/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json index b23152f83..b0208bbaa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gabbro_smooth" + "tag": "mineralogy:stones/gabbro/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json index 29edc326b..189a730ee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro" - ] + "tag": "mineralogy:stones/gabbro" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json index a51395292..68c01c826 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gabbro" - ] + "tag": "mineralogy:stones/gabbro" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json index 19a85a6ab..6326a971a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss" - ] + "tag": "mineralogy:stones/gneiss" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json index c101a2b66..d7449be5e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gneiss_brick_slab" + "tag": "mineralogy:slabs/gneiss/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json index 7ae9454e0..ac8fd13bc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gneiss_brick" + "tag": "mineralogy:stones/gneiss/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json index 52b724944..6ba8c6528 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gneiss_brick" + "tag": "mineralogy:stones/gneiss/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json index ce9f4016a..4ea76f359 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gneiss" + "tag": "mineralogy:stones/gneiss" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json index 22c1617a7..6cfd0e44a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gneiss_slab" + "tag": "mineralogy:slabs/gneiss" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json index 8a942ac4d..1e69ff816 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss" - ] + "tag": "mineralogy:stones/gneiss" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json index d6af54f0c..b1fe4a6eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gneiss_smooth" + "tag": "mineralogy:stones/gneiss/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json index d38f46318..d4631574f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gneiss_smooth_brick_slab" + "tag": "mineralogy:slabs/gneiss/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json index 435293a43..d6173da56 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gneiss_smooth_brick" + "tag": "mineralogy:stones/gneiss/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json index 1213e8922..64c1b95a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gneiss_smooth_brick" + "tag": "mineralogy:stones/gneiss/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json index 614d3d260..64ba7f6f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gneiss_smooth_slab" + "tag": "mineralogy:slabs/gneiss/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json index 4a93bcff3..dc69ebba4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gneiss_smooth" + "tag": "mineralogy:stones/gneiss/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json index 4c2a17399..eebe8e032 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:gneiss_smooth" + "tag": "mineralogy:stones/gneiss/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json index e6810b0cd..9fc6592b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss" - ] + "tag": "mineralogy:stones/gneiss" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json index d844ffe21..e69c7c1b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:gneiss" - ] + "tag": "mineralogy:stones/gneiss" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json index 4e6484e50..4165cc0e8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:granite" - ] + "tag": "mineralogy:stones/granite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json index 2153fc261..8ace248fe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:granite_brick_slab" + "tag": "mineralogy:slabs/granite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json index 7e77c6daf..8960aae73 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:granite_brick" + "tag": "mineralogy:stones/granite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json index e5164a19c..cae5a4999 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:granite_brick" + "tag": "mineralogy:stones/granite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json index d1b29ab79..f14469c08 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:granite" + "tag": "mineralogy:stones/granite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json index edeea0c9f..0e33510cd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:granite_slab" + "tag": "mineralogy:slabs/granite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json index 40d9a280e..18875e638 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:granite_smooth" + "tag": "mineralogy:stones/granite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json index 14b179b97..b1daba51c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:granite_smooth" + "tag": "mineralogy:stones/granite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json index c8eb28ad2..6b803a9de 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:granite_smooth_brick_slab" + "tag": "mineralogy:slabs/granite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json index ab9b82d1a..fa83c61b0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:granite_smooth_brick" + "tag": "mineralogy:stones/granite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json index 3b739b86a..5bdad6098 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:granite_smooth_brick" + "tag": "mineralogy:stones/granite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json index 21cce629a..8af26d403 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:granite_smooth_slab" + "tag": "mineralogy:slabs/granite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json index 53c48776a..263359e2c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:granite_smooth" + "tag": "mineralogy:stones/granite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json index 06a721f36..348024b70 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels" - ] + "tag": "mineralogy:stones/hornfels" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json index d8ca895ab..3c3203252 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:hornfels_brick_slab" + "tag": "mineralogy:slabs/hornfels/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json index e5f6569e6..9357bf22c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:hornfels_brick" + "tag": "mineralogy:stones/hornfels/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json index 2681d9228..d4ebf499f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:hornfels_brick" + "tag": "mineralogy:stones/hornfels/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json index cff58e805..1b89c3750 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:hornfels" + "tag": "mineralogy:stones/hornfels" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json index 37d2ca732..2f17e7e7c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:hornfels_slab" + "tag": "mineralogy:slabs/hornfels" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json index 920148bf2..3a6b8d2d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels" - ] + "tag": "mineralogy:stones/hornfels" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json index f42a1c9b5..2cb8ecf82 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:hornfels_smooth" + "tag": "mineralogy:stones/hornfels/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json index 66605819e..7f4d12697 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:hornfels_smooth_brick_slab" + "tag": "mineralogy:slabs/hornfels/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json index 3b30ce5cb..98d5a042f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:hornfels_smooth_brick" + "tag": "mineralogy:stones/hornfels/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json index b17711114..b5d2bf548 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:hornfels_smooth_brick" + "tag": "mineralogy:stones/hornfels/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json index 5c53cc9ad..c22e33ac5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:hornfels_smooth_slab" + "tag": "mineralogy:slabs/hornfels/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json index d3fae40d4..b4a9ba4b3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:hornfels_smooth" + "tag": "mineralogy:stones/hornfels/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json index da15087df..7a0016e0e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:hornfels_smooth" + "tag": "mineralogy:stones/hornfels/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json index fb80d5c7f..a2b9f4c55 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels" - ] + "tag": "mineralogy:stones/hornfels" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json index afc47e251..3203bc712 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:hornfels" - ] + "tag": "mineralogy:stones/hornfels" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json index fd50bb2e1..3401eaf63 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone" - ] + "tag": "mineralogy:stones/limestone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json index 0c32538b8..ec13ebc97 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:limestone_brick_slab" + "tag": "mineralogy:slabs/limestone/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json index ebd998bb2..d215cccc5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:limestone_brick" + "tag": "mineralogy:stones/limestone/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json index 0da7ab05a..e8a31a018 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:limestone_brick" + "tag": "mineralogy:stones/limestone/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json index b53f84021..06558792e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:limestone" + "tag": "mineralogy:stones/limestone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json index d6ec0833a..90776231f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:limestone_slab" + "tag": "mineralogy:slabs/limestone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json index d4b154d9e..3243fcc4a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone" - ] + "tag": "mineralogy:stones/limestone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json index d25c2c794..91cafb123 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:limestone_smooth" + "tag": "mineralogy:stones/limestone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json index e5ff72d03..2229c379d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:limestone_smooth_brick_slab" + "tag": "mineralogy:slabs/limestone/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json index 6205d15a7..ac48fbac3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:limestone_smooth_brick" + "tag": "mineralogy:stones/limestone/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json index e5fa8b40d..60c873bce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:limestone_smooth_brick" + "tag": "mineralogy:stones/limestone/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json index 084ea0cbf..4acf3f2d3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:limestone_smooth_slab" + "tag": "mineralogy:slabs/limestone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json index 14c5ae49a..e6633ef47 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:limestone_smooth" + "tag": "mineralogy:stones/limestone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json index 456cd1081..f17651c29 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:limestone_smooth" + "tag": "mineralogy:stones/limestone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json index a961df1c8..ab3266a85 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone" - ] + "tag": "mineralogy:stones/limestone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json index 317e3e089..88f1febba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:limestone" - ] + "tag": "mineralogy:stones/limestone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json index aeca1c185..dd1d882fe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble" - ] + "tag": "mineralogy:stones/marble" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json index 7cfd0d4af..3911a21e8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:marble_brick_slab" + "tag": "mineralogy:slabs/marble/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json index 0b5276827..cefd054d2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:marble_brick" + "tag": "mineralogy:stones/marble/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json index fd2209acf..4514fb6d7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:marble_brick" + "tag": "mineralogy:stones/marble/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json index 690706b0a..b24a2acfe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:marble" + "tag": "mineralogy:stones/marble" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json index 2e30f25ee..e2ba0ac82 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:marble_slab" + "tag": "mineralogy:slabs/marble" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json index cf6c28b18..e6f3fb6ec 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble" - ] + "tag": "mineralogy:stones/marble" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json index 8756da174..1fc70b768 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:marble_smooth" + "tag": "mineralogy:stones/marble/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json index 62619be81..7f6cf7171 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:marble_smooth_brick_slab" + "tag": "mineralogy:slabs/marble/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json index 9dcd408bc..764ef0112 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:marble_smooth_brick" + "tag": "mineralogy:stones/marble/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json index 7ea3aa50b..0e483da10 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:marble_smooth_brick" + "tag": "mineralogy:stones/marble/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json index 36c6a7a9b..be48c2cf8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:marble_smooth_slab" + "tag": "mineralogy:slabs/marble/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json index d52f6dac9..400cc361f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:marble_smooth" + "tag": "mineralogy:stones/marble/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json index 7d7390e7d..7d243c66e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:marble_smooth" + "tag": "mineralogy:stones/marble/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json index 8ee18ef83..00342df95 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble" - ] + "tag": "mineralogy:stones/marble" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json index d0b65bdd4..3eea83d68 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:marble" - ] + "tag": "mineralogy:stones/marble" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json index c29f9f704..1ff3ceaa6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite" - ] + "tag": "mineralogy:stones/novaculite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json index 6242ddbca..4f02ae68a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:novaculite_brick_slab" + "tag": "mineralogy:slabs/novaculite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json index 29265513b..9fb53d0f6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:novaculite_brick" + "tag": "mineralogy:stones/novaculite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json index 8ff8e4ab1..448a6900c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:novaculite_brick" + "tag": "mineralogy:stones/novaculite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json index 5d5bc6afd..2053c2cbe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:novaculite" + "tag": "mineralogy:stones/novaculite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json index e05ee8b2d..a74cc13cc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:novaculite_slab" + "tag": "mineralogy:slabs/novaculite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json index 4b1a34950..79ddc3710 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite" - ] + "tag": "mineralogy:stones/novaculite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json index a4f7c9187..fcbc54450 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:novaculite_smooth" + "tag": "mineralogy:stones/novaculite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json index 7bca98fdb..fd011ab08 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:novaculite_smooth_brick_slab" + "tag": "mineralogy:slabs/novaculite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json index ca7740af8..572aa6790 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:novaculite_smooth_brick" + "tag": "mineralogy:stones/novaculite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json index 8e0f1889f..bf3eda4c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:novaculite_smooth_brick" + "tag": "mineralogy:stones/novaculite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json index 85df95c14..979734fb5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:novaculite_smooth_slab" + "tag": "mineralogy:slabs/novaculite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json index e28fe3b6c..f04a0efba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:novaculite_smooth" + "tag": "mineralogy:stones/novaculite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json index bcc019542..efa96a7b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:novaculite_smooth" + "tag": "mineralogy:stones/novaculite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json index 13b668f80..775af22ae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite" - ] + "tag": "mineralogy:stones/novaculite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json index 5a14145b8..422cd71af 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:novaculite" - ] + "tag": "mineralogy:stones/novaculite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json index c1b37622e..95c87d452 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite" - ] + "tag": "mineralogy:stones/pegmatite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json index a16c52ad2..90977fe3d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:pegmatite_brick_slab" + "tag": "mineralogy:slabs/pegmatite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json index a9e15dc0f..9878f429d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:pegmatite_brick" + "tag": "mineralogy:stones/pegmatite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json index c5f9d090b..9feef6a62 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:pegmatite_brick" + "tag": "mineralogy:stones/pegmatite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json index 32f038b98..a62926548 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:pegmatite" + "tag": "mineralogy:stones/pegmatite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json index 1e7e6b1bb..e282a3f71 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:pegmatite_slab" + "tag": "mineralogy:slabs/pegmatite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json index 62fb8eca3..76586bd34 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite" - ] + "tag": "mineralogy:stones/pegmatite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json index a93782b2d..32e7a3fc7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:pegmatite_smooth" + "tag": "mineralogy:stones/pegmatite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json index eab23e3eb..fb6dbfcd6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:pegmatite_smooth_brick_slab" + "tag": "mineralogy:slabs/pegmatite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json index bb18e8379..7180add91 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:pegmatite_smooth_brick" + "tag": "mineralogy:stones/pegmatite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json index 861bdbbfd..2c12f204b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:pegmatite_smooth_brick" + "tag": "mineralogy:stones/pegmatite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json index b42725479..ed4578b72 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:pegmatite_smooth_slab" + "tag": "mineralogy:slabs/pegmatite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json index d7f037990..7dffab2b2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:pegmatite_smooth" + "tag": "mineralogy:stones/pegmatite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json index e588aa437..e0148726d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:pegmatite_smooth" + "tag": "mineralogy:stones/pegmatite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json index b86cd8cba..be656c820 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite" - ] + "tag": "mineralogy:stones/pegmatite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json index 6282e684a..8ac76f6a4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:pegmatite" - ] + "tag": "mineralogy:stones/pegmatite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json index 10f4a79ef..c0155f2da 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite" - ] + "tag": "mineralogy:stones/peridotite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json index 048eb0cc0..003899d57 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:peridotite_brick_slab" + "tag": "mineralogy:slabs/peridotite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json index e177d5dbf..1001e7060 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:peridotite_brick" + "tag": "mineralogy:stones/peridotite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json index 0ffd55abf..56800a6c3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:peridotite_brick" + "tag": "mineralogy:stones/peridotite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json index 58e09414c..93a0d4b93 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:peridotite" + "tag": "mineralogy:stones/peridotite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json index 49f207d0b..6c00fab9b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:peridotite_slab" + "tag": "mineralogy:slabs/peridotite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json index 1183b0896..b18eaecfa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite" - ] + "tag": "mineralogy:stones/peridotite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json index f776a16a0..96b759d9b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:peridotite_smooth" + "tag": "mineralogy:stones/peridotite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json index 2b83dabb6..5ffa44122 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:peridotite_smooth_brick_slab" + "tag": "mineralogy:slabs/peridotite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json index 4d3e25c35..185e01805 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:peridotite_smooth_brick" + "tag": "mineralogy:stones/peridotite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json index f6948b978..0b129a070 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:peridotite_smooth_brick" + "tag": "mineralogy:stones/peridotite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json index 1d670e063..c06d6ce86 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:peridotite_smooth_slab" + "tag": "mineralogy:slabs/peridotite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json index fcb5aab4f..9ee001499 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:peridotite_smooth" + "tag": "mineralogy:stones/peridotite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json index 31c9d7b70..9aba11d89 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:peridotite_smooth" + "tag": "mineralogy:stones/peridotite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json index 061e84d3a..26fb82819 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite" - ] + "tag": "mineralogy:stones/peridotite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json index 9df43657e..a66f95b60 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:peridotite" - ] + "tag": "mineralogy:stones/peridotite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json index dca9c7a90..c8bcbf952 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite" - ] + "tag": "mineralogy:stones/phyllite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json index 80b0d3187..34c91fa97 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:phyllite_brick_slab" + "tag": "mineralogy:slabs/phyllite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json index e9b0ab080..8abd15ca2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:phyllite_brick" + "tag": "mineralogy:stones/phyllite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json index 3422f098e..2c8d2b56a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:phyllite_brick" + "tag": "mineralogy:stones/phyllite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json index 45fdf0ab4..ecdcd15c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:phyllite" + "tag": "mineralogy:stones/phyllite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json index bf71f7890..df68592e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:phyllite_slab" + "tag": "mineralogy:slabs/phyllite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json index 42ddb82e1..02057afdb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite" - ] + "tag": "mineralogy:stones/phyllite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json index 960088d08..a3f2ceada 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:phyllite_smooth" + "tag": "mineralogy:stones/phyllite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json index 0195e2b9f..338e4a4c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:phyllite_smooth_brick_slab" + "tag": "mineralogy:slabs/phyllite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json index f40c94c78..77aa060c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:phyllite_smooth_brick" + "tag": "mineralogy:stones/phyllite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json index 976eacf1f..2fed9a12a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:phyllite_smooth_brick" + "tag": "mineralogy:stones/phyllite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json index 8dc2041db..0d62b5563 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:phyllite_smooth_slab" + "tag": "mineralogy:slabs/phyllite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json index 89abe779c..db1c9a3f2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:phyllite_smooth" + "tag": "mineralogy:stones/phyllite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json index 73a1ec94c..a792b1b75 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:phyllite_smooth" + "tag": "mineralogy:stones/phyllite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json index e6a90f99f..cbd662d46 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite" - ] + "tag": "mineralogy:stones/phyllite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json index 95277e922..709a51a53 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:phyllite" - ] + "tag": "mineralogy:stones/phyllite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json index f6339d24e..2c068b113 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite" - ] + "tag": "mineralogy:stones/quartzite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json index 762db98ec..32f6d2bc5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:quartzite_brick_slab" + "tag": "mineralogy:slabs/quartzite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json index 32180ccbd..f1617f6ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:quartzite_brick" + "tag": "mineralogy:stones/quartzite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json index 6e8a50afa..e535af71a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:quartzite_brick" + "tag": "mineralogy:stones/quartzite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json index 07d9acabb..c8d6f85b9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:quartzite" + "tag": "mineralogy:stones/quartzite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json index cb4865eea..167add218 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:quartzite_slab" + "tag": "mineralogy:slabs/quartzite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json index 4f323310f..179410daf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite" - ] + "tag": "mineralogy:stones/quartzite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json index 9ce00226f..86a9c7611 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:quartzite_smooth" + "tag": "mineralogy:stones/quartzite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json index 862a8dcfb..21f029d90 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:quartzite_smooth_brick_slab" + "tag": "mineralogy:slabs/quartzite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json index fe9e1071d..590bc50a8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:quartzite_smooth_brick" + "tag": "mineralogy:stones/quartzite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json index c78b550ae..1a8dff665 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:quartzite_smooth_brick" + "tag": "mineralogy:stones/quartzite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json index a2a185d1b..bf8aea34c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:quartzite_smooth_slab" + "tag": "mineralogy:slabs/quartzite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json index ef4637b9e..7eae9aefc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:quartzite_smooth" + "tag": "mineralogy:stones/quartzite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json index c1a6e6527..992040b09 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:quartzite_smooth" + "tag": "mineralogy:stones/quartzite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json index 4f3238af8..879878073 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite" - ] + "tag": "mineralogy:stones/quartzite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json index d39dc5c22..725f93b7a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:quartzite" - ] + "tag": "mineralogy:stones/quartzite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json index 7b23a73e2..a9f71ea18 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite" - ] + "tag": "mineralogy:stones/rhyolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json index 16b255e89..b021e63f9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rhyolite_brick_slab" + "tag": "mineralogy:slabs/rhyolite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json index 581cb998f..64c8a5826 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rhyolite_brick" + "tag": "mineralogy:stones/rhyolite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json index 952a4efc0..ab3d7a5b5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rhyolite_brick" + "tag": "mineralogy:stones/rhyolite/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json index 5826eaab8..4071c3a5f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rhyolite" + "tag": "mineralogy:stones/rhyolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json index 9808c39fa..91d779fa2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rhyolite_slab" + "tag": "mineralogy:slabs/rhyolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json index bd0cf29d2..c7a955556 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite" - ] + "tag": "mineralogy:stones/rhyolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json index 1647728af..48b4b98ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rhyolite_smooth" + "tag": "mineralogy:stones/rhyolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json index 4fa7915e8..3b3393219 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rhyolite_smooth_brick_slab" + "tag": "mineralogy:slabs/rhyolite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json index 8e80faf0c..9134511af 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rhyolite_smooth_brick" + "tag": "mineralogy:stones/rhyolite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json index f4fcac8b4..8e5167394 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rhyolite_smooth_brick" + "tag": "mineralogy:stones/rhyolite/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json index 67f5975f9..10a27a57c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rhyolite_smooth_slab" + "tag": "mineralogy:slabs/rhyolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json index c935aeeed..ecd994388 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rhyolite_smooth" + "tag": "mineralogy:stones/rhyolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json index ee1708101..865949998 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rhyolite_smooth" + "tag": "mineralogy:stones/rhyolite/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json index bfcd75fb0..5e54fb9c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite" - ] + "tag": "mineralogy:stones/rhyolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json index 0f60d1d2e..1cdd9827d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rhyolite" - ] + "tag": "mineralogy:stones/rhyolite" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json index 00c4f4f1b..240b261a7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt" - ] + "tag": "mineralogy:stones/rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json index 53baf5775..1947e2778 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rock_salt_brick_slab" + "tag": "mineralogy:slabs/rock_salt/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json index beba5e757..cb8fea282 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rock_salt_brick" + "tag": "mineralogy:stones/rock_salt/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json index 4f23e6ae4..1c712e947 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rock_salt_brick" + "tag": "mineralogy:stones/rock_salt/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json index 99e1dbcad..b1383a701 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rock_salt" + "tag": "mineralogy:stones/rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json index e99aa0c97..1add23870 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rock_salt_slab" + "tag": "mineralogy:slabs/rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json index dd2497b5a..9d4f8cf6c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt" - ] + "tag": "mineralogy:stones/rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json index a58092081..2c75162b8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rock_salt_smooth" + "tag": "mineralogy:stones/rock_salt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json index 5a47d177d..77723bdc2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rock_salt_smooth_brick_slab" + "tag": "mineralogy:slabs/rock_salt/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json index 476a80552..2bd6333f0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rock_salt_smooth_brick" + "tag": "mineralogy:stones/rock_salt/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json index 6eb588c2b..7efe2c866 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rock_salt_smooth_brick" + "tag": "mineralogy:stones/rock_salt/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json index 5288dc3b3..0ffc344e4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rock_salt_smooth_slab" + "tag": "mineralogy:slabs/rock_salt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json index 4044d60cb..2b2b7b3aa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rock_salt_smooth" + "tag": "mineralogy:stones/rock_salt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json index 4f0a189a3..cde366c10 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:rock_salt_smooth" + "tag": "mineralogy:stones/rock_salt/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json index 63a161fb9..362f6922e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt" - ] + "tag": "mineralogy:stones/rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json index e2e300771..9510ef821 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:rock_salt" - ] + "tag": "mineralogy:stones/rock_salt" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json index 7eda8b001..a77c2e35b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist" - ] + "tag": "mineralogy:stones/schist" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json index 97af883d8..0102670ae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:schist_brick_slab" + "tag": "mineralogy:slabs/schist/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json index 5e096cf0f..e1baa5d30 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:schist_brick" + "tag": "mineralogy:stones/schist/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json index cb7d4a239..71d890dd2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:schist_brick" + "tag": "mineralogy:stones/schist/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json index 7cc9e53e4..32244393a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:schist" + "tag": "mineralogy:stones/schist" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json index c2c042873..2b0228c6a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:schist_slab" + "tag": "mineralogy:slabs/schist" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json index bef51b95a..65b266fb4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist" - ] + "tag": "mineralogy:stones/schist" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json index 26207b5f4..e9a56cce2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:schist_smooth" + "tag": "mineralogy:stones/schist/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json index 9763fbc26..ed9f67a2f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:schist_smooth_brick_slab" + "tag": "mineralogy:slabs/schist/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json index 1856c1d99..f3df59d0a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:schist_smooth_brick" + "tag": "mineralogy:stones/schist/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json index 69c1c52f1..39cc21d3d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:schist_smooth_brick" + "tag": "mineralogy:stones/schist/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json index 32f5310d5..c37423514 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:schist_smooth_slab" + "tag": "mineralogy:slabs/schist/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json index d2978d8a2..fbfdbfdc9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:schist_smooth" + "tag": "mineralogy:stones/schist/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json index 2fa5b66ec..e1c745051 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:schist_smooth" + "tag": "mineralogy:stones/schist/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json index 79b7548bd..3662da068 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist" - ] + "tag": "mineralogy:stones/schist" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json index c8c4f119d..275165a27 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:schist" - ] + "tag": "mineralogy:stones/schist" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json index eec5e099e..2dec44e4d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria" - ] + "tag": "mineralogy:stones/scoria" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json index 8d59cfb9c..9b632143d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:scoria_brick_slab" + "tag": "mineralogy:slabs/scoria/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json index 1821043ef..cfde9a426 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:scoria_brick" + "tag": "mineralogy:stones/scoria/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json index f3fc58daf..c8824762c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:scoria_brick" + "tag": "mineralogy:stones/scoria/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json index 7c54ebb5d..1f36055d7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:scoria" + "tag": "mineralogy:stones/scoria" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json index 030e77a52..63f5f94d0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:scoria_slab" + "tag": "mineralogy:slabs/scoria" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json index a5a673c4d..a086ba723 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria" - ] + "tag": "mineralogy:stones/scoria" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json index 8dd9a141d..9770f0f93 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:scoria_smooth" + "tag": "mineralogy:stones/scoria/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json index 015f9160f..f1c6f503c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:scoria_smooth_brick_slab" + "tag": "mineralogy:slabs/scoria/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json index aae20c93d..1d0e91505 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:scoria_smooth_brick" + "tag": "mineralogy:stones/scoria/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json index 107a24e0b..460779681 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:scoria_smooth_brick" + "tag": "mineralogy:stones/scoria/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json index 6458a5fd3..6475aa899 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:scoria_smooth_slab" + "tag": "mineralogy:slabs/scoria/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json index e48555d03..0d842d8a9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:scoria_smooth" + "tag": "mineralogy:stones/scoria/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json index 233bad47c..b1d8f2c77 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:scoria_smooth" + "tag": "mineralogy:stones/scoria/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json index 38aab7072..0dccb0c8e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria" - ] + "tag": "mineralogy:stones/scoria" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json index 26995a825..e8101b680 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:scoria" - ] + "tag": "mineralogy:stones/scoria" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json index 861bf363d..d18e96fed 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale" - ] + "tag": "mineralogy:stones/shale" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json index cc973e73e..ac6fbe2fe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:shale_brick_slab" + "tag": "mineralogy:slabs/shale/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json index 950bd10c5..4a0092db6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:shale_brick" + "tag": "mineralogy:stones/shale/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json index 4cfe6133f..b09c0801a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:shale_brick" + "tag": "mineralogy:stones/shale/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json index ccefcc9f1..10af1ffb9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:shale" + "tag": "mineralogy:stones/shale" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json index 266fa2ef3..44946d73e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:shale_slab" + "tag": "mineralogy:slabs/shale" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json index a795ef935..e966e890c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale" - ] + "tag": "mineralogy:stones/shale" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json index c9bfdc1fc..e67dadbaa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:shale_smooth" + "tag": "mineralogy:stones/shale/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json index 6e3cc971d..4be74a8f2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:shale_smooth_brick_slab" + "tag": "mineralogy:slabs/shale/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json index 9a21d59b0..29ddd7b2f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:shale_smooth_brick" + "tag": "mineralogy:stones/shale/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json index 0cac1a5f2..71c7445b8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:shale_smooth_brick" + "tag": "mineralogy:stones/shale/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json index 16006f4d4..f94bbfbcb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:shale_smooth_slab" + "tag": "mineralogy:slabs/shale/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json index f4657aea2..6598a70e1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:shale_smooth" + "tag": "mineralogy:stones/shale/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json index c2927dff0..08bdc6009 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:shale_smooth" + "tag": "mineralogy:stones/shale/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json index 0503df50a..8d81e6931 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale" - ] + "tag": "mineralogy:stones/shale" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json index e745dda47..6b51b1c3a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:shale" - ] + "tag": "mineralogy:stones/shale" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json index 191a7c11d..d123cc6ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone" - ] + "tag": "mineralogy:stones/siltstone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json index a13c66b31..c91bcdd88 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:siltstone_brick_slab" + "tag": "mineralogy:slabs/siltstone/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json index 5c495bb87..c69258fb0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:siltstone_brick" + "tag": "mineralogy:stones/siltstone/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json index c9bc0781a..2702d8122 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:siltstone_brick" + "tag": "mineralogy:stones/siltstone/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json index b2b7db64f..4fd46830a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:siltstone" + "tag": "mineralogy:stones/siltstone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json index fbc8f6a11..5ec7d3454 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:siltstone_slab" + "tag": "mineralogy:slabs/siltstone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json index 32e7a47c6..3e052cfca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone" - ] + "tag": "mineralogy:stones/siltstone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json index 2b086071f..1c2cb150e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:siltstone_smooth" + "tag": "mineralogy:stones/siltstone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json index 551a049ab..e9d140fbf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:siltstone_smooth_brick_slab" + "tag": "mineralogy:slabs/siltstone/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json index 0789ca42f..56144ec6e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:siltstone_smooth_brick" + "tag": "mineralogy:stones/siltstone/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json index 29d38fc88..a27cf0439 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:siltstone_smooth_brick" + "tag": "mineralogy:stones/siltstone/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json index 654eb149b..0560bfa0b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:siltstone_smooth_slab" + "tag": "mineralogy:slabs/siltstone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json index 7c3d9fd76..ccfc1c6f3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:siltstone_smooth" + "tag": "mineralogy:stones/siltstone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json index e7d75f532..0c788931f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:siltstone_smooth" + "tag": "mineralogy:stones/siltstone/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json index 5e14200c3..56d97dea1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone" - ] + "tag": "mineralogy:stones/siltstone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json index b747f1082..5edd21bc8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:siltstone" - ] + "tag": "mineralogy:stones/siltstone" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json index 5b0021b58..cb20537c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate" - ] + "tag": "mineralogy:stones/slate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json index 86cf4d107..455163e70 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:slate_brick_slab" + "tag": "mineralogy:slabs/slate/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json index ecae4df55..317d378a5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:slate_brick" + "tag": "mineralogy:stones/slate/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json index 6dc28618e..391213c95 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:slate_brick" + "tag": "mineralogy:stones/slate/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json index 0b57f8988..8e20711ea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:slate" + "tag": "mineralogy:stones/slate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json index 82814fcf4..ad23d2a45 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:slate_slab" + "tag": "mineralogy:slabs/slate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json index fb881ba36..7a444fba6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate" - ] + "tag": "mineralogy:stones/slate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json index 265529518..e6a6df768 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:slate_smooth" + "tag": "mineralogy:stones/slate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json index ba25d8190..02121b817 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:slate_smooth_brick_slab" + "tag": "mineralogy:slabs/slate/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json index f6efd7d44..7063e2ce2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:slate_smooth_brick" + "tag": "mineralogy:stones/slate/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json index f60100444..91836a95d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:slate_smooth_brick" + "tag": "mineralogy:stones/slate/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json index edf49538d..5dec16003 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:slate_smooth_slab" + "tag": "mineralogy:slabs/slate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json index 650cc248a..ed09f3929 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:slate_smooth" + "tag": "mineralogy:stones/slate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json index 25eccdd5b..bf1bcbc05 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:slate_smooth" + "tag": "mineralogy:stones/slate/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json index 36d9ea161..519858e2b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate" - ] + "tag": "mineralogy:stones/slate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json index acd2c7dc9..7746a04ac 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json @@ -22,9 +22,7 @@ "conditions": { "items": [ { - "items": [ - "mineralogy:slate" - ] + "tag": "mineralogy:stones/slate" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json index db0b5733e..4c6d719d8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:crafting_materials/tuff" + "tag": "mineralogy:stones/tuff" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json index 60da94b78..d6730dcf4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:tuff_brick_slab" + "tag": "mineralogy:slabs/tuff/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json index 26df09840..7ebe363ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:tuff_brick" + "tag": "mineralogy:stones/tuff/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json index 73e80ff15..458f0a3cf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:tuff_brick" + "tag": "mineralogy:stones/tuff/brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json index c98db5124..4a809ff69 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "mineralogy:tuff" + "tag": "mineralogy:stones/tuff" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json index 79833219c..f2c2d67ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:tuff_slab" + "tag": "mineralogy:slabs/tuff" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json index d1065cc55..954865c55 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:crafting_materials/tuff" + "tag": "mineralogy:stones/tuff" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json index 550c03edd..b7fcedbe9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:tuff_smooth" + "tag": "mineralogy:stones/tuff/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json index ced9c5d99..cfac06ae9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:tuff_smooth_brick_slab" + "tag": "mineralogy:slabs/tuff/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json index 403e8eed3..363c58f00 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:tuff_smooth_brick" + "tag": "mineralogy:stones/tuff/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json index c6ab6e006..295a1a98a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:tuff_smooth_brick" + "tag": "mineralogy:stones/tuff/smooth_brick" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json index e6b4a7bae..caa06983c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:tuff_smooth_slab" + "tag": "mineralogy:slabs/tuff/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json index 2f013f687..1d007dc40 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:tuff_smooth" + "tag": "mineralogy:stones/tuff/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json index d8ce01c94..8258e06ac 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "item": "mineralogy:tuff_smooth" + "tag": "mineralogy:stones/tuff/smooth" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json index 5c6681976..e7a22836d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:crafting_materials/tuff" + "tag": "mineralogy:stones/tuff" } ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json index 48b7cfafa..bed622d53 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json @@ -22,7 +22,7 @@ "conditions": { "items": [ { - "tag": "mineralogy:crafting_materials/tuff" + "tag": "mineralogy:stones/tuff" } ] } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json index 9552bb078..0a7c4cfbc 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json @@ -13,7 +13,7 @@ ], "key": { "x": { - "item": "mineralogy:andesite_smooth" + "tag": "mineralogy:stones/andesite/smooth" } }, "result": { diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth.json index 4abb67516..3dd79dce9 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth.json @@ -8,7 +8,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:stones/andesite" + "item": "mineralogy:andesite" }, { "item": "minecraft:sand" diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json index 85c4a2128..bc09b440f 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json @@ -13,7 +13,7 @@ ], "key": { "x": { - "tag": "mineralogy:stones/andesite/smooth" + "item": "mineralogy:andesite_smooth" } }, "result": { diff --git a/src/main/resources/data/mineralogy/recipes/andesite_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_stairs.json index 1d49219e7..b935cff1e 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_stairs.json @@ -13,7 +13,7 @@ ], "key": { "x": { - "tag": "mineralogy:stones/andesite" + "item": "mineralogy:andesite" } }, "result": { diff --git a/src/main/resources/data/mineralogy/recipes/andesite_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_wall.json index 332ca18d1..265f53836 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_wall.json @@ -12,7 +12,7 @@ ], "key": { "x": { - "tag": "mineralogy:stones/andesite" + "item": "mineralogy:andesite" } }, "result": { diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json index 8c1172e29..0af78a5f9 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json @@ -13,7 +13,7 @@ ], "key": { "x": { - "item": "mineralogy:basalt_smooth" + "tag": "mineralogy:stones/basalt/smooth" } }, "result": { diff --git a/src/main/resources/data/mineralogy/recipes/basalt_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_slab.json index bd04f195c..e8e51a7d7 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_slab.json @@ -11,7 +11,7 @@ ], "key": { "x": { - "item": "mineralogy:basalt" + "tag": "mineralogy:stones/basalt" } }, "result": { diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth.json index 877de7157..5a4a0dbf8 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth.json @@ -8,7 +8,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:stones/basalt" + "item": "mineralogy:basalt" }, { "item": "minecraft:sand" diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json index 6c65e6072..5a8bb3725 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json @@ -11,7 +11,7 @@ ], "key": { "x": { - "item": "mineralogy:basalt_smooth" + "tag": "mineralogy:stones/basalt/smooth" } }, "result": { diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json index 4bb9b167e..e4b2c2e8b 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json @@ -13,7 +13,7 @@ ], "key": { "x": { - "item": "mineralogy:diorite_smooth" + "tag": "mineralogy:stones/diorite/smooth" } }, "result": { diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth.json index e982dc9e9..a4bb2c4c8 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth.json @@ -8,7 +8,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:stones/diorite" + "item": "mineralogy:diorite" }, { "item": "minecraft:sand" diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json index d4565244f..716133e77 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json @@ -13,7 +13,7 @@ ], "key": { "x": { - "tag": "mineralogy:stones/diorite/smooth" + "item": "mineralogy:diorite_smooth" } }, "result": { diff --git a/src/main/resources/data/mineralogy/recipes/diorite_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_stairs.json index cff9b0256..e230a2887 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_stairs.json @@ -13,7 +13,7 @@ ], "key": { "x": { - "tag": "mineralogy:stones/diorite" + "item": "mineralogy:diorite" } }, "result": { diff --git a/src/main/resources/data/mineralogy/recipes/diorite_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_wall.json index 69df6abe9..923e6efb5 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_wall.json @@ -12,7 +12,7 @@ ], "key": { "x": { - "tag": "mineralogy:stones/diorite" + "item": "mineralogy:diorite" } }, "result": { diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json index 1f0e113a2..ee649fca8 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json @@ -13,7 +13,7 @@ ], "key": { "x": { - "item": "mineralogy:granite_smooth" + "tag": "mineralogy:stones/granite/smooth" } }, "result": { diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth.json b/src/main/resources/data/mineralogy/recipes/granite_smooth.json index 2cafcc7e6..83dc8e8ac 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth.json @@ -8,7 +8,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "mineralogy:stones/granite" + "item": "mineralogy:granite" }, { "item": "minecraft:sand" diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json index 885a1003a..75b0e4914 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json @@ -13,7 +13,7 @@ ], "key": { "x": { - "tag": "mineralogy:stones/granite/smooth" + "item": "mineralogy:granite_smooth" } }, "result": { diff --git a/src/main/resources/data/mineralogy/recipes/granite_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_stairs.json index 4c2120e34..92ec7cbd4 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_stairs.json @@ -13,7 +13,7 @@ ], "key": { "x": { - "tag": "mineralogy:stones/granite" + "item": "mineralogy:granite" } }, "result": { diff --git a/src/main/resources/data/mineralogy/recipes/granite_wall.json b/src/main/resources/data/mineralogy/recipes/granite_wall.json index 5f2a48548..22e5facb4 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_wall.json @@ -12,7 +12,7 @@ ], "key": { "x": { - "tag": "mineralogy:stones/granite" + "item": "mineralogy:granite" } }, "result": { diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/andesite.json b/src/main/resources/data/mineralogy/tags/items/slabs/andesite.json index 92016734b..a2dad5cbb 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/andesite.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/andesite.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:andesite_slab" + "mineralogy:andesite_slab", + "minecraft:andesite_slab" ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json index 9ff263d85..a2cc3c4d9 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:andesite_smooth_slab" + "mineralogy:andesite_smooth_slab", + "minecraft:polished_andesite_slab" ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diorite.json b/src/main/resources/data/mineralogy/tags/items/slabs/diorite.json index 950f6f4eb..a788d9f5c 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/diorite.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diorite.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:diorite_slab" + "mineralogy:diorite_slab", + "minecraft:diorite_slab" ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json index 19bd10112..c9121aee1 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:diorite_smooth_slab" + "mineralogy:diorite_smooth_slab", + "minecraft:polished_diorite_slab" ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/granite.json b/src/main/resources/data/mineralogy/tags/items/slabs/granite.json index 5d2bbe225..b8277bc3c 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/granite.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/granite.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:granite_slab" + "mineralogy:granite_slab", + "minecraft:granite_slab" ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json index a4041ac03..a3f8a1a3f 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:granite_smooth_slab" + "mineralogy:granite_smooth_slab", + "minecraft:polished_granite_slab" ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/andesite.json b/src/main/resources/data/mineralogy/tags/items/stones/andesite.json index 10d034db6..0680f2507 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/andesite.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/andesite.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:andesite" + "mineralogy:andesite", + "minecraft:andesite" ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json index 268914cf2..66bc8782f 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:andesite_smooth" + "mineralogy:andesite_smooth", + "minecraft:polished_andesite" ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basalt.json b/src/main/resources/data/mineralogy/tags/items/stones/basalt.json index 948bf4614..e0e10bf52 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/basalt.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/basalt.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:basalt" + "mineralogy:basalt", + "minecraft:basalt" ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json index 3f4e8ba44..ee0c0c15b 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:basalt_smooth" + "mineralogy:basalt_smooth", + "minecraft:polished_basalt" ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diorite.json b/src/main/resources/data/mineralogy/tags/items/stones/diorite.json index 58bfa2c7b..8d8329944 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/diorite.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/diorite.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:diorite" + "mineralogy:diorite", + "minecraft:diorite" ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json index b06acd392..1e9107888 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:diorite_smooth" + "mineralogy:diorite_smooth", + "minecraft:polished_diorite" ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/granite.json b/src/main/resources/data/mineralogy/tags/items/stones/granite.json index 587b69c7b..817e7c5da 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/granite.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/granite.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:granite" + "mineralogy:granite", + "minecraft:granite" ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json index b4ef84e85..8c7cecd8a 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "mineralogy:granite_smooth" + "mineralogy:granite_smooth", + "minecraft:polished_granite" ] } diff --git a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java index c66915417..692dbdabf 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java @@ -84,10 +84,10 @@ public void everyRecipeHasAProgressiveAdvancement() throws Exception { JsonObject smooth = json(new File(advancementDir, "basalt_smooth.json")); assertEquals("mineralogy:basalt", criterionItem(smooth, "has_rock")); assertTrue(smooth.getAsJsonObject("criteria").has("has_sand")); - JsonObject stairs = json(new File(advancementDir, "basalt_smooth_stairs.json")); - assertEquals("mineralogy:basalt_smooth", criterionItem(stairs, "has_rock")); - JsonObject blank = json(new File(advancementDir, "basalt_relief_blank.json")); - assertEquals("mineralogy:basalt_smooth", criterionItem(blank, "has_rock")); + assertAdvancementIngredient("basalt_smooth_stairs", "tag", + "mineralogy:stones/basalt/smooth"); + assertAdvancementIngredient("basalt_relief_blank", "tag", + "mineralogy:stones/basalt/smooth"); JsonObject marked = json(new File(advancementDir, "basalt_relief_pickaxe.json")); assertEquals("mineralogy:basalt_relief_blank", criterionItem(marked, "has_rock")); JsonObject right = json(new File(advancementDir, "basalt_relief_right.json")); @@ -106,9 +106,8 @@ public void rockFurnacesUnlockFromTheirMatchingSlabs() throws Exception { JsonObject criteria = advancement.getAsJsonObject("criteria"); assertTrue(file.getName(), criteria.has("has_rock")); assertFalse(file.getName(), criteria.has("has_furnace")); - String expectedSlab = "mineralogy:" - + stripJson(file.getName()).replaceFirst("_furnace$", "_slab"); - assertEquals(file.getName(), expectedSlab, criterionItem(advancement, "has_rock")); + String expectedSlabTag = expectedSlabTag(stripJson(file.getName())); + assertAdvancementIngredient(stripJson(file.getName()), "tag", expectedSlabTag); JsonArray requirements = advancement.getAsJsonArray("requirements"); assertEquals(file.getName(), 1, requirements.size()); @@ -119,6 +118,88 @@ public void rockFurnacesUnlockFromTheirMatchingSlabs() throws Exception { } } + @Test + public void nativeRockAliasesDriveRecipesAndAdvancementsWithoutStealingVanillaForms() throws Exception { + File tags = new File(ROOT, "data/mineralogy/tags/items"); + for (String family : Arrays.asList("andesite", "basalt", "diorite", "granite")) { + assertTagValues(new File(tags, "stones/" + family + ".json"), + "mineralogy:" + family, "minecraft:" + family); + assertTagValues(new File(tags, "stones/" + family + "/smooth.json"), + "mineralogy:" + family + "_smooth", "minecraft:polished_" + family); + } + for (String family : Arrays.asList("andesite", "diorite", "granite")) { + assertTagValues(new File(tags, "slabs/" + family + ".json"), + "mineralogy:" + family + "_slab", "minecraft:" + family + "_slab"); + assertTagValues(new File(tags, "slabs/" + family + "/smooth.json"), + "mineralogy:" + family + "_smooth_slab", + "minecraft:polished_" + family + "_slab"); + } + assertTagValues(new File(tags, "slabs/basalt.json"), "mineralogy:basalt_slab"); + assertTagValues(new File(tags, "slabs/basalt/smooth.json"), + "mineralogy:basalt_smooth_slab"); + + assertRecipeIngredient("basalt_slab", "tag", "mineralogy:stones/basalt"); + assertRecipeIngredient("basalt_stairs", "tag", "mineralogy:stones/basalt"); + assertRecipeIngredient("basalt_wall", "tag", "mineralogy:stones/basalt"); + assertRecipeIngredient("basalt_smooth_slab", "tag", "mineralogy:stones/basalt/smooth"); + assertRecipeIngredient("basalt_smooth_stairs", "tag", "mineralogy:stones/basalt/smooth"); + assertRecipeIngredient("basalt_smooth_wall", "tag", "mineralogy:stones/basalt/smooth"); + + for (String family : Arrays.asList("andesite", "diorite", "granite")) { + assertRecipeIngredient(family + "_slab", "item", "mineralogy:" + family); + assertRecipeIngredient(family + "_stairs", "item", "mineralogy:" + family); + assertRecipeIngredient(family + "_wall", "item", "mineralogy:" + family); + assertRecipeIngredient(family + "_smooth_slab", "item", + "mineralogy:" + family + "_smooth"); + assertRecipeIngredient(family + "_smooth_stairs", "item", + "mineralogy:" + family + "_smooth"); + assertRecipeIngredient(family + "_smooth_wall", "tag", + "mineralogy:stones/" + family + "/smooth"); + } + for (String family : Arrays.asList("andesite", "basalt", "diorite", "granite")) { + assertRecipeIngredient(family + "_brick", "tag", "mineralogy:stones/" + family); + assertAdvancementIngredient(family + "_brick", "tag", "mineralogy:stones/" + family); + assertRecipeIngredient(family + "_smooth", "item", "mineralogy:" + family); + assertAdvancementIngredient(family + "_smooth", "item", "mineralogy:" + family); + assertAdvancementIngredient(family + "_relief_blank", "tag", + "mineralogy:stones/" + family + "/smooth"); + + JsonObject vanillaPolished = json(new File(ROOT, + "data/minecraft/recipes/polished_" + family + ".json")); + assertEquals("minecraft:crafting_shapeless", + vanillaPolished.get("type").getAsString()); + assertEquals("minecraft:" + family, vanillaPolished.getAsJsonArray("ingredients") + .get(0).getAsJsonObject().get("item").getAsString()); + assertEquals("minecraft:sand", vanillaPolished.getAsJsonArray("ingredients") + .get(1).getAsJsonObject().get("item").getAsString()); + assertEquals("minecraft:polished_" + family, vanillaPolished + .getAsJsonObject("result").get("item").getAsString()); + assertEquals(1, vanillaPolished.getAsJsonObject("result").get("count").getAsInt()); + + JsonObject nativeAdvancement = json(new File(ROOT, + "data/minecraft/advancements/recipes/building_blocks/polished_" + + family + ".json")); + assertEquals("minecraft:" + family, nativeAdvancement.getAsJsonObject("criteria") + .getAsJsonObject("has_rock").getAsJsonObject("conditions") + .getAsJsonArray("items").get(0).getAsJsonObject().get("item").getAsString()); + assertEquals("minecraft:sand", nativeAdvancement.getAsJsonObject("criteria") + .getAsJsonObject("has_sand").getAsJsonObject("conditions") + .getAsJsonArray("items").get(0).getAsJsonObject().get("item").getAsString()); + assertEquals(2, nativeAdvancement.getAsJsonArray("requirements").size()); + } + + assertAdvancementIngredient("basalt_slab", "tag", "mineralogy:stones/basalt"); + assertAdvancementIngredient("andesite_slab", "item", "mineralogy:andesite"); + assertAdvancementIngredient("andesite_furnace", "tag", "mineralogy:slabs/andesite"); + + String allResources = new String(Files.readAllBytes( + new File(tags, "slabs/basalt.json").toPath()), StandardCharsets.UTF_8) + + new String(Files.readAllBytes( + new File(tags, "slabs/basalt/smooth.json").toPath()), StandardCharsets.UTF_8); + assertFalse(allResources.contains("minecraft:basalt_slab")); + assertFalse(allResources.contains("minecraft:polished_basalt_slab")); + } + @Test public void acceptedRecipeDetailsArePresent() throws Exception { File recipes = new File(ROOT, "data/mineralogy/recipes"); @@ -132,8 +213,8 @@ public void acceptedRecipeDetailsArePresent() throws Exception { assertGunpowderRecipe(recipes, "gunpowder_from_charcoal", null); assertGunpowderRecipe(recipes, "gunpowder_from_carbon_dust", "forge:dusts/carbon"); assertGunpowderRecipe(recipes, "gunpowder_from_coal_dust", "forge:dusts/coal"); - assertEquals("mineralogy:basalt", json(new File(recipes, "basalt_slab.json")) - .getAsJsonObject("key").getAsJsonObject("x").get("item").getAsString()); + assertEquals("mineralogy:stones/basalt", json(new File(recipes, "basalt_slab.json")) + .getAsJsonObject("key").getAsJsonObject("x").get("tag").getAsString()); assertEquals("mineralogy:basalt", json(new File(recipes, "basalt_raw_slab_recombination.json")) .getAsJsonObject("result").get("item").getAsString()); assertEquals("forge:sand", json(new File(recipes, "basalt_brick_block_polishing.json")) @@ -221,8 +302,12 @@ public void forge36ResourcesRetainNativeWallsTagsAndPackFormat() throws Exceptio File minecraftRecipes = new File(ROOT, "data/minecraft/recipes"); File[] overrides = minecraftRecipes.listFiles((dir, name) -> name.endsWith(".json")); assertNotNull(overrides); - assertEquals(1, overrides.length); - assertEquals("furnace.json", overrides[0].getName()); + assertEquals(5, overrides.length); + Set overrideNames = new HashSet(); + for (File override : overrides) overrideNames.add(override.getName()); + assertEquals(new HashSet(Arrays.asList("furnace.json", + "polished_andesite.json", "polished_basalt.json", + "polished_diorite.json", "polished_granite.json")), overrideNames); File[] stonecutting = new File(ROOT, "data/mineralogy/recipes") .listFiles((dir, name) -> name.contains("stonecutting")); assertNotNull(stonecutting); @@ -268,6 +353,48 @@ private static String criterionItem(JsonObject advancement, String criterion) { .getAsJsonObject().get("item").getAsString(); } + private static String expectedSlabTag(String furnaceRecipe) { + String stem = furnaceRecipe.replaceFirst("_furnace$", ""); + for (String finish : Arrays.asList("smooth_brick", "smooth", "brick")) { + String suffix = "_" + finish; + if (stem.endsWith(suffix)) { + return "mineralogy:slabs/" + stem.substring(0, stem.length() - suffix.length()) + + "/" + finish; + } + } + return "mineralogy:slabs/" + stem; + } + + private static void assertTagValues(File file, String... expected) throws Exception { + JsonArray values = json(file).getAsJsonArray("values"); + assertEquals(file.getPath(), expected.length, values.size()); + for (int index = 0; index < expected.length; index++) { + assertEquals(file.getPath(), expected[index], values.get(index).getAsString()); + } + } + + private static void assertRecipeIngredient(String recipeName, String key, String value) + throws Exception { + JsonObject recipe = json(new File(ROOT, + "data/mineralogy/recipes/" + recipeName + ".json")); + JsonObject ingredient = recipe.has("key") + ? recipe.getAsJsonObject("key").getAsJsonObject("x") + : recipe.getAsJsonArray("ingredients").get(0).getAsJsonObject(); + assertEquals(recipeName, value, ingredient.get(key).getAsString()); + assertEquals(recipeName, 1, ingredient.size()); + } + + private static void assertAdvancementIngredient(String recipeName, String key, String value) + throws Exception { + JsonObject advancement = json(new File(ROOT, + "data/mineralogy/advancements/recipes/" + recipeName + ".json")); + JsonObject ingredient = advancement.getAsJsonObject("criteria") + .getAsJsonObject("has_rock").getAsJsonObject("conditions") + .getAsJsonArray("items").get(0).getAsJsonObject(); + assertEquals(recipeName, value, ingredient.get(key).getAsString()); + assertEquals(recipeName, 1, ingredient.size()); + } + private static JsonObject json(File file) throws Exception { try (java.io.Reader reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { return new JsonParser().parse(reader).getAsJsonObject(); From 36cd877ff17725f8540903018637b6c6df3b6dc5 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 27 Aug 2026 16:36:48 +0100 Subject: [PATCH 06/10] Complete native slab and cobblestone recipe compatibility --- CHANGELOG.txt | 28 +- build.gradle | 95 +++++- scripts/generate-recipes.ps1 | 287 +++++++++++++++++- .../mc/mineralogy/MineralogyConfig.java | 1 + .../compat/CobblestoneTagPolicy.java | 26 +- .../recipes/brewing/brewing_stand.json | 87 ++++++ .../recipes/building_blocks/andesite.json | 87 ++++++ .../recipes/building_blocks/diorite.json | 87 ++++++ .../building_blocks/mossy_cobblestone.json | 87 ++++++ .../recipes/combat/stone_sword.json | 87 ++++++ .../recipes/decorations/furnace.json | 87 ++++++ .../recipes/redstone/dispenser.json | 87 ++++++ .../recipes/redstone/dropper.json | 87 ++++++ .../advancements/recipes/redstone/lever.json | 87 ++++++ .../recipes/redstone/observer.json | 87 ++++++ .../advancements/recipes/redstone/piston.json | 87 ++++++ .../advancements/recipes/tools/stone_axe.json | 87 ++++++ .../advancements/recipes/tools/stone_hoe.json | 87 ++++++ .../recipes/tools/stone_pickaxe.json | 87 ++++++ .../recipes/tools/stone_shovel.json | 87 ++++++ .../data/minecraft/recipes/andesite.json | 54 ++++ .../data/minecraft/recipes/andesite_slab.json | 54 ++++ ...esite_slab_from_andesite_stonecutting.json | 40 +++ .../data/minecraft/recipes/brewing_stand.json | 60 ++++ .../data/minecraft/recipes/diorite.json | 62 ++++ .../data/minecraft/recipes/diorite_slab.json | 54 ++++ ...iorite_slab_from_diorite_stonecutting.json | 40 +++ .../data/minecraft/recipes/dispenser.json | 68 +++++ .../data/minecraft/recipes/dropper.json | 62 ++++ .../data/minecraft/recipes/furnace.json | 66 +++- .../data/minecraft/recipes/granite_slab.json | 54 ++++ ...ranite_slab_from_granite_stonecutting.json | 40 +++ .../data/minecraft/recipes/lever.json | 60 ++++ .../minecraft/recipes/mossy_cobblestone.json | 52 ++++ .../data/minecraft/recipes/observer.json | 68 +++++ .../data/minecraft/recipes/piston.json | 74 +++++ .../recipes/polished_andesite_slab.json | 54 ++++ ...esite_slab_from_andesite_stonecutting.json | 40 +++ ...b_from_polished_andesite_stonecutting.json | 40 +++ .../recipes/polished_diorite_slab.json | 54 ++++ ...iorite_slab_from_diorite_stonecutting.json | 40 +++ ...ab_from_polished_diorite_stonecutting.json | 40 +++ .../recipes/polished_granite_slab.json | 54 ++++ ...ranite_slab_from_granite_stonecutting.json | 40 +++ ...ab_from_polished_granite_stonecutting.json | 40 +++ .../data/minecraft/recipes/stone_axe.json | 62 ++++ .../data/minecraft/recipes/stone_hoe.json | 62 ++++ .../data/minecraft/recipes/stone_pickaxe.json | 62 ++++ .../data/minecraft/recipes/stone_shovel.json | 62 ++++ .../data/minecraft/recipes/stone_sword.json | 62 ++++ .../tags/blocks/stones/amphibolite.json | 6 + .../tags/blocks/stones/andesite.json | 7 + .../mineralogy/tags/blocks/stones/basalt.json | 7 + .../tags/blocks/stones/basaltic_glass.json | 6 + .../tags/blocks/stones/conglomerate.json | 6 + .../tags/blocks/stones/diabase.json | 6 + .../tags/blocks/stones/diorite.json | 7 + .../tags/blocks/stones/dolomite.json | 6 + .../mineralogy/tags/blocks/stones/gabbro.json | 6 + .../mineralogy/tags/blocks/stones/gneiss.json | 6 + .../tags/blocks/stones/granite.json | 7 + .../tags/blocks/stones/hornfels.json | 6 + .../tags/blocks/stones/limestone.json | 6 + .../mineralogy/tags/blocks/stones/marble.json | 6 + .../tags/blocks/stones/novaculite.json | 6 + .../tags/blocks/stones/pegmatite.json | 6 + .../tags/blocks/stones/peridotite.json | 6 + .../tags/blocks/stones/phyllite.json | 6 + .../tags/blocks/stones/quartzite.json | 6 + .../tags/blocks/stones/rhyolite.json | 6 + .../tags/blocks/stones/rock_salt.json | 6 + .../mineralogy/tags/blocks/stones/schist.json | 6 + .../mineralogy/tags/blocks/stones/scoria.json | 6 + .../mineralogy/tags/blocks/stones/shale.json | 6 + .../tags/blocks/stones/siltstone.json | 6 + .../mineralogy/tags/blocks/stones/slate.json | 6 + .../mineralogy/tags/blocks/stones/tuff.json | 6 + .../tags/items/cobblestone_equivalents.json | 33 ++ .../tags/items/stone_crafting_materials.json | 33 ++ .../tags/items/stone_tool_materials.json | 33 ++ .../mc/mineralogy/GameplayContractTest.java | 4 + .../mineralogy/NativeRecipeManagerTest.java | 233 ++++++++++++++ .../mc/mineralogy/ResourceContractTest.java | 200 +++++++++++- 83 files changed, 4009 insertions(+), 55 deletions(-) create mode 100644 src/main/resources/data/minecraft/advancements/recipes/brewing/brewing_stand.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/building_blocks/andesite.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/building_blocks/diorite.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/combat/stone_sword.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/tools/stone_axe.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/tools/stone_hoe.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/tools/stone_pickaxe.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/tools/stone_shovel.json create mode 100644 src/main/resources/data/minecraft/recipes/andesite.json create mode 100644 src/main/resources/data/minecraft/recipes/andesite_slab.json create mode 100644 src/main/resources/data/minecraft/recipes/andesite_slab_from_andesite_stonecutting.json create mode 100644 src/main/resources/data/minecraft/recipes/brewing_stand.json create mode 100644 src/main/resources/data/minecraft/recipes/diorite.json create mode 100644 src/main/resources/data/minecraft/recipes/diorite_slab.json create mode 100644 src/main/resources/data/minecraft/recipes/diorite_slab_from_diorite_stonecutting.json create mode 100644 src/main/resources/data/minecraft/recipes/dispenser.json create mode 100644 src/main/resources/data/minecraft/recipes/dropper.json create mode 100644 src/main/resources/data/minecraft/recipes/granite_slab.json create mode 100644 src/main/resources/data/minecraft/recipes/granite_slab_from_granite_stonecutting.json create mode 100644 src/main/resources/data/minecraft/recipes/lever.json create mode 100644 src/main/resources/data/minecraft/recipes/mossy_cobblestone.json create mode 100644 src/main/resources/data/minecraft/recipes/observer.json create mode 100644 src/main/resources/data/minecraft/recipes/piston.json create mode 100644 src/main/resources/data/minecraft/recipes/polished_andesite_slab.json create mode 100644 src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_andesite_stonecutting.json create mode 100644 src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_polished_andesite_stonecutting.json create mode 100644 src/main/resources/data/minecraft/recipes/polished_diorite_slab.json create mode 100644 src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_diorite_stonecutting.json create mode 100644 src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_polished_diorite_stonecutting.json create mode 100644 src/main/resources/data/minecraft/recipes/polished_granite_slab.json create mode 100644 src/main/resources/data/minecraft/recipes/polished_granite_slab_from_granite_stonecutting.json create mode 100644 src/main/resources/data/minecraft/recipes/polished_granite_slab_from_polished_granite_stonecutting.json create mode 100644 src/main/resources/data/minecraft/recipes/stone_axe.json create mode 100644 src/main/resources/data/minecraft/recipes/stone_hoe.json create mode 100644 src/main/resources/data/minecraft/recipes/stone_pickaxe.json create mode 100644 src/main/resources/data/minecraft/recipes/stone_shovel.json create mode 100644 src/main/resources/data/minecraft/recipes/stone_sword.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/amphibolite.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/andesite.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/basalt.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/basaltic_glass.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/conglomerate.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/diabase.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/diorite.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/dolomite.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/gabbro.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/gneiss.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/granite.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/hornfels.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/limestone.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/marble.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/novaculite.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/pegmatite.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/peridotite.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/phyllite.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/quartzite.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/rhyolite.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/rock_salt.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/schist.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/scoria.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/shale.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/siltstone.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/slate.json create mode 100644 src/main/resources/data/mineralogy/tags/blocks/stones/tuff.json create mode 100644 src/main/resources/data/mineralogy/tags/items/cobblestone_equivalents.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stone_crafting_materials.json create mode 100644 src/main/resources/data/mineralogy/tags/items/stone_tool_materials.json create mode 100644 src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 41afed646..3efd32759 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -20,9 +20,10 @@ Mineralogy 6.0.1.116051 for Minecraft 1.16.5 - Preserved vertically mounted legacy rock-salt lamps on torch-supporting blocks such as fences during pre-flattening world conversion. - Made the historical `COBBLESTONE_EQUIVILENT` option functional through - target-native block and item tags, reapplied after data reloads by updating - the exact immutable tag objects retained by already-parsed Forge 36 recipe - ingredients. Chert and pumice remain unconditional cobblestone equivalents. + target-native per-family block and item tags, including vanilla aliases, + reapplied after data reloads by updating the exact immutable tag objects + retained by already-parsed Forge 36 recipe ingredients. Chert and pumice + remain unconditional cobblestone equivalents. - Added isolated Mineralogy crude-oil source and flowing fluids, block, bucket, rendering resources, and the covered Ocean deposit declaration. - Uses Minecraft 1.16's native basalt for new OreSpawn terrain while retaining @@ -41,15 +42,20 @@ Mineralogy 6.0.1.116051 for Minecraft 1.16.5 their retained Mineralogy world-compatibility blocks. Native blocks now unlock and feed every non-conflicting matching Mineralogy recipe. The four vanilla 2x2 polished-block recipes are replaced by block-plus-sand routes so - the 2x2 recipes remain available for Mineralogy bricks; matching vanilla - slabs/stairs/walls keep their native recipes, and recipe advancements use the - same exact item or family tag as the recipe they reveal. + the 2x2 recipes remain available for Mineralogy bricks. The six shared + andesite, diorite and granite slab recipes plus all nine matching stonecutter + routes now produce Mineralogy's more capable slabs, while the vanilla slabs + remain registered and tag-compatible. Recipe advancements use the same exact + item or family tag as the recipe they reveal. - Extended Minecraft 1.16's native stone crafting and tool-material tags so - every enabled Forge cobblestone equivalent, including all 27 Mineralogy rock - families, works in vanilla tools. The vanilla furnace recipe is also - data-overridden to consume the live `forge:cobblestone` tag; both it and the - nested vanilla crafting/tool tags now observe the configured membership. - Matching-slab rock-furnace upgrades remain distinct. + every enabled cobblestone equivalent, including all 27 legacy rock families + and target-native aliases, works in the complete vanilla contract. Fifteen + conditional JSON overrides cover furnaces, brewing stands, redstone and + conversion recipes, and all stone tools without changing their IDs, + patterns, outputs or other ingredients. Disabled mode restores the native + ingredients and keeps blackstone, chert and pumice valid. Matching-slab + rock-furnace upgrades and vanilla cobblestone construction recipes remain + distinct. - Prevented Forge 36 from silently reducing optional carbon- or coal-dust gunpowder recipes to nitrate plus sulfur when their compatibility tag is empty; every loaded gunpowder recipe now requires all three components. diff --git a/build.gradle b/build.gradle index 600b91ec8..7a87e25e5 100644 --- a/build.gradle +++ b/build.gradle @@ -484,26 +484,89 @@ tasks.register('verifyReleaseArtifacts') { throw new GradleException("Release jar must contain 1415 recipes and advancements, found ${recipes.size()} and ${advancements.size()}") } def minecraftRecipes = names.findAll { it.startsWith('data/minecraft/recipes/') && it.endsWith('.json') } - def expectedMinecraftRecipes = [ - 'data/minecraft/recipes/furnace.json', - 'data/minecraft/recipes/polished_andesite.json', - 'data/minecraft/recipes/polished_basalt.json', - 'data/minecraft/recipes/polished_diorite.json', - 'data/minecraft/recipes/polished_granite.json' - ] as Set - if ((minecraftRecipes as Set) != expectedMinecraftRecipes || - names.any { it.contains('/stonecutting/') }) { - throw new GradleException('Release jar must contain only the required furnace/polished-block overrides and no stonecutting recipes') - } - def expectedMinecraftAdvancements = ['andesite', 'basalt', 'diorite', 'granite'].collect { - "data/minecraft/advancements/recipes/building_blocks/polished_${it}.json" + def cobblestoneOverrides = ['furnace', 'brewing_stand', 'lever', 'piston', + 'dispenser', 'dropper', 'observer', 'mossy_cobblestone', 'andesite', + 'diorite', 'stone_axe', 'stone_hoe', 'stone_pickaxe', 'stone_shovel', + 'stone_sword'] + def slabOverrides = ['andesite', 'diorite', 'granite'].collectMany { family -> + ["${family}_slab", "polished_${family}_slab", + "${family}_slab_from_${family}_stonecutting", + "polished_${family}_slab_from_${family}_stonecutting", + "polished_${family}_slab_from_polished_${family}_stonecutting"] + } + def polishedOverrides = ['andesite', 'basalt', 'diorite', 'granite'].collect { + "polished_${it}" + } + def expectedMinecraftRecipes = (cobblestoneOverrides + slabOverrides + polishedOverrides).collect { + "data/minecraft/recipes/${it}.json" + } as Set + if ((minecraftRecipes as Set) != expectedMinecraftRecipes || minecraftRecipes.size() != 34) { + throw new GradleException('Release jar must contain exactly 15 cobblestone, 15 slab, and four polished-block recipe overrides') + } + cobblestoneOverrides.each { recipe -> + def data = new JsonSlurper().parse(zip.getInputStream(zip.getEntry("data/minecraft/recipes/${recipe}.json"))) + if (data.type != 'forge:conditional' || data.recipes?.size() != 2 || + data.recipes[0].conditions?.getAt(0)?.type != 'mineralogy:config' || + data.recipes[0].conditions?.getAt(0)?.flag != 'COBBLESTONE_EQUIVILENT' || + data.recipes[1].conditions?.getAt(0)?.type != 'forge:not') { + throw new GradleException("Invalid conditional cobblestone override: ${recipe}") + } + } + slabOverrides.each { recipe -> + def data = new JsonSlurper().parse(zip.getInputStream(zip.getEntry("data/minecraft/recipes/${recipe}.json"))) + if (data.type != 'forge:conditional' || data.recipes?.size() != 2 || + data.recipes[0].conditions?.getAt(0)?.type != 'forge:item_exists' || + data.recipes[1].conditions?.getAt(0)?.type != 'forge:not') { + throw new GradleException("Invalid conditional Mineralogy slab override: ${recipe}") + } + } + def families = ['andesite', 'basalt', 'diorite', 'granite', 'rhyolite', + 'pegmatite', 'diabase', 'gabbro', 'peridotite', 'basaltic_glass', + 'scoria', 'tuff', 'shale', 'conglomerate', 'dolomite', 'limestone', + 'siltstone', 'marble', 'slate', 'schist', 'gneiss', 'phyllite', + 'amphibolite', 'hornfels', 'quartzite', 'novaculite', 'rock_salt'] + def unionTags = [ + cobblestone_equivalents: '#forge:cobblestone', + stone_crafting_materials: '#minecraft:stone_crafting_materials', + stone_tool_materials: '#minecraft:stone_tool_materials' + ] + unionTags.each { tag, base -> + def entry = zip.getEntry("data/mineralogy/tags/items/${tag}.json") + def values = entry == null ? [] : new JsonSlurper().parse(zip.getInputStream(entry)).values + def expected = [base] + families.collect { "#mineralogy:stones/${it}" } + if (values != expected) throw new GradleException("Invalid Mineralogy recipe union tag: ${tag}") + } + if (!families.every { names.contains("data/mineralogy/tags/blocks/stones/${it}.json".toString()) }) { + throw new GradleException('Release jar must contain all 27 raw-rock family block tags') + } + def advancementCategories = [ + furnace: 'decorations', brewing_stand: 'brewing', lever: 'redstone', + piston: 'redstone', dispenser: 'redstone', dropper: 'redstone', + observer: 'redstone', mossy_cobblestone: 'building_blocks', + andesite: 'building_blocks', diorite: 'building_blocks', + stone_axe: 'tools', stone_hoe: 'tools', stone_pickaxe: 'tools', + stone_shovel: 'tools', stone_sword: 'combat' + ] + def expectedMinecraftAdvancements = advancementCategories.collect { recipe, category -> + "data/minecraft/advancements/recipes/${category}/${recipe}.json" } as Set + expectedMinecraftAdvancements.addAll(['andesite', 'basalt', 'diorite', 'granite'].collect { + "data/minecraft/advancements/recipes/building_blocks/polished_${it}.json" + }) def minecraftAdvancements = names.findAll { - it.startsWith('data/minecraft/advancements/recipes/building_blocks/polished_') && - it.endsWith('.json') + it.startsWith('data/minecraft/advancements/recipes/') && it.endsWith('.json') } as Set if (minecraftAdvancements != expectedMinecraftAdvancements) { - throw new GradleException('Release jar must contain the four native polished-block advancement overrides') + throw new GradleException('Release jar must contain exactly 15 cobblestone and four polished-block advancement overrides') + } + advancementCategories.each { recipe, category -> + def data = new JsonSlurper().parse(zip.getInputStream(zip.getEntry( + "data/minecraft/advancements/recipes/${category}/${recipe}.json"))) + if (data.advancements?.size() != 2 || + data.advancements[0].conditions?.getAt(0)?.type != 'mineralogy:config' || + data.advancements[1].conditions?.getAt(0)?.type != 'forge:not') { + throw new GradleException("Invalid conditional advancement override: ${recipe}") + } } def wallBlockstates = names.findAll { it ==~ /assets\/mineralogy\/blockstates\/.+_wall\.json/ } def tallWallModels = names.findAll { it ==~ /assets\/mineralogy\/models\/block\/.+_wall_side_tall\.json/ } diff --git a/scripts/generate-recipes.ps1 b/scripts/generate-recipes.ps1 index 57e2f22a0..4bc6277af 100644 --- a/scripts/generate-recipes.ps1 +++ b/scripts/generate-recipes.ps1 @@ -7,8 +7,9 @@ $projectRoot = Split-Path -Parent $PSScriptRoot $recipeRoot = Join-Path $projectRoot 'src\main\resources\data\mineralogy\recipes' $advancementRoot = Join-Path $projectRoot 'src\main\resources\data\mineralogy\advancements\recipes' $minecraftRecipeRoot = Join-Path $projectRoot 'src\main\resources\data\minecraft\recipes' -$minecraftBuildingAdvancementRoot = Join-Path $projectRoot 'src\main\resources\data\minecraft\advancements\recipes\building_blocks' +$minecraftAdvancementRoot = Join-Path $projectRoot 'src\main\resources\data\minecraft\advancements\recipes' $itemTagRoot = Join-Path $projectRoot 'src\main\resources\data\mineralogy\tags\items' +$blockTagRoot = Join-Path $projectRoot 'src\main\resources\data\mineralogy\tags\blocks' $utf8NoBom = New-Object System.Text.UTF8Encoding($false) $generatedNames = New-Object 'System.Collections.Generic.HashSet[string]' $unlockSources = @{} @@ -63,6 +64,10 @@ function ConfigCondition([string] $flag) { return [ordered]@{ type = 'mineralogy:config'; flag = $flag } } +function NotCondition([System.Collections.IDictionary] $condition) { + return [ordered]@{ type = 'forge:not'; value = $condition } +} + function ItemTagNotEmptyCondition([string] $tag) { return [ordered]@{ type = 'forge:not' @@ -124,6 +129,66 @@ function RecipeResult([string] $item, [int] $count) { return [ordered]@{ item = $item; count = $count } } +function VanillaResult([string] $item, [int] $count = 1) { + $result = [ordered]@{ item = $item } + if ($count -ne 1) { $result.count = $count } + return $result +} + +function VanillaShapedRecipe( + [string[]] $pattern, + [System.Collections.IDictionary] $key, + [string] $result, + [int] $count = 1 +) { + return [ordered]@{ + type = 'minecraft:crafting_shaped' + pattern = $pattern + key = $key + result = VanillaResult $result $count + } +} + +function VanillaShapelessRecipe( + [object[]] $ingredients, + [string] $result, + [int] $count = 1 +) { + return [ordered]@{ + type = 'minecraft:crafting_shapeless' + ingredients = $ingredients + result = VanillaResult $result $count + } +} + +function VanillaStonecuttingRecipe( + [object] $ingredient, + [string] $result, + [int] $count +) { + return [ordered]@{ + type = 'minecraft:stonecutting' + ingredient = $ingredient + result = $result + count = $count + } +} + +function Write-ConditionalMinecraftRecipe( + [string] $name, + [System.Collections.IDictionary] $condition, + [System.Collections.IDictionary] $enabledRecipe, + [System.Collections.IDictionary] $fallbackRecipe +) { + Write-Json (Join-Path $minecraftRecipeRoot "$name.json") ([ordered]@{ + type = 'forge:conditional' + recipes = @( + [ordered]@{ conditions = @($condition); recipe = $enabledRecipe }, + [ordered]@{ conditions = @((NotCondition $condition)); recipe = $fallbackRecipe } + ) + }) +} + function ConditionsFor([string] $result, [object[]] $extra = @()) { return @($extra) + @((ItemCondition $result)) } @@ -714,6 +779,8 @@ function Synchronize-AdvancementConditions() { function Prepare-TargetDirectories() { New-Item -ItemType Directory -Force -Path $recipeRoot | Out-Null New-Item -ItemType Directory -Force -Path $advancementRoot | Out-Null + New-Item -ItemType Directory -Force -Path $minecraftRecipeRoot | Out-Null + New-Item -ItemType Directory -Force -Path $minecraftAdvancementRoot | Out-Null foreach ($file in Get-ChildItem -LiteralPath $recipeRoot -Filter '*.json') { $recipe = Get-Content -LiteralPath $file.FullName -Raw | ConvertFrom-Json @@ -730,6 +797,12 @@ function Prepare-TargetDirectories() { foreach ($file in Get-ChildItem -LiteralPath $advancementRoot -Filter '*.json') { Remove-Item -LiteralPath $file.FullName } + foreach ($file in Get-ChildItem -LiteralPath $minecraftRecipeRoot -Filter '*.json') { + Remove-Item -LiteralPath $file.FullName + } + foreach ($file in Get-ChildItem -LiteralPath $minecraftAdvancementRoot -Filter '*.json' -Recurse) { + Remove-Item -LiteralPath $file.FullName + } } function Write-TargetTags() { @@ -751,11 +824,220 @@ function Write-TargetTags() { Write-Json $destination ([ordered]@{ replace = $false; values = $values }) } } + + $blockDestination = Join-Path $blockTagRoot "stones\$family.json" + New-Item -ItemType Directory -Force -Path (Split-Path -Parent $blockDestination) | Out-Null + $blockValues = @("mineralogy:$family") + $blockValues += @(NativeTagAliases 'stones' $family '') + Write-Json $blockDestination ([ordered]@{ replace = $false; values = $blockValues }) + } +} + +function Write-CobblestoneRecipeTags() { + $familyTags = @($families | ForEach-Object { "#mineralogy:stones/$_" }) + Write-Json (Join-Path $itemTagRoot 'cobblestone_equivalents.json') ([ordered]@{ + replace = $false + values = @('#forge:cobblestone') + $familyTags + }) + Write-Json (Join-Path $itemTagRoot 'stone_crafting_materials.json') ([ordered]@{ + replace = $false + values = @('#minecraft:stone_crafting_materials') + $familyTags + }) + Write-Json (Join-Path $itemTagRoot 'stone_tool_materials.json') ([ordered]@{ + replace = $false + values = @('#minecraft:stone_tool_materials') + $familyTags + }) +} + +function VanillaRecipeAdvancement( + [string] $recipeName, + [string] $criterionName, + [System.Collections.IDictionary] $criterionIngredient +) { + return [ordered]@{ + parent = 'minecraft:recipes/root' + rewards = [ordered]@{ recipes = @("minecraft:$recipeName") } + criteria = [ordered]@{ + $criterionName = [ordered]@{ + trigger = 'minecraft:inventory_changed' + conditions = [ordered]@{ items = @($criterionIngredient) } + } + has_the_recipe = [ordered]@{ + trigger = 'minecraft:recipe_unlocked' + conditions = [ordered]@{ recipe = "minecraft:$recipeName" } + } + } + requirements = ,@($criterionName, 'has_the_recipe') + } +} + +function Write-ConditionalMinecraftAdvancement( + [string] $category, + [string] $recipeName, + [System.Collections.IDictionary] $condition, + [string] $criterionName, + [System.Collections.IDictionary] $enabledIngredient, + [System.Collections.IDictionary] $fallbackIngredient +) { + $directory = Join-Path $minecraftAdvancementRoot $category + New-Item -ItemType Directory -Force -Path $directory | Out-Null + Write-Json (Join-Path $directory "$recipeName.json") ([ordered]@{ + advancements = @( + [ordered]@{ + conditions = @($condition) + advancement = VanillaRecipeAdvancement $recipeName $criterionName $enabledIngredient + }, + [ordered]@{ + conditions = @((NotCondition $condition)) + advancement = VanillaRecipeAdvancement $recipeName $criterionName $fallbackIngredient + } + ) + }) +} + +function Write-CobblestoneRecipeOverrides() { + $condition = ConfigCondition 'COBBLESTONE_EQUIVILENT' + $enabledCobblestone = [ordered]@{ tag = 'mineralogy:cobblestone_equivalents' } + $fallbackCobblestone = [ordered]@{ tag = 'forge:cobblestone' } + $enabledCrafting = [ordered]@{ tag = 'mineralogy:stone_crafting_materials' } + $fallbackCrafting = [ordered]@{ tag = 'minecraft:stone_crafting_materials' } + $enabledTools = [ordered]@{ tag = 'mineralogy:stone_tool_materials' } + $fallbackTools = [ordered]@{ tag = 'minecraft:stone_tool_materials' } + + Write-ConditionalMinecraftRecipe 'furnace' $condition ` + (VanillaShapedRecipe @('###', '# #', '###') ([ordered]@{ '#' = $enabledCrafting }) 'minecraft:furnace') ` + (VanillaShapedRecipe @('###', '# #', '###') ([ordered]@{ '#' = $fallbackCrafting }) 'minecraft:furnace') + Write-ConditionalMinecraftRecipe 'brewing_stand' $condition ` + (VanillaShapedRecipe @(' B ', '###') ([ordered]@{ + B = ItemIngredient 'minecraft:blaze_rod'; '#' = $enabledCrafting + }) 'minecraft:brewing_stand') ` + (VanillaShapedRecipe @(' B ', '###') ([ordered]@{ + B = ItemIngredient 'minecraft:blaze_rod'; '#' = $fallbackCrafting + }) 'minecraft:brewing_stand') + Write-ConditionalMinecraftRecipe 'lever' $condition ` + (VanillaShapedRecipe @('X', '#') ([ordered]@{ + '#' = $enabledCobblestone; X = ItemIngredient 'minecraft:stick' + }) 'minecraft:lever') ` + (VanillaShapedRecipe @('X', '#') ([ordered]@{ + '#' = $fallbackCobblestone; X = ItemIngredient 'minecraft:stick' + }) 'minecraft:lever') + Write-ConditionalMinecraftRecipe 'piston' $condition ` + (VanillaShapedRecipe @('TTT', '#X#', '#R#') ([ordered]@{ + R = ItemIngredient 'minecraft:redstone'; '#' = $enabledCobblestone + T = [ordered]@{ tag = 'minecraft:planks' }; X = ItemIngredient 'minecraft:iron_ingot' + }) 'minecraft:piston') ` + (VanillaShapedRecipe @('TTT', '#X#', '#R#') ([ordered]@{ + R = ItemIngredient 'minecraft:redstone'; '#' = $fallbackCobblestone + T = [ordered]@{ tag = 'minecraft:planks' }; X = ItemIngredient 'minecraft:iron_ingot' + }) 'minecraft:piston') + Write-ConditionalMinecraftRecipe 'dispenser' $condition ` + (VanillaShapedRecipe @('###', '#X#', '#R#') ([ordered]@{ + R = ItemIngredient 'minecraft:redstone'; '#' = $enabledCobblestone + X = ItemIngredient 'minecraft:bow' + }) 'minecraft:dispenser') ` + (VanillaShapedRecipe @('###', '#X#', '#R#') ([ordered]@{ + R = ItemIngredient 'minecraft:redstone'; '#' = $fallbackCobblestone + X = ItemIngredient 'minecraft:bow' + }) 'minecraft:dispenser') + Write-ConditionalMinecraftRecipe 'dropper' $condition ` + (VanillaShapedRecipe @('###', '# #', '#R#') ([ordered]@{ + R = ItemIngredient 'minecraft:redstone'; '#' = $enabledCobblestone + }) 'minecraft:dropper') ` + (VanillaShapedRecipe @('###', '# #', '#R#') ([ordered]@{ + R = ItemIngredient 'minecraft:redstone'; '#' = $fallbackCobblestone + }) 'minecraft:dropper') + Write-ConditionalMinecraftRecipe 'observer' $condition ` + (VanillaShapedRecipe @('###', 'RRQ', '###') ([ordered]@{ + Q = ItemIngredient 'minecraft:quartz'; R = ItemIngredient 'minecraft:redstone' + '#' = $enabledCobblestone + }) 'minecraft:observer') ` + (VanillaShapedRecipe @('###', 'RRQ', '###') ([ordered]@{ + Q = ItemIngredient 'minecraft:quartz'; R = ItemIngredient 'minecraft:redstone' + '#' = $fallbackCobblestone + }) 'minecraft:observer') + Write-ConditionalMinecraftRecipe 'mossy_cobblestone' $condition ` + (VanillaShapelessRecipe @($enabledCobblestone, (ItemIngredient 'minecraft:vine')) 'minecraft:mossy_cobblestone') ` + (VanillaShapelessRecipe @($fallbackCobblestone, (ItemIngredient 'minecraft:vine')) 'minecraft:mossy_cobblestone') + Write-ConditionalMinecraftRecipe 'andesite' $condition ` + (VanillaShapelessRecipe @((ItemIngredient 'minecraft:diorite'), $enabledCobblestone) 'minecraft:andesite' 2) ` + (VanillaShapelessRecipe @((ItemIngredient 'minecraft:diorite'), $fallbackCobblestone) 'minecraft:andesite' 2) + Write-ConditionalMinecraftRecipe 'diorite' $condition ` + (VanillaShapedRecipe @('CQ', 'QC') ([ordered]@{ + Q = ItemIngredient 'minecraft:quartz'; C = $enabledCobblestone + }) 'minecraft:diorite' 2) ` + (VanillaShapedRecipe @('CQ', 'QC') ([ordered]@{ + Q = ItemIngredient 'minecraft:quartz'; C = $fallbackCobblestone + }) 'minecraft:diorite' 2) + + $toolRecipes = [ordered]@{ + stone_axe = @('XX', 'X#', ' #') + stone_hoe = @('XX', ' #', ' #') + stone_pickaxe = @('XXX', ' # ', ' # ') + stone_shovel = @('X', '#', '#') + stone_sword = @('X', 'X', '#') + } + foreach ($recipeName in $toolRecipes.Keys) { + Write-ConditionalMinecraftRecipe $recipeName $condition ` + (VanillaShapedRecipe $toolRecipes[$recipeName] ([ordered]@{ + '#' = ItemIngredient 'minecraft:stick'; X = $enabledTools + }) "minecraft:$recipeName") ` + (VanillaShapedRecipe $toolRecipes[$recipeName] ([ordered]@{ + '#' = ItemIngredient 'minecraft:stick'; X = $fallbackTools + }) "minecraft:$recipeName") + } + + $advancements = @( + @('decorations', 'furnace', 'has_cobblestone', $enabledCrafting, $fallbackCrafting), + @('brewing', 'brewing_stand', 'has_blaze_rod', (ItemIngredient 'minecraft:blaze_rod'), (ItemIngredient 'minecraft:blaze_rod')), + @('redstone', 'lever', 'has_cobblestone', $enabledCobblestone, $fallbackCobblestone), + @('redstone', 'piston', 'has_redstone', (ItemIngredient 'minecraft:redstone'), (ItemIngredient 'minecraft:redstone')), + @('redstone', 'dispenser', 'has_bow', (ItemIngredient 'minecraft:bow'), (ItemIngredient 'minecraft:bow')), + @('redstone', 'dropper', 'has_redstone', (ItemIngredient 'minecraft:redstone'), (ItemIngredient 'minecraft:redstone')), + @('redstone', 'observer', 'has_quartz', (ItemIngredient 'minecraft:quartz'), (ItemIngredient 'minecraft:quartz')), + @('building_blocks', 'mossy_cobblestone', 'has_vine', (ItemIngredient 'minecraft:vine'), (ItemIngredient 'minecraft:vine')), + @('building_blocks', 'andesite', 'has_stone', (ItemIngredient 'minecraft:diorite'), (ItemIngredient 'minecraft:diorite')), + @('building_blocks', 'diorite', 'has_quartz', (ItemIngredient 'minecraft:quartz'), (ItemIngredient 'minecraft:quartz')), + @('tools', 'stone_axe', 'has_cobblestone', $enabledTools, $fallbackTools), + @('tools', 'stone_hoe', 'has_cobblestone', $enabledTools, $fallbackTools), + @('tools', 'stone_pickaxe', 'has_cobblestone', $enabledTools, $fallbackTools), + @('tools', 'stone_shovel', 'has_cobblestone', $enabledTools, $fallbackTools), + @('combat', 'stone_sword', 'has_cobblestone', $enabledTools, $fallbackTools) + ) + foreach ($entry in $advancements) { + Write-ConditionalMinecraftAdvancement $entry[0] $entry[1] $condition $entry[2] $entry[3] $entry[4] + } +} + +function Write-NativeSlabOverrides() { + foreach ($family in @('andesite', 'diorite', 'granite')) { + $raw = $nativeFullBlocks[$family].raw + $smooth = $nativeFullBlocks[$family].smooth + foreach ($finish in @( + @{ recipe = "${family}_slab"; source = $raw; mineralogy = "mineralogy:${family}_slab"; vanilla = "minecraft:${family}_slab" }, + @{ recipe = "polished_${family}_slab"; source = $smooth; mineralogy = "mineralogy:${family}_smooth_slab"; vanilla = "minecraft:polished_${family}_slab" } + )) { + $condition = ItemCondition $finish.mineralogy + Write-ConditionalMinecraftRecipe $finish.recipe $condition ` + (VanillaShapedRecipe @('###') ([ordered]@{ '#' = ItemIngredient $finish.source }) $finish.mineralogy 6) ` + (VanillaShapedRecipe @('###') ([ordered]@{ '#' = ItemIngredient $finish.source }) $finish.vanilla 6) + } + + foreach ($route in @( + @{ recipe = "${family}_slab_from_${family}_stonecutting"; source = $raw; mineralogy = "mineralogy:${family}_slab"; vanilla = "minecraft:${family}_slab" }, + @{ recipe = "polished_${family}_slab_from_${family}_stonecutting"; source = $raw; mineralogy = "mineralogy:${family}_smooth_slab"; vanilla = "minecraft:polished_${family}_slab" }, + @{ recipe = "polished_${family}_slab_from_polished_${family}_stonecutting"; source = $smooth; mineralogy = "mineralogy:${family}_smooth_slab"; vanilla = "minecraft:polished_${family}_slab" } + )) { + $condition = ItemCondition $route.mineralogy + Write-ConditionalMinecraftRecipe $route.recipe $condition ` + (VanillaStonecuttingRecipe (ItemIngredient $route.source) $route.mineralogy 2) ` + (VanillaStonecuttingRecipe (ItemIngredient $route.source) $route.vanilla 2) + } } } function Write-NativePolishedOverrides() { New-Item -ItemType Directory -Force -Path $minecraftRecipeRoot | Out-Null + $minecraftBuildingAdvancementRoot = Join-Path $minecraftAdvancementRoot 'building_blocks' New-Item -ItemType Directory -Force -Path $minecraftBuildingAdvancementRoot | Out-Null foreach ($family in $nativeFullBlocks.Keys) { $raw = $nativeFullBlocks[$family].raw @@ -793,6 +1075,9 @@ function Write-NativePolishedOverrides() { Prepare-TargetDirectories Write-TargetTags +Write-CobblestoneRecipeTags +Write-CobblestoneRecipeOverrides +Write-NativeSlabOverrides Write-NativePolishedOverrides New-Item -ItemType Directory -Force -Path $recipeRoot | Out-Null diff --git a/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java b/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java index dbd34b66f..86e0c8e26 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java +++ b/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java @@ -284,6 +284,7 @@ private static BooleanSupplier configFlagCondition(String flag) { case "GENERATE_SMOOTHBRICKSTAIRS": return () -> generateSmoothBrickStairs; case "GENERATE_SMOOTHBRICKSLAB": return () -> generateSmoothBrickSlab; case "GENERATE_SMOOTHBRICKWALL": return () -> generateSmoothBrickWall; + case "COBBLESTONE_EQUIVILENT": return () -> cobblestoneEquivalent; case ContentPolicy.ENABLE_DRYWALLS: return () -> contentPolicy.drywallsEnabled(); case ContentPolicy.ENABLE_ROCK_SALT_LAMPS: return () -> contentPolicy.rockSaltLampsEnabled(); case ContentPolicy.ENABLE_MINERAL_DUSTS: return () -> contentPolicy.mineralDustsEnabled(); diff --git a/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java b/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java index 0ca7a71db..92ea3ccff 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java +++ b/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java @@ -41,13 +41,13 @@ public static void onTagsUpdated(TagsUpdatedEvent event) { } static void apply(ITagCollectionSupplier manager) { - Set configuredBlocks = rawRockBlocks(); - Set configuredItems = new LinkedHashSet<>(); - for (Block block : configuredBlocks) configuredItems.add(block.asItem()); + ITagCollection blockTags = manager.getBlockTags(); + ITagCollection itemTags = manager.getItemTags(); + Set configuredBlocks = rawRockBlocks(blockTags); + Set configuredItems = rawRockItems(itemTags); boolean enabled = MineralogyConfig.makeRockCobblestoneEquivilent(); - ITagCollection blockTags = manager.getBlockTags(); Set blocks = existing(blockTags, COBBLESTONE); blocks.removeAll(configuredBlocks); if (enabled) blocks.addAll(configuredBlocks); @@ -55,7 +55,6 @@ static void apply(ITagCollectionSupplier manager) { addBlock(blocks, "pumice"); replaceElementsInPlace(required(blockTags, COBBLESTONE), blocks); - ITagCollection itemTags = manager.getItemTags(); Set items = existing(itemTags, COBBLESTONE); items.removeAll(configuredItems); if (enabled) items.addAll(configuredItems); @@ -80,15 +79,26 @@ static void apply(ITagCollectionSupplier manager) { Ingredient.invalidateAll(); } - private static Set rawRockBlocks() { + private static Set rawRockBlocks(ITagCollection tags) { Set blocks = new LinkedHashSet<>(); for (Material material : MaterialData.allIncludingRockSalt()) { - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Mineralogy.MODID, material.id())); - if (block != null) blocks.add(block); + blocks.addAll(required(tags, familyTag(material)).getAllElements()); } return blocks; } + private static Set rawRockItems(ITagCollection tags) { + Set items = new LinkedHashSet<>(); + for (Material material : MaterialData.allIncludingRockSalt()) { + items.addAll(required(tags, familyTag(material)).getAllElements()); + } + return items; + } + + private static ResourceLocation familyTag(Material material) { + return new ResourceLocation(Mineralogy.MODID, "stones/" + material.id()); + } + private static Set existing(ITagCollection collection, ResourceLocation id) { ITag tag = collection.get(id); return tag == null ? new LinkedHashSet<>() : new LinkedHashSet<>(tag.getAllElements()); diff --git a/src/main/resources/data/minecraft/advancements/recipes/brewing/brewing_stand.json b/src/main/resources/data/minecraft/advancements/recipes/brewing/brewing_stand.json new file mode 100644 index 000000000..98c1be354 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/brewing/brewing_stand.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:brewing_stand" + ] + }, + "criteria": { + "has_blaze_rod": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:blaze_rod" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:brewing_stand" + } + } + }, + "requirements": [ + [ + "has_blaze_rod", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:brewing_stand" + ] + }, + "criteria": { + "has_blaze_rod": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:blaze_rod" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:brewing_stand" + } + } + }, + "requirements": [ + [ + "has_blaze_rod", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/andesite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/andesite.json new file mode 100644 index 000000000..4556a77fe --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/andesite.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:andesite" + ] + }, + "criteria": { + "has_stone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:diorite" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:andesite" + } + } + }, + "requirements": [ + [ + "has_stone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:andesite" + ] + }, + "criteria": { + "has_stone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:diorite" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:andesite" + } + } + }, + "requirements": [ + [ + "has_stone", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/diorite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/diorite.json new file mode 100644 index 000000000..6f430b4a7 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/diorite.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:diorite" + ] + }, + "criteria": { + "has_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:quartz" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:diorite" + } + } + }, + "requirements": [ + [ + "has_quartz", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:diorite" + ] + }, + "criteria": { + "has_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:quartz" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:diorite" + } + } + }, + "requirements": [ + [ + "has_quartz", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone.json new file mode 100644 index 000000000..1b13904cf --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:mossy_cobblestone" + ] + }, + "criteria": { + "has_vine": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:vine" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:mossy_cobblestone" + } + } + }, + "requirements": [ + [ + "has_vine", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:mossy_cobblestone" + ] + }, + "criteria": { + "has_vine": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:vine" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:mossy_cobblestone" + } + } + }, + "requirements": [ + [ + "has_vine", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/combat/stone_sword.json b/src/main/resources/data/minecraft/advancements/recipes/combat/stone_sword.json new file mode 100644 index 000000000..51eba1c51 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/combat/stone_sword.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_sword" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_sword" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_sword" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_sword" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json b/src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json new file mode 100644 index 000000000..5750272a2 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:furnace" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stone_crafting_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:furnace" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:furnace" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:stone_crafting_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:furnace" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json new file mode 100644 index 000000000..8e25800c6 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:dispenser" + ] + }, + "criteria": { + "has_bow": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:bow" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:dispenser" + } + } + }, + "requirements": [ + [ + "has_bow", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:dispenser" + ] + }, + "criteria": { + "has_bow": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:bow" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:dispenser" + } + } + }, + "requirements": [ + [ + "has_bow", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json new file mode 100644 index 000000000..a27c9088d --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:dropper" + ] + }, + "criteria": { + "has_redstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:redstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:dropper" + } + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:dropper" + ] + }, + "criteria": { + "has_redstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:redstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:dropper" + } + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json new file mode 100644 index 000000000..d1125b7eb --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:lever" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:cobblestone_equivalents" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:lever" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:lever" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:cobblestone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:lever" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json new file mode 100644 index 000000000..d08e171f3 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:observer" + ] + }, + "criteria": { + "has_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:quartz" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:observer" + } + } + }, + "requirements": [ + [ + "has_quartz", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:observer" + ] + }, + "criteria": { + "has_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:quartz" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:observer" + } + } + }, + "requirements": [ + [ + "has_quartz", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json new file mode 100644 index 000000000..1ccf74a44 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:piston" + ] + }, + "criteria": { + "has_redstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:redstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:piston" + } + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:piston" + ] + }, + "criteria": { + "has_redstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:redstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:piston" + } + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_axe.json b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_axe.json new file mode 100644 index 000000000..8209c1959 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_axe.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_axe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_axe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_axe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_axe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_hoe.json b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_hoe.json new file mode 100644 index 000000000..e9a8ef862 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_hoe.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_hoe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_hoe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_hoe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_hoe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_pickaxe.json b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_pickaxe.json new file mode 100644 index 000000000..cdad385e6 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_pickaxe.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_pickaxe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_pickaxe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_pickaxe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_pickaxe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_shovel.json b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_shovel.json new file mode 100644 index 000000000..86e10b3a8 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_shovel.json @@ -0,0 +1,87 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_shovel" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_shovel" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_shovel" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_shovel" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/andesite.json b/src/main/resources/data/minecraft/recipes/andesite.json new file mode 100644 index 000000000..b0136b9b3 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/andesite.json @@ -0,0 +1,54 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:diorite" + }, + { + "tag": "mineralogy:cobblestone_equivalents" + } + ], + "result": { + "item": "minecraft:andesite", + "count": 2 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:diorite" + }, + { + "tag": "forge:cobblestone" + } + ], + "result": { + "item": "minecraft:andesite", + "count": 2 + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/andesite_slab.json b/src/main/resources/data/minecraft/recipes/andesite_slab.json new file mode 100644 index 000000000..310f24434 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/andesite_slab.json @@ -0,0 +1,54 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:andesite" + } + }, + "result": { + "item": "mineralogy:andesite_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:andesite" + } + }, + "result": { + "item": "minecraft:andesite_slab", + "count": 6 + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/andesite_slab_from_andesite_stonecutting.json b/src/main/resources/data/minecraft/recipes/andesite_slab_from_andesite_stonecutting.json new file mode 100644 index 000000000..eb00f473a --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/andesite_slab_from_andesite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:andesite" + }, + "result": "mineralogy:andesite_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:andesite" + }, + "result": "minecraft:andesite_slab", + "count": 2 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/brewing_stand.json b/src/main/resources/data/minecraft/recipes/brewing_stand.json new file mode 100644 index 000000000..ed9cd34ab --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/brewing_stand.json @@ -0,0 +1,60 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " B ", + "###" + ], + "key": { + "B": { + "item": "minecraft:blaze_rod" + }, + "#": { + "tag": "mineralogy:stone_crafting_materials" + } + }, + "result": { + "item": "minecraft:brewing_stand" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " B ", + "###" + ], + "key": { + "B": { + "item": "minecraft:blaze_rod" + }, + "#": { + "tag": "minecraft:stone_crafting_materials" + } + }, + "result": { + "item": "minecraft:brewing_stand" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/diorite.json b/src/main/resources/data/minecraft/recipes/diorite.json new file mode 100644 index 000000000..483970b92 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/diorite.json @@ -0,0 +1,62 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "CQ", + "QC" + ], + "key": { + "Q": { + "item": "minecraft:quartz" + }, + "C": { + "tag": "mineralogy:cobblestone_equivalents" + } + }, + "result": { + "item": "minecraft:diorite", + "count": 2 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "CQ", + "QC" + ], + "key": { + "Q": { + "item": "minecraft:quartz" + }, + "C": { + "tag": "forge:cobblestone" + } + }, + "result": { + "item": "minecraft:diorite", + "count": 2 + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/diorite_slab.json b/src/main/resources/data/minecraft/recipes/diorite_slab.json new file mode 100644 index 000000000..cbb5384a6 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/diorite_slab.json @@ -0,0 +1,54 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:diorite" + } + }, + "result": { + "item": "mineralogy:diorite_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:diorite" + } + }, + "result": { + "item": "minecraft:diorite_slab", + "count": 6 + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/diorite_slab_from_diorite_stonecutting.json b/src/main/resources/data/minecraft/recipes/diorite_slab_from_diorite_stonecutting.json new file mode 100644 index 000000000..873148bed --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/diorite_slab_from_diorite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:diorite" + }, + "result": "mineralogy:diorite_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:diorite" + }, + "result": "minecraft:diorite_slab", + "count": 2 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/dispenser.json b/src/main/resources/data/minecraft/recipes/dispenser.json new file mode 100644 index 000000000..3bfe18a6f --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/dispenser.json @@ -0,0 +1,68 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#X#", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "mineralogy:cobblestone_equivalents" + }, + "X": { + "item": "minecraft:bow" + } + }, + "result": { + "item": "minecraft:dispenser" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#X#", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "forge:cobblestone" + }, + "X": { + "item": "minecraft:bow" + } + }, + "result": { + "item": "minecraft:dispenser" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/dropper.json b/src/main/resources/data/minecraft/recipes/dropper.json new file mode 100644 index 000000000..0cdcea945 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/dropper.json @@ -0,0 +1,62 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "# #", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "mineralogy:cobblestone_equivalents" + } + }, + "result": { + "item": "minecraft:dropper" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "# #", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "forge:cobblestone" + } + }, + "result": { + "item": "minecraft:dropper" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/furnace.json b/src/main/resources/data/minecraft/recipes/furnace.json index 7b098ff9d..2470b0800 100644 --- a/src/main/resources/data/minecraft/recipes/furnace.json +++ b/src/main/resources/data/minecraft/recipes/furnace.json @@ -1,16 +1,56 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "# #", - "###" - ], - "key": { - "#": { - "tag": "forge:cobblestone" + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "# #", + "###" + ], + "key": { + "#": { + "tag": "mineralogy:stone_crafting_materials" + } + }, + "result": { + "item": "minecraft:furnace" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "# #", + "###" + ], + "key": { + "#": { + "tag": "minecraft:stone_crafting_materials" + } + }, + "result": { + "item": "minecraft:furnace" + } + } } - }, - "result": { - "item": "minecraft:furnace" - } + ] } diff --git a/src/main/resources/data/minecraft/recipes/granite_slab.json b/src/main/resources/data/minecraft/recipes/granite_slab.json new file mode 100644 index 000000000..d82478d8b --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/granite_slab.json @@ -0,0 +1,54 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:granite" + } + }, + "result": { + "item": "mineralogy:granite_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:granite" + } + }, + "result": { + "item": "minecraft:granite_slab", + "count": 6 + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/granite_slab_from_granite_stonecutting.json b/src/main/resources/data/minecraft/recipes/granite_slab_from_granite_stonecutting.json new file mode 100644 index 000000000..953648af7 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/granite_slab_from_granite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:granite" + }, + "result": "mineralogy:granite_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:granite" + }, + "result": "minecraft:granite_slab", + "count": 2 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/lever.json b/src/main/resources/data/minecraft/recipes/lever.json new file mode 100644 index 000000000..f11de4848 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/lever.json @@ -0,0 +1,60 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "#" + ], + "key": { + "#": { + "tag": "mineralogy:cobblestone_equivalents" + }, + "X": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "minecraft:lever" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "#" + ], + "key": { + "#": { + "tag": "forge:cobblestone" + }, + "X": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "minecraft:lever" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/mossy_cobblestone.json b/src/main/resources/data/minecraft/recipes/mossy_cobblestone.json new file mode 100644 index 000000000..c589f8f22 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/mossy_cobblestone.json @@ -0,0 +1,52 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:cobblestone_equivalents" + }, + { + "item": "minecraft:vine" + } + ], + "result": { + "item": "minecraft:mossy_cobblestone" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:cobblestone" + }, + { + "item": "minecraft:vine" + } + ], + "result": { + "item": "minecraft:mossy_cobblestone" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/observer.json b/src/main/resources/data/minecraft/recipes/observer.json new file mode 100644 index 000000000..255a0eb6d --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/observer.json @@ -0,0 +1,68 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "RRQ", + "###" + ], + "key": { + "Q": { + "item": "minecraft:quartz" + }, + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "mineralogy:cobblestone_equivalents" + } + }, + "result": { + "item": "minecraft:observer" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "RRQ", + "###" + ], + "key": { + "Q": { + "item": "minecraft:quartz" + }, + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "forge:cobblestone" + } + }, + "result": { + "item": "minecraft:observer" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/piston.json b/src/main/resources/data/minecraft/recipes/piston.json new file mode 100644 index 000000000..ce04e3121 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/piston.json @@ -0,0 +1,74 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "TTT", + "#X#", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "mineralogy:cobblestone_equivalents" + }, + "T": { + "tag": "minecraft:planks" + }, + "X": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "item": "minecraft:piston" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "TTT", + "#X#", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "forge:cobblestone" + }, + "T": { + "tag": "minecraft:planks" + }, + "X": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "item": "minecraft:piston" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/polished_andesite_slab.json b/src/main/resources/data/minecraft/recipes/polished_andesite_slab.json new file mode 100644 index 000000000..b5821e0cc --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_andesite_slab.json @@ -0,0 +1,54 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_andesite" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_andesite" + } + }, + "result": { + "item": "minecraft:polished_andesite_slab", + "count": 6 + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_andesite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_andesite_stonecutting.json new file mode 100644 index 000000000..542e1d3ad --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_andesite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:andesite" + }, + "result": "mineralogy:andesite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:andesite" + }, + "result": "minecraft:polished_andesite_slab", + "count": 2 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_polished_andesite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_polished_andesite_stonecutting.json new file mode 100644 index 000000000..80520d45e --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_polished_andesite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_andesite" + }, + "result": "mineralogy:andesite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_andesite" + }, + "result": "minecraft:polished_andesite_slab", + "count": 2 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/polished_diorite_slab.json b/src/main/resources/data/minecraft/recipes/polished_diorite_slab.json new file mode 100644 index 000000000..c1b482c10 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_diorite_slab.json @@ -0,0 +1,54 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_diorite" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_diorite" + } + }, + "result": { + "item": "minecraft:polished_diorite_slab", + "count": 6 + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_diorite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_diorite_stonecutting.json new file mode 100644 index 000000000..9a99b5856 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_diorite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:diorite" + }, + "result": "mineralogy:diorite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:diorite" + }, + "result": "minecraft:polished_diorite_slab", + "count": 2 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_polished_diorite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_polished_diorite_stonecutting.json new file mode 100644 index 000000000..8b59ba1dd --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_polished_diorite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_diorite" + }, + "result": "mineralogy:diorite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_diorite" + }, + "result": "minecraft:polished_diorite_slab", + "count": 2 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/polished_granite_slab.json b/src/main/resources/data/minecraft/recipes/polished_granite_slab.json new file mode 100644 index 000000000..42266605b --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_granite_slab.json @@ -0,0 +1,54 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_granite" + } + }, + "result": { + "item": "mineralogy:granite_smooth_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_granite" + } + }, + "result": { + "item": "minecraft:polished_granite_slab", + "count": 6 + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_granite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_granite_stonecutting.json new file mode 100644 index 000000000..592945540 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_granite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:granite" + }, + "result": "mineralogy:granite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:granite" + }, + "result": "minecraft:polished_granite_slab", + "count": 2 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_polished_granite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_polished_granite_stonecutting.json new file mode 100644 index 000000000..8aea0521d --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_polished_granite_stonecutting.json @@ -0,0 +1,40 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_granite" + }, + "result": "mineralogy:granite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_granite" + }, + "result": "minecraft:polished_granite_slab", + "count": 2 + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/stone_axe.json b/src/main/resources/data/minecraft/recipes/stone_axe.json new file mode 100644 index 000000000..469ad5e31 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/stone_axe.json @@ -0,0 +1,62 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "X#", + " #" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_axe" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "X#", + " #" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_axe" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/stone_hoe.json b/src/main/resources/data/minecraft/recipes/stone_hoe.json new file mode 100644 index 000000000..6a589ec18 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/stone_hoe.json @@ -0,0 +1,62 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " #", + " #" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_hoe" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " #", + " #" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_hoe" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/stone_pickaxe.json b/src/main/resources/data/minecraft/recipes/stone_pickaxe.json new file mode 100644 index 000000000..5e4e4306e --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/stone_pickaxe.json @@ -0,0 +1,62 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " # ", + " # " + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_pickaxe" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " # ", + " # " + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_pickaxe" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/stone_shovel.json b/src/main/resources/data/minecraft/recipes/stone_shovel.json new file mode 100644 index 000000000..ebe9b31f5 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/stone_shovel.json @@ -0,0 +1,62 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "#", + "#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_shovel" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "#", + "#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_shovel" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/stone_sword.json b/src/main/resources/data/minecraft/recipes/stone_sword.json new file mode 100644 index 000000000..5dfe10216 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/stone_sword.json @@ -0,0 +1,62 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_sword" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_sword" + } + } + } + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/amphibolite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/amphibolite.json new file mode 100644 index 000000000..26e1eac26 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/amphibolite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:amphibolite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/andesite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/andesite.json new file mode 100644 index 000000000..0680f2507 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/andesite.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:andesite", + "minecraft:andesite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/basalt.json b/src/main/resources/data/mineralogy/tags/blocks/stones/basalt.json new file mode 100644 index 000000000..e0e10bf52 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/basalt.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:basalt", + "minecraft:basalt" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/basaltic_glass.json b/src/main/resources/data/mineralogy/tags/blocks/stones/basaltic_glass.json new file mode 100644 index 000000000..59c1e89a3 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/basaltic_glass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:basaltic_glass" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/conglomerate.json b/src/main/resources/data/mineralogy/tags/blocks/stones/conglomerate.json new file mode 100644 index 000000000..e4e289fb2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/conglomerate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:conglomerate" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/diabase.json b/src/main/resources/data/mineralogy/tags/blocks/stones/diabase.json new file mode 100644 index 000000000..c53507246 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/diabase.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:diabase" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/diorite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/diorite.json new file mode 100644 index 000000000..8d8329944 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/diorite.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:diorite", + "minecraft:diorite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/dolomite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/dolomite.json new file mode 100644 index 000000000..1ed6b212d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/dolomite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:dolomite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/gabbro.json b/src/main/resources/data/mineralogy/tags/blocks/stones/gabbro.json new file mode 100644 index 000000000..d2d73ceb1 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/gabbro.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gabbro" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/gneiss.json b/src/main/resources/data/mineralogy/tags/blocks/stones/gneiss.json new file mode 100644 index 000000000..6d15d2677 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/gneiss.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:gneiss" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/granite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/granite.json new file mode 100644 index 000000000..817e7c5da --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/granite.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "mineralogy:granite", + "minecraft:granite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/hornfels.json b/src/main/resources/data/mineralogy/tags/blocks/stones/hornfels.json new file mode 100644 index 000000000..59acdf116 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/hornfels.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:hornfels" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/limestone.json b/src/main/resources/data/mineralogy/tags/blocks/stones/limestone.json new file mode 100644 index 000000000..ae25aec9e --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/limestone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:limestone" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/marble.json b/src/main/resources/data/mineralogy/tags/blocks/stones/marble.json new file mode 100644 index 000000000..e22e67bb1 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/marble.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:marble" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/novaculite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/novaculite.json new file mode 100644 index 000000000..2339a11c9 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/novaculite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:novaculite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/pegmatite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/pegmatite.json new file mode 100644 index 000000000..442dbf678 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/pegmatite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:pegmatite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/peridotite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/peridotite.json new file mode 100644 index 000000000..d774099e2 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/peridotite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:peridotite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/phyllite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/phyllite.json new file mode 100644 index 000000000..f705ab15b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/phyllite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:phyllite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/quartzite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/quartzite.json new file mode 100644 index 000000000..21db863d4 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/quartzite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:quartzite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/rhyolite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/rhyolite.json new file mode 100644 index 000000000..77c7ece7b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/rhyolite.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rhyolite" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/rock_salt.json b/src/main/resources/data/mineralogy/tags/blocks/stones/rock_salt.json new file mode 100644 index 000000000..8133cee26 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/rock_salt.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:rock_salt" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/schist.json b/src/main/resources/data/mineralogy/tags/blocks/stones/schist.json new file mode 100644 index 000000000..61f16050a --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/schist.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:schist" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/scoria.json b/src/main/resources/data/mineralogy/tags/blocks/stones/scoria.json new file mode 100644 index 000000000..064d4d35b --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/scoria.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:scoria" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/shale.json b/src/main/resources/data/mineralogy/tags/blocks/stones/shale.json new file mode 100644 index 000000000..f5bb0657a --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/shale.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:shale" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/siltstone.json b/src/main/resources/data/mineralogy/tags/blocks/stones/siltstone.json new file mode 100644 index 000000000..d09f8782d --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/siltstone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:siltstone" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/slate.json b/src/main/resources/data/mineralogy/tags/blocks/stones/slate.json new file mode 100644 index 000000000..a9a6c28e5 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/slate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:slate" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/tuff.json b/src/main/resources/data/mineralogy/tags/blocks/stones/tuff.json new file mode 100644 index 000000000..b28c5a07c --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/tuff.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mineralogy:tuff" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/cobblestone_equivalents.json b/src/main/resources/data/mineralogy/tags/items/cobblestone_equivalents.json new file mode 100644 index 000000000..3f9669028 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/cobblestone_equivalents.json @@ -0,0 +1,33 @@ +{ + "replace": false, + "values": [ + "#forge:cobblestone", + "#mineralogy:stones/andesite", + "#mineralogy:stones/basalt", + "#mineralogy:stones/diorite", + "#mineralogy:stones/granite", + "#mineralogy:stones/rhyolite", + "#mineralogy:stones/pegmatite", + "#mineralogy:stones/diabase", + "#mineralogy:stones/gabbro", + "#mineralogy:stones/peridotite", + "#mineralogy:stones/basaltic_glass", + "#mineralogy:stones/scoria", + "#mineralogy:stones/tuff", + "#mineralogy:stones/shale", + "#mineralogy:stones/conglomerate", + "#mineralogy:stones/dolomite", + "#mineralogy:stones/limestone", + "#mineralogy:stones/siltstone", + "#mineralogy:stones/marble", + "#mineralogy:stones/slate", + "#mineralogy:stones/schist", + "#mineralogy:stones/gneiss", + "#mineralogy:stones/phyllite", + "#mineralogy:stones/amphibolite", + "#mineralogy:stones/hornfels", + "#mineralogy:stones/quartzite", + "#mineralogy:stones/novaculite", + "#mineralogy:stones/rock_salt" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stone_crafting_materials.json b/src/main/resources/data/mineralogy/tags/items/stone_crafting_materials.json new file mode 100644 index 000000000..eb501c330 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stone_crafting_materials.json @@ -0,0 +1,33 @@ +{ + "replace": false, + "values": [ + "#minecraft:stone_crafting_materials", + "#mineralogy:stones/andesite", + "#mineralogy:stones/basalt", + "#mineralogy:stones/diorite", + "#mineralogy:stones/granite", + "#mineralogy:stones/rhyolite", + "#mineralogy:stones/pegmatite", + "#mineralogy:stones/diabase", + "#mineralogy:stones/gabbro", + "#mineralogy:stones/peridotite", + "#mineralogy:stones/basaltic_glass", + "#mineralogy:stones/scoria", + "#mineralogy:stones/tuff", + "#mineralogy:stones/shale", + "#mineralogy:stones/conglomerate", + "#mineralogy:stones/dolomite", + "#mineralogy:stones/limestone", + "#mineralogy:stones/siltstone", + "#mineralogy:stones/marble", + "#mineralogy:stones/slate", + "#mineralogy:stones/schist", + "#mineralogy:stones/gneiss", + "#mineralogy:stones/phyllite", + "#mineralogy:stones/amphibolite", + "#mineralogy:stones/hornfels", + "#mineralogy:stones/quartzite", + "#mineralogy:stones/novaculite", + "#mineralogy:stones/rock_salt" + ] +} diff --git a/src/main/resources/data/mineralogy/tags/items/stone_tool_materials.json b/src/main/resources/data/mineralogy/tags/items/stone_tool_materials.json new file mode 100644 index 000000000..1a3a9a931 --- /dev/null +++ b/src/main/resources/data/mineralogy/tags/items/stone_tool_materials.json @@ -0,0 +1,33 @@ +{ + "replace": false, + "values": [ + "#minecraft:stone_tool_materials", + "#mineralogy:stones/andesite", + "#mineralogy:stones/basalt", + "#mineralogy:stones/diorite", + "#mineralogy:stones/granite", + "#mineralogy:stones/rhyolite", + "#mineralogy:stones/pegmatite", + "#mineralogy:stones/diabase", + "#mineralogy:stones/gabbro", + "#mineralogy:stones/peridotite", + "#mineralogy:stones/basaltic_glass", + "#mineralogy:stones/scoria", + "#mineralogy:stones/tuff", + "#mineralogy:stones/shale", + "#mineralogy:stones/conglomerate", + "#mineralogy:stones/dolomite", + "#mineralogy:stones/limestone", + "#mineralogy:stones/siltstone", + "#mineralogy:stones/marble", + "#mineralogy:stones/slate", + "#mineralogy:stones/schist", + "#mineralogy:stones/gneiss", + "#mineralogy:stones/phyllite", + "#mineralogy:stones/amphibolite", + "#mineralogy:stones/hornfels", + "#mineralogy:stones/quartzite", + "#mineralogy:stones/novaculite", + "#mineralogy:stones/rock_salt" + ] +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java index 6f09bf741..dd3d42023 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java @@ -84,6 +84,10 @@ public void cobblestonePolicyReappliesAfterReloadAndKeepsSpecialCases() throws E assertFalse(policy.contains("onServerAboutToStart")); assertTrue(policy.contains("event.getTagManager()")); assertTrue(policy.contains("MaterialData.allIncludingRockSalt()")); + assertTrue(policy.contains("familyTag(material)")); + assertTrue(policy.contains("\"stones/\" + material.id()")); + assertTrue(policy.contains("rawRockBlocks(blockTags)")); + assertTrue(policy.contains("rawRockItems(itemTags)")); assertTrue(policy.contains("addBlock(blocks, \"chert\")")); assertTrue(policy.contains("addBlock(blocks, \"pumice\")")); assertTrue(policy.contains("addItem(items, \"chert\")")); diff --git a/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java b/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java new file mode 100644 index 000000000..29f45b0dc --- /dev/null +++ b/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java @@ -0,0 +1,233 @@ +package zone.moddev.mc.mineralogy; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.Reader; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +import net.minecraft.block.Blocks; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.CraftingInventory; +import net.minecraft.inventory.container.Container; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.ICraftingRecipe; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.RecipeManager; +import net.minecraft.tags.ITag; +import net.minecraft.tags.ITagCollection; +import net.minecraft.tags.ITagCollectionSupplier; +import net.minecraft.tags.TagCollectionManager; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.Bootstrap; +import net.minecraftforge.common.crafting.CraftingHelper; +import net.minecraftforge.common.crafting.VanillaIngredientSerializer; +import net.minecraftforge.common.crafting.conditions.NotCondition; + +import org.junit.BeforeClass; +import org.junit.Test; + +/** Exercises generated overrides through Forge conditions and Minecraft's recipe deserializers. */ +public class NativeRecipeManagerTest { + private static final File RECIPE_ROOT = new File("src/main/resources/data/minecraft/recipes"); + private static final Container DUMMY_CONTAINER = new Container(null, -1) { + @Override + public boolean canInteractWith(PlayerEntity playerIn) { + return false; + } + }; + + @BeforeClass + public static void initializeRegistriesAndConditions() { + Bootstrap.register(); + CraftingHelper.register(NotCondition.Serializer.INSTANCE); + CraftingHelper.register(new ResourceLocation("minecraft", "item"), + VanillaIngredientSerializer.INSTANCE); + MineralogyConfig.registerRecipeConditions(); + } + + @Test + public void enabledNativeBasaltMatchesEveryCoveredVanillaRecipe() throws Exception { + ITagCollectionSupplier previous = TagCollectionManager.getManager(); + try { + installRecipeTags(); + loadConfig(true); + for (String recipeName : recipeNames()) { + ICraftingRecipe recipe = recipe(recipeName); + CraftingInventory inventory = inventory(recipeName, Blocks.BASALT.asItem()); + assertTrue(recipeName, recipe.matches(inventory, null)); + assertEquals(recipeName, "minecraft:" + recipeName, + recipe.getRecipeOutput().getItem().getRegistryName().toString()); + } + } finally { + TagCollectionManager.setManager(previous); + } + } + + @Test + public void disabledEquivalenceRejectsBasaltButKeepsVanillaMaterials() throws Exception { + ITagCollectionSupplier previous = TagCollectionManager.getManager(); + try { + installRecipeTags(); + loadConfig(false); + for (String recipeName : recipeNames()) { + ICraftingRecipe recipe = recipe(recipeName); + assertFalse(recipeName, recipe.matches(inventory(recipeName, Blocks.BASALT.asItem()), null)); + assertTrue(recipeName, recipe.matches(inventory(recipeName, Blocks.COBBLESTONE.asItem()), null)); + } + assertTrue(recipe("furnace").matches(inventory("furnace", Blocks.BLACKSTONE.asItem()), null)); + assertTrue(recipe("brewing_stand").matches( + inventory("brewing_stand", Blocks.BLACKSTONE.asItem()), null)); + } finally { + TagCollectionManager.setManager(previous); + } + } + + private static void installRecipeTags() { + Map> tags = new LinkedHashMap>(); + tags.put(id("forge:cobblestone"), tag(Blocks.COBBLESTONE.asItem())); + tags.put(id("minecraft:stone_crafting_materials"), + tag(Blocks.COBBLESTONE.asItem(), Blocks.BLACKSTONE.asItem())); + tags.put(id("minecraft:stone_tool_materials"), tag(Blocks.COBBLESTONE.asItem())); + tags.put(id("minecraft:planks"), tag(Blocks.OAK_PLANKS.asItem())); + tags.put(id("mineralogy:cobblestone_equivalents"), + tag(Blocks.COBBLESTONE.asItem(), Blocks.BASALT.asItem(), Blocks.DIORITE.asItem())); + tags.put(id("mineralogy:stone_crafting_materials"), tag(Blocks.COBBLESTONE.asItem(), + Blocks.BLACKSTONE.asItem(), Blocks.BASALT.asItem(), Blocks.DIORITE.asItem())); + tags.put(id("mineralogy:stone_tool_materials"), + tag(Blocks.COBBLESTONE.asItem(), Blocks.BASALT.asItem(), Blocks.DIORITE.asItem())); + TagCollectionManager.setManager(ITagCollectionSupplier.getTagCollectionSupplier( + ITagCollection.getEmptyTagCollection(), ITagCollection.getTagCollectionFromMap(tags), + ITagCollection.getEmptyTagCollection(), ITagCollection.getEmptyTagCollection())); + } + + private static ITag tag(Item... items) { + return ITag.getTagOf(new LinkedHashSet(Arrays.asList(items))); + } + + private static ResourceLocation id(String value) { + return new ResourceLocation(value); + } + + private static void loadConfig(boolean enabled) throws Exception { + Path directory = Files.createTempDirectory("mineralogy-recipe-condition"); + Files.write(directory.resolve(MineralogyConfig.FILE_NAME), + ("[options]\nCOBBLESTONE_EQUIVILENT = " + enabled + "\n") + .getBytes(StandardCharsets.UTF_8)); + MineralogyConfig.load(directory); + } + + private static ICraftingRecipe recipe(String name) throws Exception { + JsonObject wrapper = json(new File(RECIPE_ROOT, name + ".json")); + JsonObject selected = null; + for (JsonElement element : wrapper.getAsJsonArray("recipes")) { + JsonObject candidate = element.getAsJsonObject(); + if (CraftingHelper.processConditions(candidate.getAsJsonArray("conditions"))) { + selected = candidate.getAsJsonObject("recipe"); + break; + } + } + assertTrue(name + " has no selected conditional branch", selected != null); + IRecipe deserialized = RecipeManager.deserializeRecipe(new ResourceLocation("minecraft", name), selected); + assertTrue(name, deserialized instanceof ICraftingRecipe); + return (ICraftingRecipe) deserialized; + } + + private static CraftingInventory inventory(String name, Item rock) { + if ("mossy_cobblestone".equals(name)) { + return shapeless(new ItemStack(rock), new ItemStack(Blocks.VINE)); + } + if ("andesite".equals(name)) { + return shapeless(new ItemStack(Blocks.DIORITE), new ItemStack(rock)); + } + + String[] pattern; + Map ingredients = new LinkedHashMap(); + ingredients.put('#', rock); + switch (name) { + case "furnace": pattern = new String[] { "###", "# #", "###" }; break; + case "brewing_stand": + pattern = new String[] { " B ", "###" }; + ingredients.put('B', net.minecraft.item.Items.BLAZE_ROD); + break; + case "lever": + pattern = new String[] { "X", "#" }; + ingredients.put('X', net.minecraft.item.Items.STICK); + break; + case "piston": + pattern = new String[] { "TTT", "#X#", "#R#" }; + ingredients.put('T', Blocks.OAK_PLANKS.asItem()); + ingredients.put('X', net.minecraft.item.Items.IRON_INGOT); + ingredients.put('R', net.minecraft.item.Items.REDSTONE); + break; + case "dispenser": + pattern = new String[] { "###", "#X#", "#R#" }; + ingredients.put('X', net.minecraft.item.Items.BOW); + ingredients.put('R', net.minecraft.item.Items.REDSTONE); + break; + case "dropper": + pattern = new String[] { "###", "# #", "#R#" }; + ingredients.put('R', net.minecraft.item.Items.REDSTONE); + break; + case "observer": + pattern = new String[] { "###", "RRQ", "###" }; + ingredients.put('R', net.minecraft.item.Items.REDSTONE); + ingredients.put('Q', net.minecraft.item.Items.QUARTZ); + break; + case "diorite": + pattern = new String[] { "CQ", "QC" }; + ingredients.put('C', rock); + ingredients.put('Q', net.minecraft.item.Items.QUARTZ); + break; + case "stone_axe": pattern = new String[] { "XX", "X#", " #" }; ingredients.put('X', rock); ingredients.put('#', net.minecraft.item.Items.STICK); break; + case "stone_hoe": pattern = new String[] { "XX", " #", " #" }; ingredients.put('X', rock); ingredients.put('#', net.minecraft.item.Items.STICK); break; + case "stone_pickaxe": pattern = new String[] { "XXX", " # ", " # " }; ingredients.put('X', rock); ingredients.put('#', net.minecraft.item.Items.STICK); break; + case "stone_shovel": pattern = new String[] { "X", "#", "#" }; ingredients.put('X', rock); ingredients.put('#', net.minecraft.item.Items.STICK); break; + case "stone_sword": pattern = new String[] { "X", "X", "#" }; ingredients.put('X', rock); ingredients.put('#', net.minecraft.item.Items.STICK); break; + default: throw new IllegalArgumentException(name); + } + return shaped(pattern, ingredients); + } + + private static CraftingInventory shaped(String[] pattern, Map ingredients) { + CraftingInventory inventory = new CraftingInventory(DUMMY_CONTAINER, 3, 3); + for (int row = 0; row < pattern.length; row++) { + for (int column = 0; column < pattern[row].length(); column++) { + Item item = ingredients.get(pattern[row].charAt(column)); + if (item != null) inventory.setInventorySlotContents(row * 3 + column, new ItemStack(item)); + } + } + return inventory; + } + + private static CraftingInventory shapeless(ItemStack... stacks) { + CraftingInventory inventory = new CraftingInventory(DUMMY_CONTAINER, 3, 3); + for (int index = 0; index < stacks.length; index++) inventory.setInventorySlotContents(index, stacks[index]); + return inventory; + } + + private static String[] recipeNames() { + return new String[] { "furnace", "brewing_stand", "lever", "piston", "dispenser", + "dropper", "observer", "mossy_cobblestone", "andesite", "diorite", + "stone_axe", "stone_hoe", "stone_pickaxe", "stone_shovel", "stone_sword" }; + } + + private static JsonObject json(File file) throws Exception { + try (Reader reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { + return new JsonParser().parse(reader).getAsJsonObject(); + } + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java index 692dbdabf..275ad1476 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java @@ -225,16 +225,26 @@ public void acceptedRecipeDetailsArePresent() throws Exception { assertEquals("minecraft:furnace", furnace.getAsJsonObject("key") .getAsJsonObject("y").get("item").getAsString()); assertFalse(new File(recipes, "basalt_furnace_from_rock.json").exists()); - JsonObject vanillaFurnace = json(new File(ROOT, "data/minecraft/recipes/furnace.json")); - assertEquals("forge:cobblestone", vanillaFurnace.getAsJsonObject("key") + JsonObject furnaceOverride = json(new File(ROOT, "data/minecraft/recipes/furnace.json")); + JsonObject vanillaFurnace = conditionalRecipe(furnaceOverride, 0); + assertEquals("mineralogy:stone_crafting_materials", vanillaFurnace.getAsJsonObject("key") .getAsJsonObject("#").get("tag").getAsString()); - assertFalse(new File(ROOT, "data/minecraft/recipes/stone_pickaxe.json").exists()); + assertEquals("minecraft:stone_crafting_materials", conditionalRecipe(furnaceOverride, 1) + .getAsJsonObject("key").getAsJsonObject("#").get("tag").getAsString()); + assertEquals("COBBLESTONE_EQUIVILENT", furnaceOverride.getAsJsonArray("recipes").get(0) + .getAsJsonObject().getAsJsonArray("conditions").get(0).getAsJsonObject() + .get("flag").getAsString()); + assertTrue(new File(ROOT, "data/minecraft/recipes/stone_pickaxe.json").isFile()); assertEquals("#forge:cobblestone", json(new File(ROOT, "data/minecraft/tags/items/stone_crafting_materials.json")) .getAsJsonArray("values").get(0).getAsString()); assertEquals("#forge:cobblestone", json(new File(ROOT, "data/minecraft/tags/items/stone_tool_materials.json")) .getAsJsonArray("values").get(0).getAsString()); + assertTagValues(new File(ROOT, "data/forge/tags/items/cobblestone.json"), + "mineralogy:chert", "mineralogy:pumice"); + assertTagValues(new File(ROOT, "data/forge/tags/blocks/cobblestone.json"), + "mineralogy:chert", "mineralogy:pumice"); assertFalse(new File(ROOT, "data/mineralogy/tags/items/vanilla_furnace_materials.json").exists()); assertEquals("minecraft:red_dye", json(new File(recipes, "drywall_red.json")) .getAsJsonArray("ingredients").get(1).getAsJsonObject().get("item").getAsString()); @@ -302,18 +312,103 @@ public void forge36ResourcesRetainNativeWallsTagsAndPackFormat() throws Exceptio File minecraftRecipes = new File(ROOT, "data/minecraft/recipes"); File[] overrides = minecraftRecipes.listFiles((dir, name) -> name.endsWith(".json")); assertNotNull(overrides); - assertEquals(5, overrides.length); + assertEquals(34, overrides.length); Set overrideNames = new HashSet(); for (File override : overrides) overrideNames.add(override.getName()); - assertEquals(new HashSet(Arrays.asList("furnace.json", + Set expected = new HashSet(Arrays.asList( + "furnace.json", "brewing_stand.json", "lever.json", "piston.json", + "dispenser.json", "dropper.json", "observer.json", "mossy_cobblestone.json", + "andesite.json", "diorite.json", "stone_axe.json", "stone_hoe.json", + "stone_pickaxe.json", "stone_shovel.json", "stone_sword.json", "polished_andesite.json", "polished_basalt.json", - "polished_diorite.json", "polished_granite.json")), overrideNames); + "polished_diorite.json", "polished_granite.json")); + for (String family : Arrays.asList("andesite", "diorite", "granite")) { + expected.add(family + "_slab.json"); + expected.add("polished_" + family + "_slab.json"); + expected.add(family + "_slab_from_" + family + "_stonecutting.json"); + expected.add("polished_" + family + "_slab_from_" + family + "_stonecutting.json"); + expected.add("polished_" + family + "_slab_from_polished_" + family + + "_stonecutting.json"); + } + assertEquals(expected, overrideNames); File[] stonecutting = new File(ROOT, "data/mineralogy/recipes") .listFiles((dir, name) -> name.contains("stonecutting")); assertNotNull(stonecutting); assertEquals(0, stonecutting.length); } + @Test + public void nativeSlabsAndCobblestoneOverridesUseStableConditionalTags() throws Exception { + for (String family : Arrays.asList("andesite", "diorite", "granite")) { + assertNativeSlabOverride(family + "_slab", "minecraft:" + family, + "mineralogy:" + family + "_slab", "minecraft:" + family + "_slab", 6); + assertNativeSlabOverride("polished_" + family + "_slab", + "minecraft:polished_" + family, "mineralogy:" + family + "_smooth_slab", + "minecraft:polished_" + family + "_slab", 6); + assertNativeStonecuttingOverride(family + "_slab_from_" + family + "_stonecutting", + "minecraft:" + family, "mineralogy:" + family + "_slab", + "minecraft:" + family + "_slab"); + assertNativeStonecuttingOverride("polished_" + family + "_slab_from_" + family + + "_stonecutting", "minecraft:" + family, + "mineralogy:" + family + "_smooth_slab", + "minecraft:polished_" + family + "_slab"); + assertNativeStonecuttingOverride("polished_" + family + "_slab_from_polished_" + + family + "_stonecutting", "minecraft:polished_" + family, + "mineralogy:" + family + "_smooth_slab", + "minecraft:polished_" + family + "_slab"); + } + + assertCompositeRockTag("cobblestone_equivalents", "#forge:cobblestone"); + assertCompositeRockTag("stone_crafting_materials", "#minecraft:stone_crafting_materials"); + assertCompositeRockTag("stone_tool_materials", "#minecraft:stone_tool_materials"); + for (String family : rockFamilies()) { + File blockTag = new File(ROOT, "data/mineralogy/tags/blocks/stones/" + family + ".json"); + assertTrue(family, blockTag.isFile()); + assertTrue(family, json(blockTag).getAsJsonArray("values").toString() + .contains("mineralogy:" + family)); + } + assertTagValues(new File(ROOT, "data/mineralogy/tags/blocks/stones/basalt.json"), + "mineralogy:basalt", "minecraft:basalt"); + + File advancementRoot = new File(ROOT, "data/minecraft/advancements/recipes"); + assertEquals(19, countJsonFiles(advancementRoot)); + JsonObject furnace = json(new File(advancementRoot, "decorations/furnace.json")); + assertEquals("mineralogy:stone_crafting_materials", conditionalAdvancement(furnace, 0) + .getAsJsonObject("criteria").getAsJsonObject("has_cobblestone") + .getAsJsonObject("conditions").getAsJsonArray("items").get(0) + .getAsJsonObject().get("tag").getAsString()); + assertEquals("minecraft:stone_crafting_materials", conditionalAdvancement(furnace, 1) + .getAsJsonObject("criteria").getAsJsonObject("has_cobblestone") + .getAsJsonObject("conditions").getAsJsonArray("items").get(0) + .getAsJsonObject().get("tag").getAsString()); + + Object[][] advancementContracts = { + { "decorations/furnace", "has_cobblestone", "tag", + "mineralogy:stone_crafting_materials", "minecraft:stone_crafting_materials" }, + { "brewing/brewing_stand", "has_blaze_rod", "item", + "minecraft:blaze_rod", "minecraft:blaze_rod" }, + { "redstone/lever", "has_cobblestone", "tag", + "mineralogy:cobblestone_equivalents", "forge:cobblestone" }, + { "redstone/piston", "has_redstone", "item", "minecraft:redstone", "minecraft:redstone" }, + { "redstone/dispenser", "has_bow", "item", "minecraft:bow", "minecraft:bow" }, + { "redstone/dropper", "has_redstone", "item", "minecraft:redstone", "minecraft:redstone" }, + { "redstone/observer", "has_quartz", "item", "minecraft:quartz", "minecraft:quartz" }, + { "building_blocks/mossy_cobblestone", "has_vine", "item", "minecraft:vine", "minecraft:vine" }, + { "building_blocks/andesite", "has_stone", "item", "minecraft:diorite", "minecraft:diorite" }, + { "building_blocks/diorite", "has_quartz", "item", "minecraft:quartz", "minecraft:quartz" }, + { "tools/stone_axe", "has_cobblestone", "tag", "mineralogy:stone_tool_materials", "minecraft:stone_tool_materials" }, + { "tools/stone_hoe", "has_cobblestone", "tag", "mineralogy:stone_tool_materials", "minecraft:stone_tool_materials" }, + { "tools/stone_pickaxe", "has_cobblestone", "tag", "mineralogy:stone_tool_materials", "minecraft:stone_tool_materials" }, + { "tools/stone_shovel", "has_cobblestone", "tag", "mineralogy:stone_tool_materials", "minecraft:stone_tool_materials" }, + { "combat/stone_sword", "has_cobblestone", "tag", "mineralogy:stone_tool_materials", "minecraft:stone_tool_materials" } + }; + for (Object[] contract : advancementContracts) { + assertConditionalAdvancement(new File(advancementRoot, contract[0] + ".json"), + (String) contract[1], (String) contract[2], (String) contract[3], + (String) contract[4]); + } + } + @Test public void oilAndBuildMetadataUseStableTargetIdentities() throws Exception { String properties = new String(Files.readAllBytes(new File("gradle.properties").toPath()), StandardCharsets.UTF_8); @@ -395,6 +490,99 @@ private static void assertAdvancementIngredient(String recipeName, String key, S assertEquals(recipeName, 1, ingredient.size()); } + private static void assertNativeSlabOverride(String recipeName, String source, + String mineralogyResult, String vanillaResult, int count) throws Exception { + JsonObject wrapper = json(new File(ROOT, "data/minecraft/recipes/" + recipeName + ".json")); + assertEquals(recipeName, "forge:conditional", wrapper.get("type").getAsString()); + JsonObject enabled = conditionalRecipe(wrapper, 0); + JsonObject fallback = conditionalRecipe(wrapper, 1); + assertEquals(recipeName, source, enabled.getAsJsonObject("key") + .getAsJsonObject("#").get("item").getAsString()); + assertEquals(recipeName, mineralogyResult, + enabled.getAsJsonObject("result").get("item").getAsString()); + assertEquals(recipeName, vanillaResult, + fallback.getAsJsonObject("result").get("item").getAsString()); + assertEquals(recipeName, count, + enabled.getAsJsonObject("result").get("count").getAsInt()); + } + + private static void assertNativeStonecuttingOverride(String recipeName, String source, + String mineralogyResult, String vanillaResult) throws Exception { + JsonObject wrapper = json(new File(ROOT, "data/minecraft/recipes/" + recipeName + ".json")); + JsonObject enabled = conditionalRecipe(wrapper, 0); + JsonObject fallback = conditionalRecipe(wrapper, 1); + assertEquals(recipeName, "minecraft:stonecutting", enabled.get("type").getAsString()); + assertEquals(recipeName, source, + enabled.getAsJsonObject("ingredient").get("item").getAsString()); + assertEquals(recipeName, mineralogyResult, enabled.get("result").getAsString()); + assertEquals(recipeName, vanillaResult, fallback.get("result").getAsString()); + assertEquals(recipeName, 2, enabled.get("count").getAsInt()); + } + + private static void assertCompositeRockTag(String name, String baseTag) throws Exception { + JsonArray values = json(new File(ROOT, + "data/mineralogy/tags/items/" + name + ".json")).getAsJsonArray("values"); + assertEquals(name, 28, values.size()); + assertEquals(name, baseTag, values.get(0).getAsString()); + for (int index = 0; index < rockFamilies().size(); index++) { + assertEquals(name, "#mineralogy:stones/" + rockFamilies().get(index), + values.get(index + 1).getAsString()); + } + } + + private static List rockFamilies() { + return Arrays.asList("andesite", "basalt", "diorite", "granite", "rhyolite", + "pegmatite", "diabase", "gabbro", "peridotite", "basaltic_glass", + "scoria", "tuff", "shale", "conglomerate", "dolomite", "limestone", + "siltstone", "marble", "slate", "schist", "gneiss", "phyllite", + "amphibolite", "hornfels", "quartzite", "novaculite", "rock_salt"); + } + + private static JsonObject conditionalRecipe(JsonObject wrapper, int index) { + return wrapper.getAsJsonArray("recipes").get(index).getAsJsonObject() + .getAsJsonObject("recipe"); + } + + private static JsonObject conditionalAdvancement(JsonObject wrapper, int index) { + return wrapper.getAsJsonArray("advancements").get(index).getAsJsonObject() + .getAsJsonObject("advancement"); + } + + private static void assertConditionalAdvancement(File file, String criterion, String key, + String enabledValue, String fallbackValue) throws Exception { + JsonObject wrapper = json(file); + assertEquals(file.getPath(), 2, wrapper.getAsJsonArray("advancements").size()); + assertEquals(file.getPath(), "mineralogy:config", wrapper.getAsJsonArray("advancements") + .get(0).getAsJsonObject().getAsJsonArray("conditions").get(0) + .getAsJsonObject().get("type").getAsString()); + assertEquals(file.getPath(), "forge:not", wrapper.getAsJsonArray("advancements") + .get(1).getAsJsonObject().getAsJsonArray("conditions").get(0) + .getAsJsonObject().get("type").getAsString()); + for (int branch = 0; branch < 2; branch++) { + JsonObject advancement = conditionalAdvancement(wrapper, branch); + JsonObject ingredient = advancement.getAsJsonObject("criteria") + .getAsJsonObject(criterion).getAsJsonObject("conditions") + .getAsJsonArray("items").get(0).getAsJsonObject(); + assertEquals(file.getPath(), branch == 0 ? enabledValue : fallbackValue, + ingredient.get(key).getAsString()); + JsonArray requirements = advancement.getAsJsonArray("requirements"); + assertEquals(file.getPath(), 1, requirements.size()); + assertTrue(file.getPath(), requirements.get(0).isJsonArray()); + assertEquals(file.getPath(), 2, requirements.get(0).getAsJsonArray().size()); + } + } + + private static int countJsonFiles(File directory) { + File[] children = directory.listFiles(); + if (children == null) return 0; + int count = 0; + for (File child : children) { + if (child.isDirectory()) count += countJsonFiles(child); + else if (child.getName().endsWith(".json")) count++; + } + return count; + } + private static JsonObject json(File file) throws Exception { try (java.io.Reader reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { return new JsonParser().parse(reader).getAsJsonObject(); From a9b0d24a4b1b70b62365e6d0a49eea028b096111 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 27 Aug 2026 21:55:15 +0100 Subject: [PATCH 07/10] Add reversible native slab compatibility recipes --- CHANGELOG.txt | 9 ++-- build.gradle | 25 ++++++++- docs/CONTENT_CONFIG.md | 12 +++-- docs/DEVELOPER_GUIDE.md | 24 ++++++--- docs/PLAYER_GUIDE.md | 7 +++ scripts/generate-recipes.ps1 | 23 +++++++- .../recipes/andesite_slab_from_vanilla.json | 41 +++++++++++++++ .../recipes/andesite_slab_to_vanilla.json | 41 +++++++++++++++ .../andesite_smooth_slab_from_vanilla.json | 41 +++++++++++++++ .../andesite_smooth_slab_to_vanilla.json | 41 +++++++++++++++ .../recipes/diorite_slab_from_vanilla.json | 41 +++++++++++++++ .../recipes/diorite_slab_to_vanilla.json | 41 +++++++++++++++ .../diorite_smooth_slab_from_vanilla.json | 41 +++++++++++++++ .../diorite_smooth_slab_to_vanilla.json | 41 +++++++++++++++ .../recipes/granite_slab_from_vanilla.json | 41 +++++++++++++++ .../recipes/granite_slab_to_vanilla.json | 41 +++++++++++++++ .../granite_smooth_slab_from_vanilla.json | 41 +++++++++++++++ .../granite_smooth_slab_to_vanilla.json | 41 +++++++++++++++ .../recipes/andesite_slab_from_vanilla.json | 22 ++++++++ .../recipes/andesite_slab_to_vanilla.json | 22 ++++++++ .../andesite_smooth_slab_from_vanilla.json | 22 ++++++++ .../andesite_smooth_slab_to_vanilla.json | 22 ++++++++ .../recipes/diorite_slab_from_vanilla.json | 22 ++++++++ .../recipes/diorite_slab_to_vanilla.json | 22 ++++++++ .../diorite_smooth_slab_from_vanilla.json | 22 ++++++++ .../diorite_smooth_slab_to_vanilla.json | 22 ++++++++ .../recipes/granite_slab_from_vanilla.json | 22 ++++++++ .../recipes/granite_slab_to_vanilla.json | 22 ++++++++ .../granite_smooth_slab_from_vanilla.json | 22 ++++++++ .../granite_smooth_slab_to_vanilla.json | 22 ++++++++ .../mineralogy/NativeRecipeManagerTest.java | 52 +++++++++++++++++++ .../mc/mineralogy/ResourceContractTest.java | 35 ++++++++++++- 32 files changed, 925 insertions(+), 18 deletions(-) create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_from_vanilla.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_to_vanilla.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_from_vanilla.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_to_vanilla.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_from_vanilla.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_to_vanilla.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_from_vanilla.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_to_vanilla.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_slab_from_vanilla.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_slab_to_vanilla.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_from_vanilla.json create mode 100644 src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_to_vanilla.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_slab_from_vanilla.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_slab_to_vanilla.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_from_vanilla.json create mode 100644 src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_to_vanilla.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_slab_from_vanilla.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_slab_to_vanilla.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_from_vanilla.json create mode 100644 src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_to_vanilla.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_slab_from_vanilla.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_slab_to_vanilla.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_smooth_slab_from_vanilla.json create mode 100644 src/main/resources/data/mineralogy/recipes/granite_smooth_slab_to_vanilla.json diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3efd32759..27a6da48d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -32,7 +32,7 @@ Mineralogy 6.0.1.116051 for Minecraft 1.16.5 - Preserved rock-furnace save recovery and novaculite's 3/15/1 properties; corrected replacement drop semantics and exact full-block Silk Touch results for double slabs. -- Ported the accepted recipe contract as 1,415 native JSON recipes and matching +- Ported the accepted recipe contract as 1,427 native JSON recipes and matching advancements: safe 4-to-1 mineral packing, charcoal and Base Metals dust gunpowder routes, exact slabs, slab recombination, construction-form brick conversions, progressive sand polishing, matching-slab rock furnaces, and @@ -45,8 +45,11 @@ Mineralogy 6.0.1.116051 for Minecraft 1.16.5 the 2x2 recipes remain available for Mineralogy bricks. The six shared andesite, diorite and granite slab recipes plus all nine matching stonecutter routes now produce Mineralogy's more capable slabs, while the vanilla slabs - remain registered and tag-compatible. Recipe advancements use the same exact - item or family tag as the recipe they reveal. + remain registered and tag-compatible. Twelve exact shapeless compatibility + recipes convert each raw or polished Mineralogy slab to its matching vanilla + slab and back at a lossless 1:1 ratio for modpacks that require an exact + vanilla item. Recipe advancements use the same exact item or family tag as + the recipe they reveal. - Extended Minecraft 1.16's native stone crafting and tool-material tags so every enabled cobblestone equivalent, including all 27 legacy rock families and target-native aliases, works in the complete vanilla contract. Fifteen diff --git a/build.gradle b/build.gradle index 7a87e25e5..2c79a2d53 100644 --- a/build.gradle +++ b/build.gradle @@ -480,8 +480,29 @@ tasks.register('verifyReleaseArtifacts') { !it.substring(recipePrefix.length()).contains('/') } def advancements = names.findAll { it.startsWith(advancementPrefix) && it.endsWith('.json') && !it.substring(advancementPrefix.length()).contains('/') } - if (recipes.size() != 1415 || advancements.size() != 1415) { - throw new GradleException("Release jar must contain 1415 recipes and advancements, found ${recipes.size()} and ${advancements.size()}") + if (recipes.size() != 1427 || advancements.size() != 1427) { + throw new GradleException("Release jar must contain 1427 recipes and advancements, found ${recipes.size()} and ${advancements.size()}") + } + def slabBridges = ['andesite', 'diorite', 'granite'].collectMany { family -> + [ + [name: "${family}_slab_to_vanilla", source: "mineralogy:${family}_slab", result: "minecraft:${family}_slab"], + [name: "${family}_slab_from_vanilla", source: "minecraft:${family}_slab", result: "mineralogy:${family}_slab"], + [name: "${family}_smooth_slab_to_vanilla", source: "mineralogy:${family}_smooth_slab", result: "minecraft:polished_${family}_slab"], + [name: "${family}_smooth_slab_from_vanilla", source: "minecraft:polished_${family}_slab", result: "mineralogy:${family}_smooth_slab"] + ] + } + slabBridges.each { bridge -> + def recipe = new JsonSlurper().parse(zip.getInputStream(zip.getEntry( + "data/mineralogy/recipes/${bridge.name}.json"))) + def advancement = new JsonSlurper().parse(zip.getInputStream(zip.getEntry( + "data/mineralogy/advancements/recipes/${bridge.name}.json"))) + if (recipe.type != 'minecraft:crafting_shapeless' || recipe.ingredients?.size() != 1 || + recipe.ingredients[0].item != bridge.source || recipe.result?.item != bridge.result || + recipe.result?.count != 1 || recipe.conditions?.size() != 2 || + advancement.conditions != recipe.conditions || + advancement.criteria?.has_rock?.conditions?.items?.getAt(0)?.item != bridge.source) { + throw new GradleException("Invalid native/Mineralogy slab conversion: ${bridge.name}") + } } def minecraftRecipes = names.findAll { it.startsWith('data/minecraft/recipes/') && it.endsWith('.json') } def cobblestoneOverrides = ['furnace', 'brewing_stand', 'lever', 'piston', diff --git a/docs/CONTENT_CONFIG.md b/docs/CONTENT_CONFIG.md index a6a6ec491..6490be204 100644 --- a/docs/CONTENT_CONFIG.md +++ b/docs/CONTENT_CONFIG.md @@ -67,10 +67,16 @@ GROUP_TABS_BY_TYPE = true With `COBBLESTONE_EQUIVILENT=true`, all 27 raw Mineralogy rock families, including rock salt, participate in Forge `cobblestone` tag recipes such as levers, pistons, dispensers, droppers, and brewing stands. Setting it to -`false` removes only that broad identity. Rocks remain `stone`, retain their -material-specific tags, make stone tools and furnaces, and use exact +`false` removes ordinary rocks from the fifteen covered cobblestone, stone-tool, +and stone-crafting recipes while restoring their target-native ingredients. +Rocks remain `stone`, retain their material-specific tags, and use exact Mineralogy slab, stair, and wall recipes. Chert and pumice remain historical -unconditional cobblestone equivalents. +unconditional cobblestone equivalents and therefore keep those recipe roles. + +The configurable cobblestone identity does not affect the exact 1:1 conversion +between Mineralogy and vanilla andesite, diorite, granite, and matching polished +slabs. These reversible recipes preserve modpack compatibility with recipes that +require either registry identity. ## Disabling Mineralogy ores diff --git a/docs/DEVELOPER_GUIDE.md b/docs/DEVELOPER_GUIDE.md index 163af9d68..5b4b172d6 100644 --- a/docs/DEVELOPER_GUIDE.md +++ b/docs/DEVELOPER_GUIDE.md @@ -47,11 +47,13 @@ mods' members, updates the exact tag instances retained by parsed recipes, then invalidates recipe ingredient caches. The nested Minecraft crafting and tool tags are updated alongside the direct Forge tag. -The vanilla furnace recipe is one required exception: it is packaged at -`data/minecraft/recipes/furnace.json` with a direct `forge:cobblestone` -ingredient. Forge 36's already-resolved nested crafting-material tag does not -observe a replacement tag collection, so Mineralogy mutates retained tag -instances rather than swapping the collection. +Fifteen vanilla recipes and their advancements use conditional JSON overrides +for the complete exact-cobblestone, stone-crafting-material, and +stone-tool-material contracts. Enabled branches use stable Mineralogy union +tags; disabled branches restore the target-native ingredients. Forge 36's +already-resolved nested tags do not observe a replacement tag collection, so +Mineralogy also mutates retained tag instances rather than swapping the +collection. Minecraft 1.16 also owns andesite, basalt, diorite, granite, and their polished full blocks. Mineralogy's family tags include both native and retained legacy @@ -69,6 +71,13 @@ its raw and polished family tags safely feed Mineralogy slabs, stairs, and walls. Polished andesite/diorite/granite have no native walls, so those three Mineralogy wall recipes may also accept the matching family tag. +The six shared raw/polished slab crafting recipes and nine corresponding +stonecutting routes deliberately output Mineralogy's upright-capable slabs. +Twelve exact shapeless recipes provide reversible 1:1 conversion between those +Mineralogy slabs and their retained vanilla counterparts. This preserves exact +item compatibility for other mods without allowing a normal crafting or +stonecutting route to prefer the less capable slab. + Use broad `stone` or `cobblestone` inputs only when any matching material is valid. Recipes returning a Mineralogy construction form must use the exact material and finish so basalt cannot produce a different rock's slab or wall. @@ -78,8 +87,9 @@ material and finish so basalt cannot produce a different rock's slab or wall. All Mineralogy recipes are native Minecraft/Forge 1.16.5 JSON under `data/mineralogy/recipes/`. Run `scripts/generate-recipes.ps1` after changing the recipe matrix; it generates the 27 stone families and global recipes, the -four target-native polished-block recipe/advancement overrides, then retains -the target-native smelting data. Every Mineralogy recipe has a matching unlock +native slab/stonecutting overrides and compatibility conversions, and the four +target-native polished-block recipe/advancement overrides, then retains the +target-native smelting data. Every Mineralogy recipe has a matching unlock advancement with the same Forge conditions and the same exact-item or family-tag material predicate as the recipe. Unlocks use direct inventory ingredients instead of listening to other recipe unlocks, which would diff --git a/docs/PLAYER_GUIDE.md b/docs/PLAYER_GUIDE.md index 5543319f0..945f6dc3f 100644 --- a/docs/PLAYER_GUIDE.md +++ b/docs/PLAYER_GUIDE.md @@ -45,6 +45,13 @@ Raw Mineralogy rocks work in broad stone recipes. With Exact Mineralogy rocks still make their matching Mineralogy slabs, stairs, and walls. +Minecraft also has its own andesite, diorite, granite, polished-andesite, +polished-diorite, and polished-granite slabs. Normal crafting and stonecutting +produce Mineralogy's upright-capable versions. If another mod requires the +exact Minecraft slab item, place one matching Mineralogy slab by itself in a +crafting grid to convert it 1:1; placing the vanilla slab by itself converts it +back without loss. + Because raw rocks are cobblestone equivalents, eight raw Mineralogy rocks around an empty crafting-grid centre make a normal Minecraft furnace. A Mineralogy rock furnace is an upgrade recipe: surround an existing Minecraft diff --git a/scripts/generate-recipes.ps1 b/scripts/generate-recipes.ps1 index 4bc6277af..3117edc3d 100644 --- a/scripts/generate-recipes.ps1 +++ b/scripts/generate-recipes.ps1 @@ -1035,6 +1035,26 @@ function Write-NativeSlabOverrides() { } } +function Write-NativeSlabConversions() { + foreach ($family in @('andesite', 'diorite', 'granite')) { + foreach ($finish in @( + @{ name = 'raw'; mineralogy = "mineralogy:${family}_slab"; vanilla = "minecraft:${family}_slab" }, + @{ name = 'smooth'; mineralogy = "mineralogy:${family}_smooth_slab"; vanilla = "minecraft:polished_${family}_slab" } + )) { + $prefix = if ($finish.name -eq 'raw') { "${family}_slab" } else { "${family}_smooth_slab" } + $conditions = @((ItemCondition $finish.mineralogy), (ItemCondition $finish.vanilla)) + + Write-ShapelessRecipe "${prefix}_to_vanilla" 'minecraft:crafting_shapeless' ` + @((ItemIngredient $finish.mineralogy)) $finish.vanilla 1 $conditions + Register-UnlockSource "${prefix}_to_vanilla" $finish.mineralogy + + Write-ShapelessRecipe "${prefix}_from_vanilla" 'minecraft:crafting_shapeless' ` + @((ItemIngredient $finish.vanilla)) $finish.mineralogy 1 $conditions + Register-UnlockSource "${prefix}_from_vanilla" $finish.vanilla + } + } +} + function Write-NativePolishedOverrides() { New-Item -ItemType Directory -Force -Path $minecraftRecipeRoot | Out-Null $minecraftBuildingAdvancementRoot = Join-Path $minecraftAdvancementRoot 'building_blocks' @@ -1086,9 +1106,10 @@ foreach ($family in $families) { Write-ReliefRecipes $family Write-ConstructionRecipes $family } +Write-NativeSlabConversions Write-GlobalRecipes -$expectedRecipeCount = ($families.Count * 50) + 37 +$expectedRecipeCount = ($families.Count * 50) + 49 if ($generatedNames.Count -ne $expectedRecipeCount) { throw "Expected $expectedRecipeCount generated recipes, produced $($generatedNames.Count)" } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_from_vanilla.json new file mode 100644 index 000000000..9e67eb1ca --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_from_vanilla.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:andesite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_to_vanilla.json new file mode 100644 index 000000000..9753e2017 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_to_vanilla.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_from_vanilla.json new file mode 100644 index 000000000..304945bf7 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_from_vanilla.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_andesite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:polished_andesite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_to_vanilla.json new file mode 100644 index 000000000..4c0245694 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_to_vanilla.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_andesite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:andesite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_from_vanilla.json new file mode 100644 index 000000000..7fe145be2 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_from_vanilla.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:diorite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_to_vanilla.json new file mode 100644 index 000000000..213dff2ac --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_to_vanilla.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_from_vanilla.json new file mode 100644 index 000000000..8a165f90b --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_from_vanilla.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_diorite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:polished_diorite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_to_vanilla.json new file mode 100644 index 000000000..0f870d35d --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_to_vanilla.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_diorite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:diorite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_from_vanilla.json new file mode 100644 index 000000000..bc3a94b46 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_from_vanilla.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:granite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_to_vanilla.json new file mode 100644 index 000000000..bad86ccf8 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_to_vanilla.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_from_vanilla.json new file mode 100644 index 000000000..4c6781146 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_from_vanilla.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_granite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:polished_granite_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_to_vanilla.json new file mode 100644 index 000000000..37ecdd660 --- /dev/null +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_to_vanilla.json @@ -0,0 +1,41 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_granite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "mineralogy:granite_smooth_slab" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/andesite_slab_from_vanilla.json new file mode 100644 index 000000000..c676332a5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_slab_from_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:andesite_slab" + } + ], + "result": { + "item": "mineralogy:andesite_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/andesite_slab_to_vanilla.json new file mode 100644 index 000000000..357f28a6c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_slab_to_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_slab" + } + ], + "result": { + "item": "minecraft:andesite_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_from_vanilla.json new file mode 100644 index 000000000..1a82652a5 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_from_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_andesite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:polished_andesite_slab" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_to_vanilla.json new file mode 100644 index 000000000..6d793ff4e --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_to_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_andesite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_smooth_slab" + } + ], + "result": { + "item": "minecraft:polished_andesite_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/diorite_slab_from_vanilla.json new file mode 100644 index 000000000..b426543bb --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_slab_from_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:diorite_slab" + } + ], + "result": { + "item": "mineralogy:diorite_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/diorite_slab_to_vanilla.json new file mode 100644 index 000000000..7501edb97 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_slab_to_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_slab" + } + ], + "result": { + "item": "minecraft:diorite_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_from_vanilla.json new file mode 100644 index 000000000..09064721c --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_from_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_diorite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:polished_diorite_slab" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_to_vanilla.json new file mode 100644 index 000000000..ef4cd7895 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_to_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_diorite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_smooth_slab" + } + ], + "result": { + "item": "minecraft:polished_diorite_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/granite_slab_from_vanilla.json new file mode 100644 index 000000000..78767e690 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_slab_from_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:granite_slab" + } + ], + "result": { + "item": "mineralogy:granite_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/granite_slab_to_vanilla.json new file mode 100644 index 000000000..09fe09128 --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_slab_to_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_slab" + } + ], + "result": { + "item": "minecraft:granite_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_from_vanilla.json new file mode 100644 index 000000000..fa67f5b6f --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_from_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_granite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:polished_granite_slab" + } + ], + "result": { + "item": "mineralogy:granite_smooth_slab", + "count": 1 + } +} diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_to_vanilla.json new file mode 100644 index 000000000..1eb64b6ca --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_to_vanilla.json @@ -0,0 +1,22 @@ +{ + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_granite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_smooth_slab" + } + ], + "result": { + "item": "minecraft:polished_granite_slab", + "count": 1 + } +} diff --git a/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java b/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java index 29f45b0dc..5b7a17c2a 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java @@ -43,6 +43,8 @@ /** Exercises generated overrides through Forge conditions and Minecraft's recipe deserializers. */ public class NativeRecipeManagerTest { private static final File RECIPE_ROOT = new File("src/main/resources/data/minecraft/recipes"); + private static final File MINERALOGY_RECIPE_ROOT = new File( + "src/main/resources/data/mineralogy/recipes"); private static final Container DUMMY_CONTAINER = new Container(null, -1) { @Override public boolean canInteractWith(PlayerEntity playerIn) { @@ -96,6 +98,38 @@ public void disabledEquivalenceRejectsBasaltButKeepsVanillaMaterials() throws Ex } } + @Test + public void nativeAndMineralogySlabsConvertExactlyOneForOneInBothDirections() + throws Exception { + Object[][] bridges = { + { "andesite_slab", Blocks.ANDESITE_SLAB.asItem() }, + { "andesite_smooth_slab", Blocks.POLISHED_ANDESITE_SLAB.asItem() }, + { "diorite_slab", Blocks.DIORITE_SLAB.asItem() }, + { "diorite_smooth_slab", Blocks.POLISHED_DIORITE_SLAB.asItem() }, + { "granite_slab", Blocks.GRANITE_SLAB.asItem() }, + { "granite_smooth_slab", Blocks.POLISHED_GRANITE_SLAB.asItem() } + }; + for (Object[] bridge : bridges) { + assertSlabConversion((String) bridge[0], (Item) bridge[1]); + } + } + + private static void assertSlabConversion(String prefix, Item vanilla) + throws Exception { + Item standIn = Blocks.COBBLESTONE.asItem(); + ICraftingRecipe toVanilla = mineralogyRecipe(prefix + "_to_vanilla", standIn); + assertTrue(prefix, toVanilla.matches(shapeless(new ItemStack(standIn)), null)); + assertFalse(prefix, toVanilla.matches(shapeless(new ItemStack(vanilla)), null)); + assertEquals(prefix, vanilla, toVanilla.getRecipeOutput().getItem()); + assertEquals(prefix, 1, toVanilla.getRecipeOutput().getCount()); + + ICraftingRecipe fromVanilla = mineralogyRecipe(prefix + "_from_vanilla", standIn); + assertTrue(prefix, fromVanilla.matches(shapeless(new ItemStack(vanilla)), null)); + assertFalse(prefix, fromVanilla.matches(shapeless(new ItemStack(standIn)), null)); + assertEquals(prefix, standIn, fromVanilla.getRecipeOutput().getItem()); + assertEquals(prefix, 1, fromVanilla.getRecipeOutput().getCount()); + } + private static void installRecipeTags() { Map> tags = new LinkedHashMap>(); tags.put(id("forge:cobblestone"), tag(Blocks.COBBLESTONE.asItem())); @@ -146,6 +180,24 @@ private static ICraftingRecipe recipe(String name) throws Exception { return (ICraftingRecipe) deserialized; } + private static ICraftingRecipe mineralogyRecipe(String name, Item mineralogyStandIn) + throws Exception { + JsonObject data = json(new File(MINERALOGY_RECIPE_ROOT, name + ".json")); + String standInId = mineralogyStandIn.getRegistryName().toString(); + JsonObject ingredient = data.getAsJsonArray("ingredients").get(0).getAsJsonObject(); + if (ingredient.get("item").getAsString().startsWith("mineralogy:")) { + ingredient.addProperty("item", standInId); + } + JsonObject result = data.getAsJsonObject("result"); + if (result.get("item").getAsString().startsWith("mineralogy:")) { + result.addProperty("item", standInId); + } + IRecipe deserialized = RecipeManager.deserializeRecipe( + new ResourceLocation("mineralogy", name), data); + assertTrue(name, deserialized instanceof ICraftingRecipe); + return (ICraftingRecipe) deserialized; + } + private static CraftingInventory inventory(String name, Item rock) { if ("mossy_cobblestone".equals(name)) { return shapeless(new ItemStack(rock), new ItemStack(Blocks.VINE)); diff --git a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java index 275ad1476..29eaeb64f 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java @@ -58,8 +58,8 @@ public void everyRecipeHasAProgressiveAdvancement() throws Exception { File[] advancements = advancementDir.listFiles((dir, name) -> name.endsWith(".json")); assertNotNull(recipes); assertNotNull(advancements); - assertEquals(1415, recipes.length); - assertEquals(1415, advancements.length); + assertEquals(1427, recipes.length); + assertEquals(1427, advancements.length); Set advancementNames = new HashSet(); for (File file : advancements) advancementNames.add(file.getName()); @@ -356,6 +356,16 @@ public void nativeSlabsAndCobblestoneOverridesUseStableConditionalTags() throws + family + "_stonecutting", "minecraft:polished_" + family, "mineralogy:" + family + "_smooth_slab", "minecraft:polished_" + family + "_slab"); + assertNativeSlabConversion(family + "_slab_to_vanilla", + "mineralogy:" + family + "_slab", "minecraft:" + family + "_slab"); + assertNativeSlabConversion(family + "_slab_from_vanilla", + "minecraft:" + family + "_slab", "mineralogy:" + family + "_slab"); + assertNativeSlabConversion(family + "_smooth_slab_to_vanilla", + "mineralogy:" + family + "_smooth_slab", + "minecraft:polished_" + family + "_slab"); + assertNativeSlabConversion(family + "_smooth_slab_from_vanilla", + "minecraft:polished_" + family + "_slab", + "mineralogy:" + family + "_smooth_slab"); } assertCompositeRockTag("cobblestone_equivalents", "#forge:cobblestone"); @@ -519,6 +529,27 @@ private static void assertNativeStonecuttingOverride(String recipeName, String s assertEquals(recipeName, 2, enabled.get("count").getAsInt()); } + private static void assertNativeSlabConversion(String recipeName, String source, + String result) throws Exception { + JsonObject recipe = json(new File(ROOT, + "data/mineralogy/recipes/" + recipeName + ".json")); + assertEquals(recipeName, "minecraft:crafting_shapeless", recipe.get("type").getAsString()); + assertEquals(recipeName, 1, recipe.getAsJsonArray("ingredients").size()); + assertEquals(recipeName, source, recipe.getAsJsonArray("ingredients").get(0) + .getAsJsonObject().get("item").getAsString()); + assertEquals(recipeName, result, recipe.getAsJsonObject("result").get("item").getAsString()); + assertEquals(recipeName, 1, recipe.getAsJsonObject("result").get("count").getAsInt()); + assertEquals(recipeName, 2, recipe.getAsJsonArray("conditions").size()); + + JsonObject advancement = json(new File(ROOT, + "data/mineralogy/advancements/recipes/" + recipeName + ".json")); + assertEquals(recipeName, recipe.get("conditions"), advancement.get("conditions")); + assertEquals(recipeName, source, criterionItem(advancement, "has_rock")); + assertEquals(recipeName, "mineralogy:" + recipeName, + advancement.getAsJsonObject("rewards").getAsJsonArray("recipes") + .get(0).getAsString()); + } + private static void assertCompositeRockTag(String name, String baseTag) throws Exception { JsonArray values = json(new File(ROOT, "data/mineralogy/tags/items/" + name + ".json")).getAsJsonArray("values"); From 1aa1ebb87879d88017c6b7d28dda95c328406e90 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Fri, 28 Aug 2026 13:26:23 +0100 Subject: [PATCH 08/10] Release Mineralogy 6.1.0 for Minecraft 1.16.5 --- .github/workflows/ci.yml | 6 +++--- CHANGELOG.txt | 4 ++-- README.md | 2 +- build.gradle | 4 ++-- docs/VERSIONS.md | 20 +++++++++---------- gradle.properties | 2 +- .../mc/mineralogy/ResourceContractTest.java | 2 +- .../mc/mineralogy/WorkflowContractTest.java | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39b46c6f7..b205efdd6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,9 +68,9 @@ jobs: if-no-files-found: error retention-days: 30 path: | - build/libs/Mineralogy-6.0.1.116051.jar - build/libs/Mineralogy-6.0.1.116051-sources.jar - build/libs/Mineralogy-6.0.1.116051-javadoc.jar + build/libs/Mineralogy-6.1.0.116051.jar + build/libs/Mineralogy-6.1.0.116051-sources.jar + build/libs/Mineralogy-6.1.0.116051-javadoc.jar build/release/SHA256SUMS CHANGELOG.txt diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 27a6da48d..b16db7481 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,4 @@ -Mineralogy 6.0.1.116051 for Minecraft 1.16.5 +Mineralogy 6.1.0.116051 for Minecraft 1.16.5 - Delegated terrain, strata, ore, and covered fluid-deposit generation to the released OreSpawn 4.0.9.116051 provider engine, retaining the supported @@ -78,7 +78,7 @@ Mineralogy 6.0.1.116051 for Minecraft 1.16.5 loot tables, fluid APIs, rendering setup, and pack format 6 resources. - Added reproducible Java 8 main, sources, and Javadoc artifacts, exact released OreSpawn dependency verification, guarded 1.16.5 CI, and the four-component - release tag `6.0.1.116051`. + release tag `6.1.0.116051`. - Isolated CI's verified OreSpawn artifact in an exclusive Gradle repository so dependency resolution cannot fall through to an unverified public copy. Release verification also enforces Maven coordinate diff --git a/README.md b/README.md index b7ea3c284..0ed0b394a 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ mineral ores and dusts, rock furnaces, drywall, rock-salt lighting, fertilizer, and crude oil. OreSpawn 4 is the sole terrain, strata, ore, and deposit engine; Mineralogy no longer installs a parallel world generator. -This branch builds Mineralogy `6.0.1.116051` for Forge `36.2.34` and is built +This branch builds Mineralogy `6.1.0.116051` for Forge `36.2.34` and is built and tested against OreSpawn `4.0.9.116051`. Its declared compatibility range is OreSpawn `[4.0.6,5.0.0)`. Install both mods on clients and servers. diff --git a/build.gradle b/build.gradle index 2c79a2d53..344aefb85 100644 --- a/build.gradle +++ b/build.gradle @@ -336,7 +336,7 @@ tasks.register('verifyReleaseConfiguration') { group = 'verification' description = 'Verifies the exact Mineralogy 1.16 release identity.' doLast { - if (project.mod_version != '6.0.1.116051' + if (project.mod_version != '6.1.0.116051' || project.mod_group != expectedMavenGroup || project.minecraft_version != '1.16.5' || project.forge_version != '36.2.34' @@ -351,7 +351,7 @@ tasks.register('verifyReleaseDependencies') { group = 'verification' description = 'Resolves and verifies the exact released OreSpawn dependency.' doLast { - if (project.mod_version != '6.0.1.116051' + if (project.mod_version != '6.1.0.116051' || project.minecraft_version != project.mc_version || project.mc_version != '1.16.5' || project.loader_name != 'forge' diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index 091fd52ab..87fc6b390 100644 --- a/docs/VERSIONS.md +++ b/docs/VERSIONS.md @@ -9,14 +9,14 @@ exact Minecraft/loader target are both visible in one number. Major.Minor.Bug.Target ``` -The first three components are the **functional version**. Mineralogy `6.0.1` -means major generation 6, minor release 0, and bug revision 1. +The first three components are the **functional version**. Mineralogy `6.1.0` +means major generation 6, minor release 1, and bug revision 0. The fourth component identifies the target build. The complete version for this Minecraft 1.16.5 Forge release is therefore: ```text -6.0.1.116051 +6.1.0.116051 ``` This expanded numeric form is compatible with Maven version ordering, but it @@ -25,7 +25,7 @@ components. The release tag is exactly the complete four-component version, with no redundant Minecraft-version prefix. For this branch the tag is therefore -`6.0.1.116051`, not `1.16.5-6.0.1.116051`. The Target already makes tags unique +`6.1.0.116051`, not `1.16.5-6.1.0.116051`. The Target already makes tags unique across Minecraft versions and loaders. ## Reading the target component @@ -50,7 +50,7 @@ minor digits, and all remaining digits for the Minecraft major version. | 1.12.2 | Forge | `112021` | `6.0.1.112021` | | 1.14.4 | Forge | `114041` | `6.0.1.114041` | | 1.15.2 | Forge | `115021` | `6.0.1.115021` | -| 1.16.5 | Forge | `116051` | `6.0.1.116051` | +| 1.16.5 | Forge | `116051` | `6.1.0.116051` | | 1.18.2 | Forge | `118021` | `6.0.0.118021` | | 1.20.6 | Forge | `120061` | `6.0.0.120061` | | 1.21.11 | Forge | `121111` | `6.0.0.121111` | @@ -58,7 +58,7 @@ minor digits, and all remaining digits for the Minecraft major version. | 26.2 | NeoForge | `2602002` | `6.0.0.2602002` | The 1.16.5 row records this branch's current release. The other rows illustrate -target encoding only; they do not claim that the 6.0.1 changes have already +target encoding only; they do not claim that the 6.1.0 changes have already been forward-ported. Historical Mineralogy releases may also have four numeric components that used @@ -89,8 +89,8 @@ When Major changes, Minor and Bug reset to zero. When Minor changes, Bug resets to zero. The target for the actual build is then appended: ```text -6.0.1.116051 -> 6.1.0.116051 -6.1.4.116051 -> 7.0.0.116051 +6.1.0.116051 -> 6.2.0.116051 +6.2.4.116051 -> 7.0.0.116051 ``` ## Bug version @@ -114,7 +114,7 @@ Minecraft 1.10.2 / Forge / Mineralogy 6.0.0.110021 Minecraft 1.12.2 / Forge / Mineralogy 6.0.1.112021 Minecraft 1.14.4 / Forge / Mineralogy 6.0.1.114041 Minecraft 1.15.2 / Forge / Mineralogy 6.0.1.115021 -Minecraft 1.16.5 / Forge / Mineralogy 6.0.1.116051 +Minecraft 1.16.5 / Forge / Mineralogy 6.1.0.116051 Minecraft 1.18.2 / Forge / Mineralogy 6.0.0.118021 ``` @@ -161,7 +161,7 @@ feature generation, not the exact jar. The Gradle build reads the complete version from `mod_version`, verifies that it has four numeric components, and checks that its Target matches the declared Minecraft version and Forge loader. CI build numbers are not appended. For this -branch, published metadata and artifacts therefore use `6.0.1.116051`. +branch, published metadata and artifacts therefore use `6.1.0.116051`. Every release note should state: diff --git a/gradle.properties b/gradle.properties index 26bebe54b..9571f3e68 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ org.gradle.caching=true org.gradle.parallel=false net.minecraftforge.gradle.merge-source-sets=false -mod_version=6.0.1.116051 +mod_version=6.1.0.116051 mod_group=zone.moddev.mc.mineralogy # Release metadata consumed by the generic dispatcher. diff --git a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java index 29eaeb64f..65c99c13e 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java @@ -422,7 +422,7 @@ public void nativeSlabsAndCobblestoneOverridesUseStableConditionalTags() throws @Test public void oilAndBuildMetadataUseStableTargetIdentities() throws Exception { String properties = new String(Files.readAllBytes(new File("gradle.properties").toPath()), StandardCharsets.UTF_8); - assertTrue(properties.contains("mod_version=6.0.1.116051")); + assertTrue(properties.contains("mod_version=6.1.0.116051")); assertTrue(properties.contains("orespawn_curse_file_id=8742102")); String build = new String(Files.readAllBytes(new File("build.gradle").toPath()), StandardCharsets.UTF_8); assertTrue(build.contains("runtimeOnly renamer.dependency(\"curse.maven:mmd-orespawn-")); diff --git a/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java index d5a395638..49184ecb6 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java @@ -19,7 +19,7 @@ public void releaseMetadataIdentifiesTheGenericForgeTarget() throws Exception { try (FileInputStream input = new FileInputStream("gradle.properties")) { properties.load(input); } - assertEquals("6.0.1.116051", properties.getProperty("mod_version")); + assertEquals("6.1.0.116051", properties.getProperty("mod_version")); assertEquals("1.16.5", properties.getProperty("minecraft_version")); assertEquals(properties.getProperty("mc_version"), properties.getProperty("minecraft_version")); assertEquals("forge", properties.getProperty("loader_name")); From 9eb256f575de4a63987c46fb2beed43e1244ff0a Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Fri, 28 Aug 2026 17:48:59 +0100 Subject: [PATCH 09/10] Port Mineralogy 6.1.0 to Minecraft 1.17.1 --- .github/workflows/ci.yml | 22 +- .github/workflows/codeql-analysis.yml | 8 +- .github/workflows/validate-gradle-build.yml | 4 +- CHANGELOG.txt | 34 +-- README.md | 8 +- build.gradle | 140 +++++++---- docs/CONTENT_CONFIG.md | 2 +- docs/DEVELOPER_GUIDE.md | 57 +++-- docs/PLAYER_GUIDE.md | 29 ++- docs/PROVIDER.md | 24 +- docs/README.md | 2 +- docs/VERSIONS.md | 21 +- gradle.properties | 24 +- scripts/generate-locales.ps1 | 2 +- scripts/generate-recipes.ps1 | 72 ++++-- .../mc/mineralogy/MineralogyConfig.java | 22 +- .../mc/mineralogy/blocks/DoubleSlab.java | 44 ++-- .../mc/mineralogy/blocks/RockFurnace.java | 170 ++++++------- .../mc/mineralogy/blocks/RockSaltLamp.java | 107 +++++---- .../moddev/mc/mineralogy/blocks/RockSlab.java | 132 +++++----- .../mc/mineralogy/blocks/RockStairs.java | 29 +-- .../moddev/mc/mineralogy/blocks/RockWall.java | 26 +- .../mc/mineralogy/client/ClientSetup.java | 12 +- .../compat/CobblestoneTagPolicy.java | 102 +++----- .../moddev/mc/mineralogy/data/Material.java | 13 +- .../mineralogy/fluids/MineralogyFluids.java | 31 +-- .../moddev/mc/mineralogy/init/Blocks.java | 4 +- .../zone/moddev/mc/mineralogy/init/Items.java | 16 +- .../mineralogy/init/MineralogyItemGroups.java | 53 ++-- .../mineralogy/init/MineralogyRegistry.java | 2 +- .../mc/mineralogy/lib/data/MaterialStats.java | 10 +- .../moddev/mc/mineralogy/lib/data/Names.java | 10 +- .../patching/LegacyWorldDataHook.java | 80 ++++-- .../mc/mineralogy/patching/PatchHandler.java | 28 ++- src/main/resources/META-INF/mods.toml | 6 +- .../coremods/mineralogy_legacy_world_fix.js | 2 +- .../recipes/brewing/brewing_stand.json | 174 +++++++------- .../recipes/building_blocks/andesite.json | 174 +++++++------- .../recipes/building_blocks/diorite.json | 174 +++++++------- .../building_blocks/mossy_cobblestone.json | 87 ------- .../mossy_cobblestone_from_moss_block.json | 91 +++++++ .../mossy_cobblestone_from_vine.json | 91 +++++++ .../building_blocks/polished_andesite.json | 92 +++---- .../building_blocks/polished_basalt.json | 92 +++---- .../building_blocks/polished_diorite.json | 92 +++---- .../building_blocks/polished_granite.json | 92 +++---- .../recipes/combat/stone_sword.json | 170 ++++++------- .../recipes/decorations/furnace.json | 170 ++++++------- .../recipes/redstone/dispenser.json | 174 +++++++------- .../recipes/redstone/dropper.json | 174 +++++++------- .../advancements/recipes/redstone/lever.json | 170 ++++++------- .../recipes/redstone/observer.json | 174 +++++++------- .../advancements/recipes/redstone/piston.json | 174 +++++++------- .../advancements/recipes/tools/stone_axe.json | 170 ++++++------- .../advancements/recipes/tools/stone_hoe.json | 170 ++++++------- .../recipes/tools/stone_pickaxe.json | 170 ++++++------- .../recipes/tools/stone_shovel.json | 170 ++++++------- .../data/minecraft/recipes/andesite.json | 104 ++++---- .../data/minecraft/recipes/andesite_slab.json | 104 ++++---- ...esite_slab_from_andesite_stonecutting.json | 76 +++--- .../data/minecraft/recipes/brewing_stand.json | 116 ++++----- .../data/minecraft/recipes/diorite.json | 120 ++++----- .../data/minecraft/recipes/diorite_slab.json | 104 ++++---- ...iorite_slab_from_diorite_stonecutting.json | 76 +++--- .../data/minecraft/recipes/dispenser.json | 132 +++++----- .../data/minecraft/recipes/dropper.json | 120 ++++----- .../data/minecraft/recipes/furnace.json | 108 ++++----- .../data/minecraft/recipes/granite_slab.json | 104 ++++---- ...ranite_slab_from_granite_stonecutting.json | 76 +++--- .../data/minecraft/recipes/lever.json | 116 ++++----- .../minecraft/recipes/mossy_cobblestone.json | 52 ---- .../mossy_cobblestone_from_moss_block.json | 65 ++++- .../recipes/mossy_cobblestone_from_vine.json | 54 +++++ .../data/minecraft/recipes/observer.json | 132 +++++----- .../data/minecraft/recipes/piston.json | 144 +++++------ .../minecraft/recipes/polished_andesite.json | 26 +- .../recipes/polished_andesite_slab.json | 104 ++++---- ...esite_slab_from_andesite_stonecutting.json | 76 +++--- ...b_from_polished_andesite_stonecutting.json | 76 +++--- .../minecraft/recipes/polished_basalt.json | 26 +- .../minecraft/recipes/polished_diorite.json | 26 +- .../recipes/polished_diorite_slab.json | 104 ++++---- ...iorite_slab_from_diorite_stonecutting.json | 76 +++--- ...ab_from_polished_diorite_stonecutting.json | 76 +++--- .../minecraft/recipes/polished_granite.json | 26 +- .../recipes/polished_granite_slab.json | 104 ++++---- ...ranite_slab_from_granite_stonecutting.json | 76 +++--- ...ab_from_polished_granite_stonecutting.json | 76 +++--- .../data/minecraft/recipes/stone_axe.json | 120 ++++----- .../data/minecraft/recipes/stone_hoe.json | 120 ++++----- .../data/minecraft/recipes/stone_pickaxe.json | 120 ++++----- .../data/minecraft/recipes/stone_shovel.json | 120 ++++----- .../data/minecraft/recipes/stone_sword.json | 120 ++++----- .../recipes/amphibolite_brick.json | 70 +++--- .../amphibolite_brick_block_polishing.json | 134 ++++++----- .../recipes/amphibolite_brick_furnace.json | 70 +++--- .../recipes/amphibolite_brick_slab.json | 72 +++--- .../amphibolite_brick_slab_polishing.json | 134 ++++++----- .../amphibolite_brick_slab_recombination.json | 80 +++--- .../recipes/amphibolite_brick_stairs.json | 70 +++--- .../amphibolite_brick_stairs_polishing.json | 134 ++++++----- .../recipes/amphibolite_brick_wall.json | 70 +++--- .../amphibolite_brick_wall_polishing.json | 134 ++++++----- .../recipes/amphibolite_cobblestone.json | 62 ++--- .../recipes/amphibolite_furnace.json | 70 +++--- ...ite_polished_brick_slab_recombination.json | 80 +++--- ...phibolite_polished_slab_recombination.json | 80 +++--- .../amphibolite_polished_slabs_to_brick.json | 80 +++--- .../amphibolite_polished_stairs_to_brick.json | 80 +++--- .../amphibolite_polished_walls_to_brick.json | 80 +++--- .../amphibolite_raw_slab_polishing.json | 134 ++++++----- .../amphibolite_raw_slab_recombination.json | 80 +++--- .../amphibolite_raw_slabs_to_brick.json | 80 +++--- .../amphibolite_raw_stairs_polishing.json | 134 ++++++----- .../amphibolite_raw_stairs_to_brick.json | 80 +++--- .../amphibolite_raw_wall_polishing.json | 134 ++++++----- .../amphibolite_raw_walls_to_brick.json | 80 +++--- .../recipes/amphibolite_relief_axe.json | 72 +++--- .../recipes/amphibolite_relief_blank.json | 72 +++--- .../recipes/amphibolite_relief_cross.json | 72 +++--- .../recipes/amphibolite_relief_hammer.json | 72 +++--- .../recipes/amphibolite_relief_hoe.json | 72 +++--- .../amphibolite_relief_horizontal.json | 72 +++--- .../recipes/amphibolite_relief_i.json | 72 +++--- .../recipes/amphibolite_relief_left.json | 72 +++--- .../recipes/amphibolite_relief_pickaxe.json | 72 +++--- .../recipes/amphibolite_relief_plus.json | 72 +++--- .../recipes/amphibolite_relief_right.json | 72 +++--- .../recipes/amphibolite_relief_sword.json | 72 +++--- .../recipes/amphibolite_relief_vertical.json | 72 +++--- .../recipes/amphibolite_slab.json | 74 +++--- .../recipes/amphibolite_smooth.json | 100 ++++---- .../recipes/amphibolite_smooth_brick.json | 70 +++--- .../amphibolite_smooth_brick_furnace.json | 70 +++--- .../amphibolite_smooth_brick_slab.json | 72 +++--- .../amphibolite_smooth_brick_stairs.json | 70 +++--- .../amphibolite_smooth_brick_wall.json | 70 +++--- .../recipes/amphibolite_smooth_furnace.json | 70 +++--- .../recipes/amphibolite_smooth_slab.json | 72 +++--- .../recipes/amphibolite_smooth_stairs.json | 70 +++--- .../recipes/amphibolite_smooth_wall.json | 70 +++--- .../recipes/amphibolite_stairs.json | 70 +++--- .../recipes/amphibolite_to_stone.json | 60 ++--- .../recipes/amphibolite_wall.json | 70 +++--- .../advancements/recipes/andesite_brick.json | 70 +++--- .../andesite_brick_block_polishing.json | 134 ++++++----- .../recipes/andesite_brick_furnace.json | 70 +++--- .../recipes/andesite_brick_slab.json | 72 +++--- .../andesite_brick_slab_polishing.json | 134 ++++++----- .../andesite_brick_slab_recombination.json | 80 +++--- .../recipes/andesite_brick_stairs.json | 70 +++--- .../andesite_brick_stairs_polishing.json | 134 ++++++----- .../recipes/andesite_brick_wall.json | 70 +++--- .../andesite_brick_wall_polishing.json | 134 ++++++----- .../recipes/andesite_cobblestone.json | 62 ++--- .../recipes/andesite_furnace.json | 70 +++--- ...ite_polished_brick_slab_recombination.json | 80 +++--- .../andesite_polished_slab_recombination.json | 80 +++--- .../andesite_polished_slabs_to_brick.json | 80 +++--- .../andesite_polished_stairs_to_brick.json | 80 +++--- .../andesite_polished_walls_to_brick.json | 80 +++--- .../recipes/andesite_raw_slab_polishing.json | 134 ++++++----- .../andesite_raw_slab_recombination.json | 80 +++--- .../recipes/andesite_raw_slabs_to_brick.json | 80 +++--- .../andesite_raw_stairs_polishing.json | 134 ++++++----- .../recipes/andesite_raw_stairs_to_brick.json | 80 +++--- .../recipes/andesite_raw_wall_polishing.json | 134 ++++++----- .../recipes/andesite_raw_walls_to_brick.json | 80 +++--- .../recipes/andesite_relief_axe.json | 72 +++--- .../recipes/andesite_relief_blank.json | 70 +++--- .../recipes/andesite_relief_cross.json | 72 +++--- .../recipes/andesite_relief_hammer.json | 72 +++--- .../recipes/andesite_relief_hoe.json | 72 +++--- .../recipes/andesite_relief_horizontal.json | 72 +++--- .../recipes/andesite_relief_i.json | 72 +++--- .../recipes/andesite_relief_left.json | 72 +++--- .../recipes/andesite_relief_pickaxe.json | 72 +++--- .../recipes/andesite_relief_plus.json | 72 +++--- .../recipes/andesite_relief_right.json | 72 +++--- .../recipes/andesite_relief_sword.json | 72 +++--- .../recipes/andesite_relief_vertical.json | 72 +++--- .../advancements/recipes/andesite_slab.json | 74 +++--- .../recipes/andesite_slab_from_vanilla.json | 80 +++--- .../recipes/andesite_slab_to_vanilla.json | 80 +++--- .../advancements/recipes/andesite_smooth.json | 102 ++++---- .../recipes/andesite_smooth_brick.json | 70 +++--- .../andesite_smooth_brick_furnace.json | 70 +++--- .../recipes/andesite_smooth_brick_slab.json | 72 +++--- .../recipes/andesite_smooth_brick_stairs.json | 70 +++--- .../recipes/andesite_smooth_brick_wall.json | 70 +++--- .../recipes/andesite_smooth_furnace.json | 70 +++--- .../recipes/andesite_smooth_slab.json | 72 +++--- .../andesite_smooth_slab_from_vanilla.json | 80 +++--- .../andesite_smooth_slab_to_vanilla.json | 80 +++--- .../recipes/andesite_smooth_stairs.json | 72 +++--- .../recipes/andesite_smooth_wall.json | 70 +++--- .../advancements/recipes/andesite_stairs.json | 74 +++--- .../recipes/andesite_to_stone.json | 60 ++--- .../advancements/recipes/andesite_wall.json | 74 +++--- .../advancements/recipes/basalt_brick.json | 70 +++--- .../recipes/basalt_brick_block_polishing.json | 134 ++++++----- .../recipes/basalt_brick_furnace.json | 70 +++--- .../recipes/basalt_brick_slab.json | 72 +++--- .../recipes/basalt_brick_slab_polishing.json | 134 ++++++----- .../basalt_brick_slab_recombination.json | 80 +++--- .../recipes/basalt_brick_stairs.json | 70 +++--- .../basalt_brick_stairs_polishing.json | 134 ++++++----- .../recipes/basalt_brick_wall.json | 70 +++--- .../recipes/basalt_brick_wall_polishing.json | 134 ++++++----- .../recipes/basalt_cobblestone.json | 62 ++--- .../advancements/recipes/basalt_furnace.json | 70 +++--- ...alt_polished_brick_slab_recombination.json | 80 +++--- .../basalt_polished_slab_recombination.json | 80 +++--- .../basalt_polished_slabs_to_brick.json | 80 +++--- .../basalt_polished_stairs_to_brick.json | 80 +++--- .../basalt_polished_walls_to_brick.json | 80 +++--- .../recipes/basalt_raw_slab_polishing.json | 134 ++++++----- .../basalt_raw_slab_recombination.json | 80 +++--- .../recipes/basalt_raw_slabs_to_brick.json | 80 +++--- .../recipes/basalt_raw_stairs_polishing.json | 134 ++++++----- .../recipes/basalt_raw_stairs_to_brick.json | 80 +++--- .../recipes/basalt_raw_wall_polishing.json | 134 ++++++----- .../recipes/basalt_raw_walls_to_brick.json | 80 +++--- .../recipes/basalt_relief_axe.json | 72 +++--- .../recipes/basalt_relief_blank.json | 70 +++--- .../recipes/basalt_relief_cross.json | 72 +++--- .../recipes/basalt_relief_hammer.json | 72 +++--- .../recipes/basalt_relief_hoe.json | 72 +++--- .../recipes/basalt_relief_horizontal.json | 72 +++--- .../advancements/recipes/basalt_relief_i.json | 72 +++--- .../recipes/basalt_relief_left.json | 72 +++--- .../recipes/basalt_relief_pickaxe.json | 72 +++--- .../recipes/basalt_relief_plus.json | 72 +++--- .../recipes/basalt_relief_right.json | 72 +++--- .../recipes/basalt_relief_sword.json | 72 +++--- .../recipes/basalt_relief_vertical.json | 72 +++--- .../advancements/recipes/basalt_slab.json | 70 +++--- .../advancements/recipes/basalt_smooth.json | 102 ++++---- .../recipes/basalt_smooth_brick.json | 70 +++--- .../recipes/basalt_smooth_brick_furnace.json | 70 +++--- .../recipes/basalt_smooth_brick_slab.json | 72 +++--- .../recipes/basalt_smooth_brick_stairs.json | 70 +++--- .../recipes/basalt_smooth_brick_wall.json | 70 +++--- .../recipes/basalt_smooth_furnace.json | 70 +++--- .../recipes/basalt_smooth_slab.json | 70 +++--- .../recipes/basalt_smooth_stairs.json | 70 +++--- .../recipes/basalt_smooth_wall.json | 70 +++--- .../advancements/recipes/basalt_stairs.json | 70 +++--- .../advancements/recipes/basalt_to_stone.json | 60 ++--- .../advancements/recipes/basalt_wall.json | 70 +++--- .../recipes/basaltic_glass_brick.json | 70 +++--- .../basaltic_glass_brick_block_polishing.json | 134 ++++++----- .../recipes/basaltic_glass_brick_furnace.json | 70 +++--- .../recipes/basaltic_glass_brick_slab.json | 72 +++--- .../basaltic_glass_brick_slab_polishing.json | 134 ++++++----- ...saltic_glass_brick_slab_recombination.json | 80 +++--- .../recipes/basaltic_glass_brick_stairs.json | 70 +++--- ...basaltic_glass_brick_stairs_polishing.json | 134 ++++++----- .../recipes/basaltic_glass_brick_wall.json | 70 +++--- .../basaltic_glass_brick_wall_polishing.json | 134 ++++++----- .../recipes/basaltic_glass_cobblestone.json | 62 ++--- .../recipes/basaltic_glass_furnace.json | 70 +++--- ...ass_polished_brick_slab_recombination.json | 80 +++--- ...tic_glass_polished_slab_recombination.json | 80 +++--- ...asaltic_glass_polished_slabs_to_brick.json | 80 +++--- ...saltic_glass_polished_stairs_to_brick.json | 80 +++--- ...asaltic_glass_polished_walls_to_brick.json | 80 +++--- .../basaltic_glass_raw_slab_polishing.json | 134 ++++++----- ...basaltic_glass_raw_slab_recombination.json | 80 +++--- .../basaltic_glass_raw_slabs_to_brick.json | 80 +++--- .../basaltic_glass_raw_stairs_polishing.json | 134 ++++++----- .../basaltic_glass_raw_stairs_to_brick.json | 80 +++--- .../basaltic_glass_raw_wall_polishing.json | 134 ++++++----- .../basaltic_glass_raw_walls_to_brick.json | 80 +++--- .../recipes/basaltic_glass_relief_axe.json | 72 +++--- .../recipes/basaltic_glass_relief_blank.json | 72 +++--- .../recipes/basaltic_glass_relief_cross.json | 72 +++--- .../recipes/basaltic_glass_relief_hammer.json | 72 +++--- .../recipes/basaltic_glass_relief_hoe.json | 72 +++--- .../basaltic_glass_relief_horizontal.json | 72 +++--- .../recipes/basaltic_glass_relief_i.json | 72 +++--- .../recipes/basaltic_glass_relief_left.json | 72 +++--- .../basaltic_glass_relief_pickaxe.json | 72 +++--- .../recipes/basaltic_glass_relief_plus.json | 72 +++--- .../recipes/basaltic_glass_relief_right.json | 72 +++--- .../recipes/basaltic_glass_relief_sword.json | 72 +++--- .../basaltic_glass_relief_vertical.json | 72 +++--- .../recipes/basaltic_glass_slab.json | 74 +++--- .../recipes/basaltic_glass_smooth.json | 100 ++++---- .../recipes/basaltic_glass_smooth_brick.json | 70 +++--- .../basaltic_glass_smooth_brick_furnace.json | 70 +++--- .../basaltic_glass_smooth_brick_slab.json | 72 +++--- .../basaltic_glass_smooth_brick_stairs.json | 70 +++--- .../basaltic_glass_smooth_brick_wall.json | 70 +++--- .../basaltic_glass_smooth_furnace.json | 70 +++--- .../recipes/basaltic_glass_smooth_slab.json | 72 +++--- .../recipes/basaltic_glass_smooth_stairs.json | 70 +++--- .../recipes/basaltic_glass_smooth_wall.json | 70 +++--- .../recipes/basaltic_glass_stairs.json | 70 +++--- .../recipes/basaltic_glass_to_stone.json | 60 ++--- .../recipes/basaltic_glass_wall.json | 70 +++--- .../advancements/recipes/chalk.json | 72 +++--- .../advancements/recipes/chalk_dust.json | 72 +++--- .../advancements/recipes/cobblestone.json | 64 ++--- .../recipes/conglomerate_brick.json | 70 +++--- .../conglomerate_brick_block_polishing.json | 134 ++++++----- .../recipes/conglomerate_brick_furnace.json | 70 +++--- .../recipes/conglomerate_brick_slab.json | 72 +++--- .../conglomerate_brick_slab_polishing.json | 134 ++++++----- ...conglomerate_brick_slab_recombination.json | 80 +++--- .../recipes/conglomerate_brick_stairs.json | 70 +++--- .../conglomerate_brick_stairs_polishing.json | 134 ++++++----- .../recipes/conglomerate_brick_wall.json | 70 +++--- .../conglomerate_brick_wall_polishing.json | 134 ++++++----- .../recipes/conglomerate_cobblestone.json | 62 ++--- .../recipes/conglomerate_furnace.json | 70 +++--- ...ate_polished_brick_slab_recombination.json | 80 +++--- ...glomerate_polished_slab_recombination.json | 80 +++--- .../conglomerate_polished_slabs_to_brick.json | 80 +++--- ...conglomerate_polished_stairs_to_brick.json | 80 +++--- .../conglomerate_polished_walls_to_brick.json | 80 +++--- .../conglomerate_raw_slab_polishing.json | 134 ++++++----- .../conglomerate_raw_slab_recombination.json | 80 +++--- .../conglomerate_raw_slabs_to_brick.json | 80 +++--- .../conglomerate_raw_stairs_polishing.json | 134 ++++++----- .../conglomerate_raw_stairs_to_brick.json | 80 +++--- .../conglomerate_raw_wall_polishing.json | 134 ++++++----- .../conglomerate_raw_walls_to_brick.json | 80 +++--- .../recipes/conglomerate_relief_axe.json | 72 +++--- .../recipes/conglomerate_relief_blank.json | 72 +++--- .../recipes/conglomerate_relief_cross.json | 72 +++--- .../recipes/conglomerate_relief_hammer.json | 72 +++--- .../recipes/conglomerate_relief_hoe.json | 72 +++--- .../conglomerate_relief_horizontal.json | 72 +++--- .../recipes/conglomerate_relief_i.json | 72 +++--- .../recipes/conglomerate_relief_left.json | 72 +++--- .../recipes/conglomerate_relief_pickaxe.json | 72 +++--- .../recipes/conglomerate_relief_plus.json | 72 +++--- .../recipes/conglomerate_relief_right.json | 72 +++--- .../recipes/conglomerate_relief_sword.json | 72 +++--- .../recipes/conglomerate_relief_vertical.json | 72 +++--- .../recipes/conglomerate_slab.json | 74 +++--- .../recipes/conglomerate_smooth.json | 100 ++++---- .../recipes/conglomerate_smooth_brick.json | 70 +++--- .../conglomerate_smooth_brick_furnace.json | 70 +++--- .../conglomerate_smooth_brick_slab.json | 72 +++--- .../conglomerate_smooth_brick_stairs.json | 70 +++--- .../conglomerate_smooth_brick_wall.json | 70 +++--- .../recipes/conglomerate_smooth_furnace.json | 70 +++--- .../recipes/conglomerate_smooth_slab.json | 72 +++--- .../recipes/conglomerate_smooth_stairs.json | 70 +++--- .../recipes/conglomerate_smooth_wall.json | 70 +++--- .../recipes/conglomerate_stairs.json | 70 +++--- .../recipes/conglomerate_to_stone.json | 60 ++--- .../recipes/conglomerate_wall.json | 70 +++--- .../advancements/recipes/diabase_brick.json | 70 +++--- .../diabase_brick_block_polishing.json | 134 ++++++----- .../recipes/diabase_brick_furnace.json | 70 +++--- .../recipes/diabase_brick_slab.json | 72 +++--- .../recipes/diabase_brick_slab_polishing.json | 134 ++++++----- .../diabase_brick_slab_recombination.json | 80 +++--- .../recipes/diabase_brick_stairs.json | 70 +++--- .../diabase_brick_stairs_polishing.json | 134 ++++++----- .../recipes/diabase_brick_wall.json | 70 +++--- .../recipes/diabase_brick_wall_polishing.json | 134 ++++++----- .../recipes/diabase_cobblestone.json | 62 ++--- .../advancements/recipes/diabase_furnace.json | 70 +++--- ...ase_polished_brick_slab_recombination.json | 80 +++--- .../diabase_polished_slab_recombination.json | 80 +++--- .../diabase_polished_slabs_to_brick.json | 80 +++--- .../diabase_polished_stairs_to_brick.json | 80 +++--- .../diabase_polished_walls_to_brick.json | 80 +++--- .../recipes/diabase_raw_slab_polishing.json | 134 ++++++----- .../diabase_raw_slab_recombination.json | 80 +++--- .../recipes/diabase_raw_slabs_to_brick.json | 80 +++--- .../recipes/diabase_raw_stairs_polishing.json | 134 ++++++----- .../recipes/diabase_raw_stairs_to_brick.json | 80 +++--- .../recipes/diabase_raw_wall_polishing.json | 134 ++++++----- .../recipes/diabase_raw_walls_to_brick.json | 80 +++--- .../recipes/diabase_relief_axe.json | 72 +++--- .../recipes/diabase_relief_blank.json | 72 +++--- .../recipes/diabase_relief_cross.json | 72 +++--- .../recipes/diabase_relief_hammer.json | 72 +++--- .../recipes/diabase_relief_hoe.json | 72 +++--- .../recipes/diabase_relief_horizontal.json | 72 +++--- .../recipes/diabase_relief_i.json | 72 +++--- .../recipes/diabase_relief_left.json | 72 +++--- .../recipes/diabase_relief_pickaxe.json | 72 +++--- .../recipes/diabase_relief_plus.json | 72 +++--- .../recipes/diabase_relief_right.json | 72 +++--- .../recipes/diabase_relief_sword.json | 72 +++--- .../recipes/diabase_relief_vertical.json | 72 +++--- .../advancements/recipes/diabase_slab.json | 74 +++--- .../advancements/recipes/diabase_smooth.json | 100 ++++---- .../recipes/diabase_smooth_brick.json | 70 +++--- .../recipes/diabase_smooth_brick_furnace.json | 70 +++--- .../recipes/diabase_smooth_brick_slab.json | 72 +++--- .../recipes/diabase_smooth_brick_stairs.json | 70 +++--- .../recipes/diabase_smooth_brick_wall.json | 70 +++--- .../recipes/diabase_smooth_furnace.json | 70 +++--- .../recipes/diabase_smooth_slab.json | 72 +++--- .../recipes/diabase_smooth_stairs.json | 70 +++--- .../recipes/diabase_smooth_wall.json | 70 +++--- .../advancements/recipes/diabase_stairs.json | 70 +++--- .../recipes/diabase_to_stone.json | 60 ++--- .../advancements/recipes/diabase_wall.json | 70 +++--- .../advancements/recipes/diorite_brick.json | 70 +++--- .../diorite_brick_block_polishing.json | 134 ++++++----- .../recipes/diorite_brick_furnace.json | 70 +++--- .../recipes/diorite_brick_slab.json | 72 +++--- .../recipes/diorite_brick_slab_polishing.json | 134 ++++++----- .../diorite_brick_slab_recombination.json | 80 +++--- .../recipes/diorite_brick_stairs.json | 70 +++--- .../diorite_brick_stairs_polishing.json | 134 ++++++----- .../recipes/diorite_brick_wall.json | 70 +++--- .../recipes/diorite_brick_wall_polishing.json | 134 ++++++----- .../recipes/diorite_cobblestone.json | 62 ++--- .../advancements/recipes/diorite_furnace.json | 70 +++--- ...ite_polished_brick_slab_recombination.json | 80 +++--- .../diorite_polished_slab_recombination.json | 80 +++--- .../diorite_polished_slabs_to_brick.json | 80 +++--- .../diorite_polished_stairs_to_brick.json | 80 +++--- .../diorite_polished_walls_to_brick.json | 80 +++--- .../recipes/diorite_raw_slab_polishing.json | 134 ++++++----- .../diorite_raw_slab_recombination.json | 80 +++--- .../recipes/diorite_raw_slabs_to_brick.json | 80 +++--- .../recipes/diorite_raw_stairs_polishing.json | 134 ++++++----- .../recipes/diorite_raw_stairs_to_brick.json | 80 +++--- .../recipes/diorite_raw_wall_polishing.json | 134 ++++++----- .../recipes/diorite_raw_walls_to_brick.json | 80 +++--- .../recipes/diorite_relief_axe.json | 72 +++--- .../recipes/diorite_relief_blank.json | 70 +++--- .../recipes/diorite_relief_cross.json | 72 +++--- .../recipes/diorite_relief_hammer.json | 72 +++--- .../recipes/diorite_relief_hoe.json | 72 +++--- .../recipes/diorite_relief_horizontal.json | 72 +++--- .../recipes/diorite_relief_i.json | 72 +++--- .../recipes/diorite_relief_left.json | 72 +++--- .../recipes/diorite_relief_pickaxe.json | 72 +++--- .../recipes/diorite_relief_plus.json | 72 +++--- .../recipes/diorite_relief_right.json | 72 +++--- .../recipes/diorite_relief_sword.json | 72 +++--- .../recipes/diorite_relief_vertical.json | 72 +++--- .../advancements/recipes/diorite_slab.json | 74 +++--- .../recipes/diorite_slab_from_vanilla.json | 80 +++--- .../recipes/diorite_slab_to_vanilla.json | 80 +++--- .../advancements/recipes/diorite_smooth.json | 102 ++++---- .../recipes/diorite_smooth_brick.json | 70 +++--- .../recipes/diorite_smooth_brick_furnace.json | 70 +++--- .../recipes/diorite_smooth_brick_slab.json | 72 +++--- .../recipes/diorite_smooth_brick_stairs.json | 70 +++--- .../recipes/diorite_smooth_brick_wall.json | 70 +++--- .../recipes/diorite_smooth_furnace.json | 70 +++--- .../recipes/diorite_smooth_slab.json | 72 +++--- .../diorite_smooth_slab_from_vanilla.json | 80 +++--- .../diorite_smooth_slab_to_vanilla.json | 80 +++--- .../recipes/diorite_smooth_stairs.json | 72 +++--- .../recipes/diorite_smooth_wall.json | 70 +++--- .../advancements/recipes/diorite_stairs.json | 74 +++--- .../recipes/diorite_to_stone.json | 60 ++--- .../advancements/recipes/diorite_wall.json | 74 +++--- .../advancements/recipes/dolomite_brick.json | 70 +++--- .../dolomite_brick_block_polishing.json | 134 ++++++----- .../recipes/dolomite_brick_furnace.json | 70 +++--- .../recipes/dolomite_brick_slab.json | 72 +++--- .../dolomite_brick_slab_polishing.json | 134 ++++++----- .../dolomite_brick_slab_recombination.json | 80 +++--- .../recipes/dolomite_brick_stairs.json | 70 +++--- .../dolomite_brick_stairs_polishing.json | 134 ++++++----- .../recipes/dolomite_brick_wall.json | 70 +++--- .../dolomite_brick_wall_polishing.json | 134 ++++++----- .../recipes/dolomite_cobblestone.json | 62 ++--- .../recipes/dolomite_furnace.json | 70 +++--- ...ite_polished_brick_slab_recombination.json | 80 +++--- .../dolomite_polished_slab_recombination.json | 80 +++--- .../dolomite_polished_slabs_to_brick.json | 80 +++--- .../dolomite_polished_stairs_to_brick.json | 80 +++--- .../dolomite_polished_walls_to_brick.json | 80 +++--- .../recipes/dolomite_raw_slab_polishing.json | 134 ++++++----- .../dolomite_raw_slab_recombination.json | 80 +++--- .../recipes/dolomite_raw_slabs_to_brick.json | 80 +++--- .../dolomite_raw_stairs_polishing.json | 134 ++++++----- .../recipes/dolomite_raw_stairs_to_brick.json | 80 +++--- .../recipes/dolomite_raw_wall_polishing.json | 134 ++++++----- .../recipes/dolomite_raw_walls_to_brick.json | 80 +++--- .../recipes/dolomite_relief_axe.json | 72 +++--- .../recipes/dolomite_relief_blank.json | 72 +++--- .../recipes/dolomite_relief_cross.json | 72 +++--- .../recipes/dolomite_relief_hammer.json | 72 +++--- .../recipes/dolomite_relief_hoe.json | 72 +++--- .../recipes/dolomite_relief_horizontal.json | 72 +++--- .../recipes/dolomite_relief_i.json | 72 +++--- .../recipes/dolomite_relief_left.json | 72 +++--- .../recipes/dolomite_relief_pickaxe.json | 72 +++--- .../recipes/dolomite_relief_plus.json | 72 +++--- .../recipes/dolomite_relief_right.json | 72 +++--- .../recipes/dolomite_relief_sword.json | 72 +++--- .../recipes/dolomite_relief_vertical.json | 72 +++--- .../advancements/recipes/dolomite_slab.json | 74 +++--- .../advancements/recipes/dolomite_smooth.json | 100 ++++---- .../recipes/dolomite_smooth_brick.json | 70 +++--- .../dolomite_smooth_brick_furnace.json | 70 +++--- .../recipes/dolomite_smooth_brick_slab.json | 72 +++--- .../recipes/dolomite_smooth_brick_stairs.json | 70 +++--- .../recipes/dolomite_smooth_brick_wall.json | 70 +++--- .../recipes/dolomite_smooth_furnace.json | 70 +++--- .../recipes/dolomite_smooth_slab.json | 72 +++--- .../recipes/dolomite_smooth_stairs.json | 70 +++--- .../recipes/dolomite_smooth_wall.json | 70 +++--- .../advancements/recipes/dolomite_stairs.json | 70 +++--- .../recipes/dolomite_to_stone.json | 60 ++--- .../advancements/recipes/dolomite_wall.json | 70 +++--- .../advancements/recipes/drywall.json | 80 +++--- .../advancements/recipes/drywall_black.json | 80 +++--- .../advancements/recipes/drywall_blue.json | 80 +++--- .../advancements/recipes/drywall_brown.json | 80 +++--- .../advancements/recipes/drywall_cyan.json | 80 +++--- .../advancements/recipes/drywall_gray.json | 80 +++--- .../advancements/recipes/drywall_green.json | 80 +++--- .../recipes/drywall_light_blue.json | 80 +++--- .../advancements/recipes/drywall_lime.json | 80 +++--- .../advancements/recipes/drywall_magenta.json | 80 +++--- .../advancements/recipes/drywall_orange.json | 80 +++--- .../advancements/recipes/drywall_pink.json | 80 +++--- .../advancements/recipes/drywall_purple.json | 80 +++--- .../advancements/recipes/drywall_red.json | 80 +++--- .../advancements/recipes/drywall_silver.json | 80 +++--- .../advancements/recipes/drywall_white.json | 80 +++--- .../advancements/recipes/drywall_yellow.json | 80 +++--- .../advancements/recipes/gabbro_brick.json | 70 +++--- .../recipes/gabbro_brick_block_polishing.json | 134 ++++++----- .../recipes/gabbro_brick_furnace.json | 70 +++--- .../recipes/gabbro_brick_slab.json | 72 +++--- .../recipes/gabbro_brick_slab_polishing.json | 134 ++++++----- .../gabbro_brick_slab_recombination.json | 80 +++--- .../recipes/gabbro_brick_stairs.json | 70 +++--- .../gabbro_brick_stairs_polishing.json | 134 ++++++----- .../recipes/gabbro_brick_wall.json | 70 +++--- .../recipes/gabbro_brick_wall_polishing.json | 134 ++++++----- .../recipes/gabbro_cobblestone.json | 62 ++--- .../advancements/recipes/gabbro_furnace.json | 70 +++--- ...bro_polished_brick_slab_recombination.json | 80 +++--- .../gabbro_polished_slab_recombination.json | 80 +++--- .../gabbro_polished_slabs_to_brick.json | 80 +++--- .../gabbro_polished_stairs_to_brick.json | 80 +++--- .../gabbro_polished_walls_to_brick.json | 80 +++--- .../recipes/gabbro_raw_slab_polishing.json | 134 ++++++----- .../gabbro_raw_slab_recombination.json | 80 +++--- .../recipes/gabbro_raw_slabs_to_brick.json | 80 +++--- .../recipes/gabbro_raw_stairs_polishing.json | 134 ++++++----- .../recipes/gabbro_raw_stairs_to_brick.json | 80 +++--- .../recipes/gabbro_raw_wall_polishing.json | 134 ++++++----- .../recipes/gabbro_raw_walls_to_brick.json | 80 +++--- .../recipes/gabbro_relief_axe.json | 72 +++--- .../recipes/gabbro_relief_blank.json | 72 +++--- .../recipes/gabbro_relief_cross.json | 72 +++--- .../recipes/gabbro_relief_hammer.json | 72 +++--- .../recipes/gabbro_relief_hoe.json | 72 +++--- .../recipes/gabbro_relief_horizontal.json | 72 +++--- .../advancements/recipes/gabbro_relief_i.json | 72 +++--- .../recipes/gabbro_relief_left.json | 72 +++--- .../recipes/gabbro_relief_pickaxe.json | 72 +++--- .../recipes/gabbro_relief_plus.json | 72 +++--- .../recipes/gabbro_relief_right.json | 72 +++--- .../recipes/gabbro_relief_sword.json | 72 +++--- .../recipes/gabbro_relief_vertical.json | 72 +++--- .../advancements/recipes/gabbro_slab.json | 74 +++--- .../advancements/recipes/gabbro_smooth.json | 100 ++++---- .../recipes/gabbro_smooth_brick.json | 70 +++--- .../recipes/gabbro_smooth_brick_furnace.json | 70 +++--- .../recipes/gabbro_smooth_brick_slab.json | 72 +++--- .../recipes/gabbro_smooth_brick_stairs.json | 70 +++--- .../recipes/gabbro_smooth_brick_wall.json | 70 +++--- .../recipes/gabbro_smooth_furnace.json | 70 +++--- .../recipes/gabbro_smooth_slab.json | 72 +++--- .../recipes/gabbro_smooth_stairs.json | 70 +++--- .../recipes/gabbro_smooth_wall.json | 70 +++--- .../advancements/recipes/gabbro_stairs.json | 70 +++--- .../advancements/recipes/gabbro_to_stone.json | 60 ++--- .../advancements/recipes/gabbro_wall.json | 70 +++--- .../advancements/recipes/gneiss_brick.json | 70 +++--- .../recipes/gneiss_brick_block_polishing.json | 134 ++++++----- .../recipes/gneiss_brick_furnace.json | 70 +++--- .../recipes/gneiss_brick_slab.json | 72 +++--- .../recipes/gneiss_brick_slab_polishing.json | 134 ++++++----- .../gneiss_brick_slab_recombination.json | 80 +++--- .../recipes/gneiss_brick_stairs.json | 70 +++--- .../gneiss_brick_stairs_polishing.json | 134 ++++++----- .../recipes/gneiss_brick_wall.json | 70 +++--- .../recipes/gneiss_brick_wall_polishing.json | 134 ++++++----- .../recipes/gneiss_cobblestone.json | 62 ++--- .../advancements/recipes/gneiss_furnace.json | 70 +++--- ...iss_polished_brick_slab_recombination.json | 80 +++--- .../gneiss_polished_slab_recombination.json | 80 +++--- .../gneiss_polished_slabs_to_brick.json | 80 +++--- .../gneiss_polished_stairs_to_brick.json | 80 +++--- .../gneiss_polished_walls_to_brick.json | 80 +++--- .../recipes/gneiss_raw_slab_polishing.json | 134 ++++++----- .../gneiss_raw_slab_recombination.json | 80 +++--- .../recipes/gneiss_raw_slabs_to_brick.json | 80 +++--- .../recipes/gneiss_raw_stairs_polishing.json | 134 ++++++----- .../recipes/gneiss_raw_stairs_to_brick.json | 80 +++--- .../recipes/gneiss_raw_wall_polishing.json | 134 ++++++----- .../recipes/gneiss_raw_walls_to_brick.json | 80 +++--- .../recipes/gneiss_relief_axe.json | 72 +++--- .../recipes/gneiss_relief_blank.json | 72 +++--- .../recipes/gneiss_relief_cross.json | 72 +++--- .../recipes/gneiss_relief_hammer.json | 72 +++--- .../recipes/gneiss_relief_hoe.json | 72 +++--- .../recipes/gneiss_relief_horizontal.json | 72 +++--- .../advancements/recipes/gneiss_relief_i.json | 72 +++--- .../recipes/gneiss_relief_left.json | 72 +++--- .../recipes/gneiss_relief_pickaxe.json | 72 +++--- .../recipes/gneiss_relief_plus.json | 72 +++--- .../recipes/gneiss_relief_right.json | 72 +++--- .../recipes/gneiss_relief_sword.json | 72 +++--- .../recipes/gneiss_relief_vertical.json | 72 +++--- .../advancements/recipes/gneiss_slab.json | 74 +++--- .../advancements/recipes/gneiss_smooth.json | 100 ++++---- .../recipes/gneiss_smooth_brick.json | 70 +++--- .../recipes/gneiss_smooth_brick_furnace.json | 70 +++--- .../recipes/gneiss_smooth_brick_slab.json | 72 +++--- .../recipes/gneiss_smooth_brick_stairs.json | 70 +++--- .../recipes/gneiss_smooth_brick_wall.json | 70 +++--- .../recipes/gneiss_smooth_furnace.json | 70 +++--- .../recipes/gneiss_smooth_slab.json | 72 +++--- .../recipes/gneiss_smooth_stairs.json | 70 +++--- .../recipes/gneiss_smooth_wall.json | 70 +++--- .../advancements/recipes/gneiss_stairs.json | 70 +++--- .../advancements/recipes/gneiss_to_stone.json | 60 ++--- .../advancements/recipes/gneiss_wall.json | 70 +++--- .../advancements/recipes/granite_brick.json | 70 +++--- .../granite_brick_block_polishing.json | 134 ++++++----- .../recipes/granite_brick_furnace.json | 70 +++--- .../recipes/granite_brick_slab.json | 72 +++--- .../recipes/granite_brick_slab_polishing.json | 134 ++++++----- .../granite_brick_slab_recombination.json | 80 +++--- .../recipes/granite_brick_stairs.json | 70 +++--- .../granite_brick_stairs_polishing.json | 134 ++++++----- .../recipes/granite_brick_wall.json | 70 +++--- .../recipes/granite_brick_wall_polishing.json | 134 ++++++----- .../recipes/granite_cobblestone.json | 62 ++--- .../advancements/recipes/granite_furnace.json | 70 +++--- ...ite_polished_brick_slab_recombination.json | 80 +++--- .../granite_polished_slab_recombination.json | 80 +++--- .../granite_polished_slabs_to_brick.json | 80 +++--- .../granite_polished_stairs_to_brick.json | 80 +++--- .../granite_polished_walls_to_brick.json | 80 +++--- .../recipes/granite_raw_slab_polishing.json | 134 ++++++----- .../granite_raw_slab_recombination.json | 80 +++--- .../recipes/granite_raw_slabs_to_brick.json | 80 +++--- .../recipes/granite_raw_stairs_polishing.json | 134 ++++++----- .../recipes/granite_raw_stairs_to_brick.json | 80 +++--- .../recipes/granite_raw_wall_polishing.json | 134 ++++++----- .../recipes/granite_raw_walls_to_brick.json | 80 +++--- .../recipes/granite_relief_axe.json | 72 +++--- .../recipes/granite_relief_blank.json | 70 +++--- .../recipes/granite_relief_cross.json | 72 +++--- .../recipes/granite_relief_hammer.json | 72 +++--- .../recipes/granite_relief_hoe.json | 72 +++--- .../recipes/granite_relief_horizontal.json | 72 +++--- .../recipes/granite_relief_i.json | 72 +++--- .../recipes/granite_relief_left.json | 72 +++--- .../recipes/granite_relief_pickaxe.json | 72 +++--- .../recipes/granite_relief_plus.json | 72 +++--- .../recipes/granite_relief_right.json | 72 +++--- .../recipes/granite_relief_sword.json | 72 +++--- .../recipes/granite_relief_vertical.json | 72 +++--- .../advancements/recipes/granite_slab.json | 74 +++--- .../recipes/granite_slab_from_vanilla.json | 80 +++--- .../recipes/granite_slab_to_vanilla.json | 80 +++--- .../advancements/recipes/granite_smooth.json | 102 ++++---- .../recipes/granite_smooth_brick.json | 70 +++--- .../recipes/granite_smooth_brick_furnace.json | 70 +++--- .../recipes/granite_smooth_brick_slab.json | 72 +++--- .../recipes/granite_smooth_brick_stairs.json | 70 +++--- .../recipes/granite_smooth_brick_wall.json | 70 +++--- .../recipes/granite_smooth_furnace.json | 70 +++--- .../recipes/granite_smooth_slab.json | 72 +++--- .../granite_smooth_slab_from_vanilla.json | 80 +++--- .../granite_smooth_slab_to_vanilla.json | 80 +++--- .../recipes/granite_smooth_stairs.json | 72 +++--- .../recipes/granite_smooth_wall.json | 70 +++--- .../advancements/recipes/granite_stairs.json | 74 +++--- .../recipes/granite_to_stone.json | 60 ++--- .../advancements/recipes/granite_wall.json | 74 +++--- .../advancements/recipes/gravel_to_stone.json | 72 +++--- .../recipes/gunpowder_from_carbon_dust.json | 86 +++---- .../recipes/gunpowder_from_charcoal.json | 72 +++--- .../recipes/gunpowder_from_coal_dust.json | 86 +++---- .../recipes/gunpowder_from_sugar.json | 72 +++--- .../advancements/recipes/gypsum.json | 72 +++--- .../advancements/recipes/gypsum_dust.json | 72 +++--- .../advancements/recipes/hornfels_brick.json | 70 +++--- .../hornfels_brick_block_polishing.json | 134 ++++++----- .../recipes/hornfels_brick_furnace.json | 70 +++--- .../recipes/hornfels_brick_slab.json | 72 +++--- .../hornfels_brick_slab_polishing.json | 134 ++++++----- .../hornfels_brick_slab_recombination.json | 80 +++--- .../recipes/hornfels_brick_stairs.json | 70 +++--- .../hornfels_brick_stairs_polishing.json | 134 ++++++----- .../recipes/hornfels_brick_wall.json | 70 +++--- .../hornfels_brick_wall_polishing.json | 134 ++++++----- .../recipes/hornfels_cobblestone.json | 62 ++--- .../recipes/hornfels_furnace.json | 70 +++--- ...els_polished_brick_slab_recombination.json | 80 +++--- .../hornfels_polished_slab_recombination.json | 80 +++--- .../hornfels_polished_slabs_to_brick.json | 80 +++--- .../hornfels_polished_stairs_to_brick.json | 80 +++--- .../hornfels_polished_walls_to_brick.json | 80 +++--- .../recipes/hornfels_raw_slab_polishing.json | 134 ++++++----- .../hornfels_raw_slab_recombination.json | 80 +++--- .../recipes/hornfels_raw_slabs_to_brick.json | 80 +++--- .../hornfels_raw_stairs_polishing.json | 134 ++++++----- .../recipes/hornfels_raw_stairs_to_brick.json | 80 +++--- .../recipes/hornfels_raw_wall_polishing.json | 134 ++++++----- .../recipes/hornfels_raw_walls_to_brick.json | 80 +++--- .../recipes/hornfels_relief_axe.json | 72 +++--- .../recipes/hornfels_relief_blank.json | 72 +++--- .../recipes/hornfels_relief_cross.json | 72 +++--- .../recipes/hornfels_relief_hammer.json | 72 +++--- .../recipes/hornfels_relief_hoe.json | 72 +++--- .../recipes/hornfels_relief_horizontal.json | 72 +++--- .../recipes/hornfels_relief_i.json | 72 +++--- .../recipes/hornfels_relief_left.json | 72 +++--- .../recipes/hornfels_relief_pickaxe.json | 72 +++--- .../recipes/hornfels_relief_plus.json | 72 +++--- .../recipes/hornfels_relief_right.json | 72 +++--- .../recipes/hornfels_relief_sword.json | 72 +++--- .../recipes/hornfels_relief_vertical.json | 72 +++--- .../advancements/recipes/hornfels_slab.json | 74 +++--- .../advancements/recipes/hornfels_smooth.json | 100 ++++---- .../recipes/hornfels_smooth_brick.json | 70 +++--- .../hornfels_smooth_brick_furnace.json | 70 +++--- .../recipes/hornfels_smooth_brick_slab.json | 72 +++--- .../recipes/hornfels_smooth_brick_stairs.json | 70 +++--- .../recipes/hornfels_smooth_brick_wall.json | 70 +++--- .../recipes/hornfels_smooth_furnace.json | 70 +++--- .../recipes/hornfels_smooth_slab.json | 72 +++--- .../recipes/hornfels_smooth_stairs.json | 70 +++--- .../recipes/hornfels_smooth_wall.json | 70 +++--- .../advancements/recipes/hornfels_stairs.json | 70 +++--- .../recipes/hornfels_to_stone.json | 60 ++--- .../advancements/recipes/hornfels_wall.json | 70 +++--- .../advancements/recipes/limestone_brick.json | 70 +++--- .../limestone_brick_block_polishing.json | 134 ++++++----- .../recipes/limestone_brick_furnace.json | 70 +++--- .../recipes/limestone_brick_slab.json | 72 +++--- .../limestone_brick_slab_polishing.json | 134 ++++++----- .../limestone_brick_slab_recombination.json | 80 +++--- .../recipes/limestone_brick_stairs.json | 70 +++--- .../limestone_brick_stairs_polishing.json | 134 ++++++----- .../recipes/limestone_brick_wall.json | 70 +++--- .../limestone_brick_wall_polishing.json | 134 ++++++----- .../recipes/limestone_cobblestone.json | 62 ++--- .../recipes/limestone_furnace.json | 70 +++--- ...one_polished_brick_slab_recombination.json | 80 +++--- ...limestone_polished_slab_recombination.json | 80 +++--- .../limestone_polished_slabs_to_brick.json | 80 +++--- .../limestone_polished_stairs_to_brick.json | 80 +++--- .../limestone_polished_walls_to_brick.json | 80 +++--- .../recipes/limestone_raw_slab_polishing.json | 134 ++++++----- .../limestone_raw_slab_recombination.json | 80 +++--- .../recipes/limestone_raw_slabs_to_brick.json | 80 +++--- .../limestone_raw_stairs_polishing.json | 134 ++++++----- .../limestone_raw_stairs_to_brick.json | 80 +++--- .../recipes/limestone_raw_wall_polishing.json | 134 ++++++----- .../recipes/limestone_raw_walls_to_brick.json | 80 +++--- .../recipes/limestone_relief_axe.json | 72 +++--- .../recipes/limestone_relief_blank.json | 72 +++--- .../recipes/limestone_relief_cross.json | 72 +++--- .../recipes/limestone_relief_hammer.json | 72 +++--- .../recipes/limestone_relief_hoe.json | 72 +++--- .../recipes/limestone_relief_horizontal.json | 72 +++--- .../recipes/limestone_relief_i.json | 72 +++--- .../recipes/limestone_relief_left.json | 72 +++--- .../recipes/limestone_relief_pickaxe.json | 72 +++--- .../recipes/limestone_relief_plus.json | 72 +++--- .../recipes/limestone_relief_right.json | 72 +++--- .../recipes/limestone_relief_sword.json | 72 +++--- .../recipes/limestone_relief_vertical.json | 72 +++--- .../advancements/recipes/limestone_slab.json | 74 +++--- .../recipes/limestone_smooth.json | 100 ++++---- .../recipes/limestone_smooth_brick.json | 70 +++--- .../limestone_smooth_brick_furnace.json | 70 +++--- .../recipes/limestone_smooth_brick_slab.json | 72 +++--- .../limestone_smooth_brick_stairs.json | 70 +++--- .../recipes/limestone_smooth_brick_wall.json | 70 +++--- .../recipes/limestone_smooth_furnace.json | 70 +++--- .../recipes/limestone_smooth_slab.json | 72 +++--- .../recipes/limestone_smooth_stairs.json | 70 +++--- .../recipes/limestone_smooth_wall.json | 70 +++--- .../recipes/limestone_stairs.json | 70 +++--- .../recipes/limestone_to_stone.json | 60 ++--- .../advancements/recipes/limestone_wall.json | 70 +++--- .../advancements/recipes/marble_brick.json | 70 +++--- .../recipes/marble_brick_block_polishing.json | 134 ++++++----- .../recipes/marble_brick_furnace.json | 70 +++--- .../recipes/marble_brick_slab.json | 72 +++--- .../recipes/marble_brick_slab_polishing.json | 134 ++++++----- .../marble_brick_slab_recombination.json | 80 +++--- .../recipes/marble_brick_stairs.json | 70 +++--- .../marble_brick_stairs_polishing.json | 134 ++++++----- .../recipes/marble_brick_wall.json | 70 +++--- .../recipes/marble_brick_wall_polishing.json | 134 ++++++----- .../recipes/marble_cobblestone.json | 62 ++--- .../advancements/recipes/marble_furnace.json | 70 +++--- ...ble_polished_brick_slab_recombination.json | 80 +++--- .../marble_polished_slab_recombination.json | 80 +++--- .../marble_polished_slabs_to_brick.json | 80 +++--- .../marble_polished_stairs_to_brick.json | 80 +++--- .../marble_polished_walls_to_brick.json | 80 +++--- .../recipes/marble_raw_slab_polishing.json | 134 ++++++----- .../marble_raw_slab_recombination.json | 80 +++--- .../recipes/marble_raw_slabs_to_brick.json | 80 +++--- .../recipes/marble_raw_stairs_polishing.json | 134 ++++++----- .../recipes/marble_raw_stairs_to_brick.json | 80 +++--- .../recipes/marble_raw_wall_polishing.json | 134 ++++++----- .../recipes/marble_raw_walls_to_brick.json | 80 +++--- .../recipes/marble_relief_axe.json | 72 +++--- .../recipes/marble_relief_blank.json | 72 +++--- .../recipes/marble_relief_cross.json | 72 +++--- .../recipes/marble_relief_hammer.json | 72 +++--- .../recipes/marble_relief_hoe.json | 72 +++--- .../recipes/marble_relief_horizontal.json | 72 +++--- .../advancements/recipes/marble_relief_i.json | 72 +++--- .../recipes/marble_relief_left.json | 72 +++--- .../recipes/marble_relief_pickaxe.json | 72 +++--- .../recipes/marble_relief_plus.json | 72 +++--- .../recipes/marble_relief_right.json | 72 +++--- .../recipes/marble_relief_sword.json | 72 +++--- .../recipes/marble_relief_vertical.json | 72 +++--- .../advancements/recipes/marble_slab.json | 74 +++--- .../advancements/recipes/marble_smooth.json | 100 ++++---- .../recipes/marble_smooth_brick.json | 70 +++--- .../recipes/marble_smooth_brick_furnace.json | 70 +++--- .../recipes/marble_smooth_brick_slab.json | 72 +++--- .../recipes/marble_smooth_brick_stairs.json | 70 +++--- .../recipes/marble_smooth_brick_wall.json | 70 +++--- .../recipes/marble_smooth_furnace.json | 70 +++--- .../recipes/marble_smooth_slab.json | 72 +++--- .../recipes/marble_smooth_stairs.json | 70 +++--- .../recipes/marble_smooth_wall.json | 70 +++--- .../advancements/recipes/marble_stairs.json | 70 +++--- .../advancements/recipes/marble_to_stone.json | 60 ++--- .../advancements/recipes/marble_wall.json | 70 +++--- .../recipes/mineralfertilizer.json | 80 +++--- .../advancements/recipes/nitrate_block.json | 80 +++--- .../advancements/recipes/nitrate_dust.json | 80 +++--- .../recipes/novaculite_brick.json | 70 +++--- .../novaculite_brick_block_polishing.json | 134 ++++++----- .../recipes/novaculite_brick_furnace.json | 70 +++--- .../recipes/novaculite_brick_slab.json | 72 +++--- .../novaculite_brick_slab_polishing.json | 134 ++++++----- .../novaculite_brick_slab_recombination.json | 80 +++--- .../recipes/novaculite_brick_stairs.json | 70 +++--- .../novaculite_brick_stairs_polishing.json | 134 ++++++----- .../recipes/novaculite_brick_wall.json | 70 +++--- .../novaculite_brick_wall_polishing.json | 134 ++++++----- .../recipes/novaculite_cobblestone.json | 62 ++--- .../recipes/novaculite_furnace.json | 70 +++--- ...ite_polished_brick_slab_recombination.json | 80 +++--- ...ovaculite_polished_slab_recombination.json | 80 +++--- .../novaculite_polished_slabs_to_brick.json | 80 +++--- .../novaculite_polished_stairs_to_brick.json | 80 +++--- .../novaculite_polished_walls_to_brick.json | 80 +++--- .../novaculite_raw_slab_polishing.json | 134 ++++++----- .../novaculite_raw_slab_recombination.json | 80 +++--- .../novaculite_raw_slabs_to_brick.json | 80 +++--- .../novaculite_raw_stairs_polishing.json | 134 ++++++----- .../novaculite_raw_stairs_to_brick.json | 80 +++--- .../novaculite_raw_wall_polishing.json | 134 ++++++----- .../novaculite_raw_walls_to_brick.json | 80 +++--- .../recipes/novaculite_relief_axe.json | 72 +++--- .../recipes/novaculite_relief_blank.json | 72 +++--- .../recipes/novaculite_relief_cross.json | 72 +++--- .../recipes/novaculite_relief_hammer.json | 72 +++--- .../recipes/novaculite_relief_hoe.json | 72 +++--- .../recipes/novaculite_relief_horizontal.json | 72 +++--- .../recipes/novaculite_relief_i.json | 72 +++--- .../recipes/novaculite_relief_left.json | 72 +++--- .../recipes/novaculite_relief_pickaxe.json | 72 +++--- .../recipes/novaculite_relief_plus.json | 72 +++--- .../recipes/novaculite_relief_right.json | 72 +++--- .../recipes/novaculite_relief_sword.json | 72 +++--- .../recipes/novaculite_relief_vertical.json | 72 +++--- .../advancements/recipes/novaculite_slab.json | 74 +++--- .../recipes/novaculite_smooth.json | 100 ++++---- .../recipes/novaculite_smooth_brick.json | 70 +++--- .../novaculite_smooth_brick_furnace.json | 70 +++--- .../recipes/novaculite_smooth_brick_slab.json | 72 +++--- .../novaculite_smooth_brick_stairs.json | 70 +++--- .../recipes/novaculite_smooth_brick_wall.json | 70 +++--- .../recipes/novaculite_smooth_furnace.json | 70 +++--- .../recipes/novaculite_smooth_slab.json | 72 +++--- .../recipes/novaculite_smooth_stairs.json | 70 +++--- .../recipes/novaculite_smooth_wall.json | 70 +++--- .../recipes/novaculite_stairs.json | 70 +++--- .../recipes/novaculite_to_stone.json | 60 ++--- .../advancements/recipes/novaculite_wall.json | 70 +++--- .../advancements/recipes/pegmatite_brick.json | 70 +++--- .../pegmatite_brick_block_polishing.json | 134 ++++++----- .../recipes/pegmatite_brick_furnace.json | 70 +++--- .../recipes/pegmatite_brick_slab.json | 72 +++--- .../pegmatite_brick_slab_polishing.json | 134 ++++++----- .../pegmatite_brick_slab_recombination.json | 80 +++--- .../recipes/pegmatite_brick_stairs.json | 70 +++--- .../pegmatite_brick_stairs_polishing.json | 134 ++++++----- .../recipes/pegmatite_brick_wall.json | 70 +++--- .../pegmatite_brick_wall_polishing.json | 134 ++++++----- .../recipes/pegmatite_cobblestone.json | 62 ++--- .../recipes/pegmatite_furnace.json | 70 +++--- ...ite_polished_brick_slab_recombination.json | 80 +++--- ...pegmatite_polished_slab_recombination.json | 80 +++--- .../pegmatite_polished_slabs_to_brick.json | 80 +++--- .../pegmatite_polished_stairs_to_brick.json | 80 +++--- .../pegmatite_polished_walls_to_brick.json | 80 +++--- .../recipes/pegmatite_raw_slab_polishing.json | 134 ++++++----- .../pegmatite_raw_slab_recombination.json | 80 +++--- .../recipes/pegmatite_raw_slabs_to_brick.json | 80 +++--- .../pegmatite_raw_stairs_polishing.json | 134 ++++++----- .../pegmatite_raw_stairs_to_brick.json | 80 +++--- .../recipes/pegmatite_raw_wall_polishing.json | 134 ++++++----- .../recipes/pegmatite_raw_walls_to_brick.json | 80 +++--- .../recipes/pegmatite_relief_axe.json | 72 +++--- .../recipes/pegmatite_relief_blank.json | 72 +++--- .../recipes/pegmatite_relief_cross.json | 72 +++--- .../recipes/pegmatite_relief_hammer.json | 72 +++--- .../recipes/pegmatite_relief_hoe.json | 72 +++--- .../recipes/pegmatite_relief_horizontal.json | 72 +++--- .../recipes/pegmatite_relief_i.json | 72 +++--- .../recipes/pegmatite_relief_left.json | 72 +++--- .../recipes/pegmatite_relief_pickaxe.json | 72 +++--- .../recipes/pegmatite_relief_plus.json | 72 +++--- .../recipes/pegmatite_relief_right.json | 72 +++--- .../recipes/pegmatite_relief_sword.json | 72 +++--- .../recipes/pegmatite_relief_vertical.json | 72 +++--- .../advancements/recipes/pegmatite_slab.json | 74 +++--- .../recipes/pegmatite_smooth.json | 100 ++++---- .../recipes/pegmatite_smooth_brick.json | 70 +++--- .../pegmatite_smooth_brick_furnace.json | 70 +++--- .../recipes/pegmatite_smooth_brick_slab.json | 72 +++--- .../pegmatite_smooth_brick_stairs.json | 70 +++--- .../recipes/pegmatite_smooth_brick_wall.json | 70 +++--- .../recipes/pegmatite_smooth_furnace.json | 70 +++--- .../recipes/pegmatite_smooth_slab.json | 72 +++--- .../recipes/pegmatite_smooth_stairs.json | 70 +++--- .../recipes/pegmatite_smooth_wall.json | 70 +++--- .../recipes/pegmatite_stairs.json | 70 +++--- .../recipes/pegmatite_to_stone.json | 60 ++--- .../advancements/recipes/pegmatite_wall.json | 70 +++--- .../recipes/peridotite_brick.json | 70 +++--- .../peridotite_brick_block_polishing.json | 134 ++++++----- .../recipes/peridotite_brick_furnace.json | 70 +++--- .../recipes/peridotite_brick_slab.json | 72 +++--- .../peridotite_brick_slab_polishing.json | 134 ++++++----- .../peridotite_brick_slab_recombination.json | 80 +++--- .../recipes/peridotite_brick_stairs.json | 70 +++--- .../peridotite_brick_stairs_polishing.json | 134 ++++++----- .../recipes/peridotite_brick_wall.json | 70 +++--- .../peridotite_brick_wall_polishing.json | 134 ++++++----- .../recipes/peridotite_cobblestone.json | 62 ++--- .../recipes/peridotite_furnace.json | 70 +++--- ...ite_polished_brick_slab_recombination.json | 80 +++--- ...eridotite_polished_slab_recombination.json | 80 +++--- .../peridotite_polished_slabs_to_brick.json | 80 +++--- .../peridotite_polished_stairs_to_brick.json | 80 +++--- .../peridotite_polished_walls_to_brick.json | 80 +++--- .../peridotite_raw_slab_polishing.json | 134 ++++++----- .../peridotite_raw_slab_recombination.json | 80 +++--- .../peridotite_raw_slabs_to_brick.json | 80 +++--- .../peridotite_raw_stairs_polishing.json | 134 ++++++----- .../peridotite_raw_stairs_to_brick.json | 80 +++--- .../peridotite_raw_wall_polishing.json | 134 ++++++----- .../peridotite_raw_walls_to_brick.json | 80 +++--- .../recipes/peridotite_relief_axe.json | 72 +++--- .../recipes/peridotite_relief_blank.json | 72 +++--- .../recipes/peridotite_relief_cross.json | 72 +++--- .../recipes/peridotite_relief_hammer.json | 72 +++--- .../recipes/peridotite_relief_hoe.json | 72 +++--- .../recipes/peridotite_relief_horizontal.json | 72 +++--- .../recipes/peridotite_relief_i.json | 72 +++--- .../recipes/peridotite_relief_left.json | 72 +++--- .../recipes/peridotite_relief_pickaxe.json | 72 +++--- .../recipes/peridotite_relief_plus.json | 72 +++--- .../recipes/peridotite_relief_right.json | 72 +++--- .../recipes/peridotite_relief_sword.json | 72 +++--- .../recipes/peridotite_relief_vertical.json | 72 +++--- .../advancements/recipes/peridotite_slab.json | 74 +++--- .../recipes/peridotite_smooth.json | 100 ++++---- .../recipes/peridotite_smooth_brick.json | 70 +++--- .../peridotite_smooth_brick_furnace.json | 70 +++--- .../recipes/peridotite_smooth_brick_slab.json | 72 +++--- .../peridotite_smooth_brick_stairs.json | 70 +++--- .../recipes/peridotite_smooth_brick_wall.json | 70 +++--- .../recipes/peridotite_smooth_furnace.json | 70 +++--- .../recipes/peridotite_smooth_slab.json | 72 +++--- .../recipes/peridotite_smooth_stairs.json | 70 +++--- .../recipes/peridotite_smooth_wall.json | 70 +++--- .../recipes/peridotite_stairs.json | 70 +++--- .../recipes/peridotite_to_stone.json | 60 ++--- .../advancements/recipes/peridotite_wall.json | 70 +++--- .../recipes/phosphorous_block.json | 80 +++--- .../recipes/phosphorous_dust.json | 80 +++--- .../advancements/recipes/phyllite_brick.json | 70 +++--- .../phyllite_brick_block_polishing.json | 134 ++++++----- .../recipes/phyllite_brick_furnace.json | 70 +++--- .../recipes/phyllite_brick_slab.json | 72 +++--- .../phyllite_brick_slab_polishing.json | 134 ++++++----- .../phyllite_brick_slab_recombination.json | 80 +++--- .../recipes/phyllite_brick_stairs.json | 70 +++--- .../phyllite_brick_stairs_polishing.json | 134 ++++++----- .../recipes/phyllite_brick_wall.json | 70 +++--- .../phyllite_brick_wall_polishing.json | 134 ++++++----- .../recipes/phyllite_cobblestone.json | 62 ++--- .../recipes/phyllite_furnace.json | 70 +++--- ...ite_polished_brick_slab_recombination.json | 80 +++--- .../phyllite_polished_slab_recombination.json | 80 +++--- .../phyllite_polished_slabs_to_brick.json | 80 +++--- .../phyllite_polished_stairs_to_brick.json | 80 +++--- .../phyllite_polished_walls_to_brick.json | 80 +++--- .../recipes/phyllite_raw_slab_polishing.json | 134 ++++++----- .../phyllite_raw_slab_recombination.json | 80 +++--- .../recipes/phyllite_raw_slabs_to_brick.json | 80 +++--- .../phyllite_raw_stairs_polishing.json | 134 ++++++----- .../recipes/phyllite_raw_stairs_to_brick.json | 80 +++--- .../recipes/phyllite_raw_wall_polishing.json | 134 ++++++----- .../recipes/phyllite_raw_walls_to_brick.json | 80 +++--- .../recipes/phyllite_relief_axe.json | 72 +++--- .../recipes/phyllite_relief_blank.json | 72 +++--- .../recipes/phyllite_relief_cross.json | 72 +++--- .../recipes/phyllite_relief_hammer.json | 72 +++--- .../recipes/phyllite_relief_hoe.json | 72 +++--- .../recipes/phyllite_relief_horizontal.json | 72 +++--- .../recipes/phyllite_relief_i.json | 72 +++--- .../recipes/phyllite_relief_left.json | 72 +++--- .../recipes/phyllite_relief_pickaxe.json | 72 +++--- .../recipes/phyllite_relief_plus.json | 72 +++--- .../recipes/phyllite_relief_right.json | 72 +++--- .../recipes/phyllite_relief_sword.json | 72 +++--- .../recipes/phyllite_relief_vertical.json | 72 +++--- .../advancements/recipes/phyllite_slab.json | 74 +++--- .../advancements/recipes/phyllite_smooth.json | 100 ++++---- .../recipes/phyllite_smooth_brick.json | 70 +++--- .../phyllite_smooth_brick_furnace.json | 70 +++--- .../recipes/phyllite_smooth_brick_slab.json | 72 +++--- .../recipes/phyllite_smooth_brick_stairs.json | 70 +++--- .../recipes/phyllite_smooth_brick_wall.json | 70 +++--- .../recipes/phyllite_smooth_furnace.json | 70 +++--- .../recipes/phyllite_smooth_slab.json | 72 +++--- .../recipes/phyllite_smooth_stairs.json | 70 +++--- .../recipes/phyllite_smooth_wall.json | 70 +++--- .../advancements/recipes/phyllite_stairs.json | 70 +++--- .../recipes/phyllite_to_stone.json | 60 ++--- .../advancements/recipes/phyllite_wall.json | 70 +++--- .../advancements/recipes/quartzite_brick.json | 70 +++--- .../quartzite_brick_block_polishing.json | 134 ++++++----- .../recipes/quartzite_brick_furnace.json | 70 +++--- .../recipes/quartzite_brick_slab.json | 72 +++--- .../quartzite_brick_slab_polishing.json | 134 ++++++----- .../quartzite_brick_slab_recombination.json | 80 +++--- .../recipes/quartzite_brick_stairs.json | 70 +++--- .../quartzite_brick_stairs_polishing.json | 134 ++++++----- .../recipes/quartzite_brick_wall.json | 70 +++--- .../quartzite_brick_wall_polishing.json | 134 ++++++----- .../recipes/quartzite_cobblestone.json | 62 ++--- .../recipes/quartzite_furnace.json | 70 +++--- ...ite_polished_brick_slab_recombination.json | 80 +++--- ...quartzite_polished_slab_recombination.json | 80 +++--- .../quartzite_polished_slabs_to_brick.json | 80 +++--- .../quartzite_polished_stairs_to_brick.json | 80 +++--- .../quartzite_polished_walls_to_brick.json | 80 +++--- .../recipes/quartzite_raw_slab_polishing.json | 134 ++++++----- .../quartzite_raw_slab_recombination.json | 80 +++--- .../recipes/quartzite_raw_slabs_to_brick.json | 80 +++--- .../quartzite_raw_stairs_polishing.json | 134 ++++++----- .../quartzite_raw_stairs_to_brick.json | 80 +++--- .../recipes/quartzite_raw_wall_polishing.json | 134 ++++++----- .../recipes/quartzite_raw_walls_to_brick.json | 80 +++--- .../recipes/quartzite_relief_axe.json | 72 +++--- .../recipes/quartzite_relief_blank.json | 72 +++--- .../recipes/quartzite_relief_cross.json | 72 +++--- .../recipes/quartzite_relief_hammer.json | 72 +++--- .../recipes/quartzite_relief_hoe.json | 72 +++--- .../recipes/quartzite_relief_horizontal.json | 72 +++--- .../recipes/quartzite_relief_i.json | 72 +++--- .../recipes/quartzite_relief_left.json | 72 +++--- .../recipes/quartzite_relief_pickaxe.json | 72 +++--- .../recipes/quartzite_relief_plus.json | 72 +++--- .../recipes/quartzite_relief_right.json | 72 +++--- .../recipes/quartzite_relief_sword.json | 72 +++--- .../recipes/quartzite_relief_vertical.json | 72 +++--- .../advancements/recipes/quartzite_slab.json | 74 +++--- .../recipes/quartzite_smooth.json | 100 ++++---- .../recipes/quartzite_smooth_brick.json | 70 +++--- .../quartzite_smooth_brick_furnace.json | 70 +++--- .../recipes/quartzite_smooth_brick_slab.json | 72 +++--- .../quartzite_smooth_brick_stairs.json | 70 +++--- .../recipes/quartzite_smooth_brick_wall.json | 70 +++--- .../recipes/quartzite_smooth_furnace.json | 70 +++--- .../recipes/quartzite_smooth_slab.json | 72 +++--- .../recipes/quartzite_smooth_stairs.json | 70 +++--- .../recipes/quartzite_smooth_wall.json | 70 +++--- .../recipes/quartzite_stairs.json | 70 +++--- .../recipes/quartzite_to_stone.json | 60 ++--- .../advancements/recipes/quartzite_wall.json | 70 +++--- .../advancements/recipes/rhyolite_brick.json | 70 +++--- .../rhyolite_brick_block_polishing.json | 134 ++++++----- .../recipes/rhyolite_brick_furnace.json | 70 +++--- .../recipes/rhyolite_brick_slab.json | 72 +++--- .../rhyolite_brick_slab_polishing.json | 134 ++++++----- .../rhyolite_brick_slab_recombination.json | 80 +++--- .../recipes/rhyolite_brick_stairs.json | 70 +++--- .../rhyolite_brick_stairs_polishing.json | 134 ++++++----- .../recipes/rhyolite_brick_wall.json | 70 +++--- .../rhyolite_brick_wall_polishing.json | 134 ++++++----- .../recipes/rhyolite_cobblestone.json | 62 ++--- .../recipes/rhyolite_furnace.json | 70 +++--- ...ite_polished_brick_slab_recombination.json | 80 +++--- .../rhyolite_polished_slab_recombination.json | 80 +++--- .../rhyolite_polished_slabs_to_brick.json | 80 +++--- .../rhyolite_polished_stairs_to_brick.json | 80 +++--- .../rhyolite_polished_walls_to_brick.json | 80 +++--- .../recipes/rhyolite_raw_slab_polishing.json | 134 ++++++----- .../rhyolite_raw_slab_recombination.json | 80 +++--- .../recipes/rhyolite_raw_slabs_to_brick.json | 80 +++--- .../rhyolite_raw_stairs_polishing.json | 134 ++++++----- .../recipes/rhyolite_raw_stairs_to_brick.json | 80 +++--- .../recipes/rhyolite_raw_wall_polishing.json | 134 ++++++----- .../recipes/rhyolite_raw_walls_to_brick.json | 80 +++--- .../recipes/rhyolite_relief_axe.json | 72 +++--- .../recipes/rhyolite_relief_blank.json | 72 +++--- .../recipes/rhyolite_relief_cross.json | 72 +++--- .../recipes/rhyolite_relief_hammer.json | 72 +++--- .../recipes/rhyolite_relief_hoe.json | 72 +++--- .../recipes/rhyolite_relief_horizontal.json | 72 +++--- .../recipes/rhyolite_relief_i.json | 72 +++--- .../recipes/rhyolite_relief_left.json | 72 +++--- .../recipes/rhyolite_relief_pickaxe.json | 72 +++--- .../recipes/rhyolite_relief_plus.json | 72 +++--- .../recipes/rhyolite_relief_right.json | 72 +++--- .../recipes/rhyolite_relief_sword.json | 72 +++--- .../recipes/rhyolite_relief_vertical.json | 72 +++--- .../advancements/recipes/rhyolite_slab.json | 74 +++--- .../advancements/recipes/rhyolite_smooth.json | 100 ++++---- .../recipes/rhyolite_smooth_brick.json | 70 +++--- .../rhyolite_smooth_brick_furnace.json | 70 +++--- .../recipes/rhyolite_smooth_brick_slab.json | 72 +++--- .../recipes/rhyolite_smooth_brick_stairs.json | 70 +++--- .../recipes/rhyolite_smooth_brick_wall.json | 70 +++--- .../recipes/rhyolite_smooth_furnace.json | 70 +++--- .../recipes/rhyolite_smooth_slab.json | 72 +++--- .../recipes/rhyolite_smooth_stairs.json | 70 +++--- .../recipes/rhyolite_smooth_wall.json | 70 +++--- .../advancements/recipes/rhyolite_stairs.json | 70 +++--- .../recipes/rhyolite_to_stone.json | 60 ++--- .../advancements/recipes/rhyolite_wall.json | 70 +++--- .../advancements/recipes/rock_salt.json | 72 +++--- .../advancements/recipes/rock_salt_brick.json | 70 +++--- .../rock_salt_brick_block_polishing.json | 134 ++++++----- .../recipes/rock_salt_brick_furnace.json | 70 +++--- .../recipes/rock_salt_brick_slab.json | 72 +++--- .../rock_salt_brick_slab_polishing.json | 134 ++++++----- .../rock_salt_brick_slab_recombination.json | 80 +++--- .../recipes/rock_salt_brick_stairs.json | 70 +++--- .../rock_salt_brick_stairs_polishing.json | 134 ++++++----- .../recipes/rock_salt_brick_wall.json | 70 +++--- .../rock_salt_brick_wall_polishing.json | 134 ++++++----- .../recipes/rock_salt_cobblestone.json | 62 ++--- .../advancements/recipes/rock_salt_dust.json | 72 +++--- .../recipes/rock_salt_furnace.json | 70 +++--- ...alt_polished_brick_slab_recombination.json | 80 +++--- ...rock_salt_polished_slab_recombination.json | 80 +++--- .../rock_salt_polished_slabs_to_brick.json | 80 +++--- .../rock_salt_polished_stairs_to_brick.json | 80 +++--- .../rock_salt_polished_walls_to_brick.json | 80 +++--- .../recipes/rock_salt_raw_slab_polishing.json | 134 ++++++----- .../rock_salt_raw_slab_recombination.json | 80 +++--- .../recipes/rock_salt_raw_slabs_to_brick.json | 80 +++--- .../rock_salt_raw_stairs_polishing.json | 134 ++++++----- .../rock_salt_raw_stairs_to_brick.json | 80 +++--- .../recipes/rock_salt_raw_wall_polishing.json | 134 ++++++----- .../recipes/rock_salt_raw_walls_to_brick.json | 80 +++--- .../recipes/rock_salt_relief_axe.json | 72 +++--- .../recipes/rock_salt_relief_blank.json | 72 +++--- .../recipes/rock_salt_relief_cross.json | 72 +++--- .../recipes/rock_salt_relief_hammer.json | 72 +++--- .../recipes/rock_salt_relief_hoe.json | 72 +++--- .../recipes/rock_salt_relief_horizontal.json | 72 +++--- .../recipes/rock_salt_relief_i.json | 72 +++--- .../recipes/rock_salt_relief_left.json | 72 +++--- .../recipes/rock_salt_relief_pickaxe.json | 72 +++--- .../recipes/rock_salt_relief_plus.json | 72 +++--- .../recipes/rock_salt_relief_right.json | 72 +++--- .../recipes/rock_salt_relief_sword.json | 72 +++--- .../recipes/rock_salt_relief_vertical.json | 72 +++--- .../advancements/recipes/rock_salt_slab.json | 74 +++--- .../recipes/rock_salt_smooth.json | 100 ++++---- .../recipes/rock_salt_smooth_brick.json | 70 +++--- .../rock_salt_smooth_brick_furnace.json | 70 +++--- .../recipes/rock_salt_smooth_brick_slab.json | 72 +++--- .../rock_salt_smooth_brick_stairs.json | 70 +++--- .../recipes/rock_salt_smooth_brick_wall.json | 70 +++--- .../recipes/rock_salt_smooth_furnace.json | 70 +++--- .../recipes/rock_salt_smooth_slab.json | 72 +++--- .../recipes/rock_salt_smooth_stairs.json | 70 +++--- .../recipes/rock_salt_smooth_wall.json | 70 +++--- .../recipes/rock_salt_stairs.json | 70 +++--- .../recipes/rock_salt_to_stone.json | 60 ++--- .../advancements/recipes/rock_salt_wall.json | 70 +++--- .../advancements/recipes/rocksaltlamp.json | 82 +++---- .../recipes/rocksaltstreetlamp.json | 82 +++---- .../advancements/recipes/schist_brick.json | 70 +++--- .../recipes/schist_brick_block_polishing.json | 134 ++++++----- .../recipes/schist_brick_furnace.json | 70 +++--- .../recipes/schist_brick_slab.json | 72 +++--- .../recipes/schist_brick_slab_polishing.json | 134 ++++++----- .../schist_brick_slab_recombination.json | 80 +++--- .../recipes/schist_brick_stairs.json | 70 +++--- .../schist_brick_stairs_polishing.json | 134 ++++++----- .../recipes/schist_brick_wall.json | 70 +++--- .../recipes/schist_brick_wall_polishing.json | 134 ++++++----- .../recipes/schist_cobblestone.json | 62 ++--- .../advancements/recipes/schist_furnace.json | 70 +++--- ...ist_polished_brick_slab_recombination.json | 80 +++--- .../schist_polished_slab_recombination.json | 80 +++--- .../schist_polished_slabs_to_brick.json | 80 +++--- .../schist_polished_stairs_to_brick.json | 80 +++--- .../schist_polished_walls_to_brick.json | 80 +++--- .../recipes/schist_raw_slab_polishing.json | 134 ++++++----- .../schist_raw_slab_recombination.json | 80 +++--- .../recipes/schist_raw_slabs_to_brick.json | 80 +++--- .../recipes/schist_raw_stairs_polishing.json | 134 ++++++----- .../recipes/schist_raw_stairs_to_brick.json | 80 +++--- .../recipes/schist_raw_wall_polishing.json | 134 ++++++----- .../recipes/schist_raw_walls_to_brick.json | 80 +++--- .../recipes/schist_relief_axe.json | 72 +++--- .../recipes/schist_relief_blank.json | 72 +++--- .../recipes/schist_relief_cross.json | 72 +++--- .../recipes/schist_relief_hammer.json | 72 +++--- .../recipes/schist_relief_hoe.json | 72 +++--- .../recipes/schist_relief_horizontal.json | 72 +++--- .../advancements/recipes/schist_relief_i.json | 72 +++--- .../recipes/schist_relief_left.json | 72 +++--- .../recipes/schist_relief_pickaxe.json | 72 +++--- .../recipes/schist_relief_plus.json | 72 +++--- .../recipes/schist_relief_right.json | 72 +++--- .../recipes/schist_relief_sword.json | 72 +++--- .../recipes/schist_relief_vertical.json | 72 +++--- .../advancements/recipes/schist_slab.json | 74 +++--- .../advancements/recipes/schist_smooth.json | 100 ++++---- .../recipes/schist_smooth_brick.json | 70 +++--- .../recipes/schist_smooth_brick_furnace.json | 70 +++--- .../recipes/schist_smooth_brick_slab.json | 72 +++--- .../recipes/schist_smooth_brick_stairs.json | 70 +++--- .../recipes/schist_smooth_brick_wall.json | 70 +++--- .../recipes/schist_smooth_furnace.json | 70 +++--- .../recipes/schist_smooth_slab.json | 72 +++--- .../recipes/schist_smooth_stairs.json | 70 +++--- .../recipes/schist_smooth_wall.json | 70 +++--- .../advancements/recipes/schist_stairs.json | 70 +++--- .../advancements/recipes/schist_to_stone.json | 60 ++--- .../advancements/recipes/schist_wall.json | 70 +++--- .../advancements/recipes/scoria_brick.json | 70 +++--- .../recipes/scoria_brick_block_polishing.json | 134 ++++++----- .../recipes/scoria_brick_furnace.json | 70 +++--- .../recipes/scoria_brick_slab.json | 72 +++--- .../recipes/scoria_brick_slab_polishing.json | 134 ++++++----- .../scoria_brick_slab_recombination.json | 80 +++--- .../recipes/scoria_brick_stairs.json | 70 +++--- .../scoria_brick_stairs_polishing.json | 134 ++++++----- .../recipes/scoria_brick_wall.json | 70 +++--- .../recipes/scoria_brick_wall_polishing.json | 134 ++++++----- .../recipes/scoria_cobblestone.json | 62 ++--- .../advancements/recipes/scoria_furnace.json | 70 +++--- ...ria_polished_brick_slab_recombination.json | 80 +++--- .../scoria_polished_slab_recombination.json | 80 +++--- .../scoria_polished_slabs_to_brick.json | 80 +++--- .../scoria_polished_stairs_to_brick.json | 80 +++--- .../scoria_polished_walls_to_brick.json | 80 +++--- .../recipes/scoria_raw_slab_polishing.json | 134 ++++++----- .../scoria_raw_slab_recombination.json | 80 +++--- .../recipes/scoria_raw_slabs_to_brick.json | 80 +++--- .../recipes/scoria_raw_stairs_polishing.json | 134 ++++++----- .../recipes/scoria_raw_stairs_to_brick.json | 80 +++--- .../recipes/scoria_raw_wall_polishing.json | 134 ++++++----- .../recipes/scoria_raw_walls_to_brick.json | 80 +++--- .../recipes/scoria_relief_axe.json | 72 +++--- .../recipes/scoria_relief_blank.json | 72 +++--- .../recipes/scoria_relief_cross.json | 72 +++--- .../recipes/scoria_relief_hammer.json | 72 +++--- .../recipes/scoria_relief_hoe.json | 72 +++--- .../recipes/scoria_relief_horizontal.json | 72 +++--- .../advancements/recipes/scoria_relief_i.json | 72 +++--- .../recipes/scoria_relief_left.json | 72 +++--- .../recipes/scoria_relief_pickaxe.json | 72 +++--- .../recipes/scoria_relief_plus.json | 72 +++--- .../recipes/scoria_relief_right.json | 72 +++--- .../recipes/scoria_relief_sword.json | 72 +++--- .../recipes/scoria_relief_vertical.json | 72 +++--- .../advancements/recipes/scoria_slab.json | 74 +++--- .../advancements/recipes/scoria_smooth.json | 100 ++++---- .../recipes/scoria_smooth_brick.json | 70 +++--- .../recipes/scoria_smooth_brick_furnace.json | 70 +++--- .../recipes/scoria_smooth_brick_slab.json | 72 +++--- .../recipes/scoria_smooth_brick_stairs.json | 70 +++--- .../recipes/scoria_smooth_brick_wall.json | 70 +++--- .../recipes/scoria_smooth_furnace.json | 70 +++--- .../recipes/scoria_smooth_slab.json | 72 +++--- .../recipes/scoria_smooth_stairs.json | 70 +++--- .../recipes/scoria_smooth_wall.json | 70 +++--- .../advancements/recipes/scoria_stairs.json | 70 +++--- .../advancements/recipes/scoria_to_stone.json | 60 ++--- .../advancements/recipes/scoria_wall.json | 70 +++--- .../advancements/recipes/shale_brick.json | 70 +++--- .../recipes/shale_brick_block_polishing.json | 134 ++++++----- .../recipes/shale_brick_furnace.json | 70 +++--- .../recipes/shale_brick_slab.json | 72 +++--- .../recipes/shale_brick_slab_polishing.json | 134 ++++++----- .../shale_brick_slab_recombination.json | 80 +++--- .../recipes/shale_brick_stairs.json | 70 +++--- .../recipes/shale_brick_stairs_polishing.json | 134 ++++++----- .../recipes/shale_brick_wall.json | 70 +++--- .../recipes/shale_brick_wall_polishing.json | 134 ++++++----- .../recipes/shale_cobblestone.json | 62 ++--- .../advancements/recipes/shale_furnace.json | 70 +++--- ...ale_polished_brick_slab_recombination.json | 80 +++--- .../shale_polished_slab_recombination.json | 80 +++--- .../shale_polished_slabs_to_brick.json | 80 +++--- .../shale_polished_stairs_to_brick.json | 80 +++--- .../shale_polished_walls_to_brick.json | 80 +++--- .../recipes/shale_raw_slab_polishing.json | 134 ++++++----- .../recipes/shale_raw_slab_recombination.json | 80 +++--- .../recipes/shale_raw_slabs_to_brick.json | 80 +++--- .../recipes/shale_raw_stairs_polishing.json | 134 ++++++----- .../recipes/shale_raw_stairs_to_brick.json | 80 +++--- .../recipes/shale_raw_wall_polishing.json | 134 ++++++----- .../recipes/shale_raw_walls_to_brick.json | 80 +++--- .../recipes/shale_relief_axe.json | 72 +++--- .../recipes/shale_relief_blank.json | 72 +++--- .../recipes/shale_relief_cross.json | 72 +++--- .../recipes/shale_relief_hammer.json | 72 +++--- .../recipes/shale_relief_hoe.json | 72 +++--- .../recipes/shale_relief_horizontal.json | 72 +++--- .../advancements/recipes/shale_relief_i.json | 72 +++--- .../recipes/shale_relief_left.json | 72 +++--- .../recipes/shale_relief_pickaxe.json | 72 +++--- .../recipes/shale_relief_plus.json | 72 +++--- .../recipes/shale_relief_right.json | 72 +++--- .../recipes/shale_relief_sword.json | 72 +++--- .../recipes/shale_relief_vertical.json | 72 +++--- .../advancements/recipes/shale_slab.json | 74 +++--- .../advancements/recipes/shale_smooth.json | 100 ++++---- .../recipes/shale_smooth_brick.json | 70 +++--- .../recipes/shale_smooth_brick_furnace.json | 70 +++--- .../recipes/shale_smooth_brick_slab.json | 72 +++--- .../recipes/shale_smooth_brick_stairs.json | 70 +++--- .../recipes/shale_smooth_brick_wall.json | 70 +++--- .../recipes/shale_smooth_furnace.json | 70 +++--- .../recipes/shale_smooth_slab.json | 72 +++--- .../recipes/shale_smooth_stairs.json | 70 +++--- .../recipes/shale_smooth_wall.json | 70 +++--- .../advancements/recipes/shale_stairs.json | 70 +++--- .../advancements/recipes/shale_to_stone.json | 60 ++--- .../advancements/recipes/shale_wall.json | 70 +++--- .../advancements/recipes/siltstone_brick.json | 70 +++--- .../siltstone_brick_block_polishing.json | 134 ++++++----- .../recipes/siltstone_brick_furnace.json | 70 +++--- .../recipes/siltstone_brick_slab.json | 72 +++--- .../siltstone_brick_slab_polishing.json | 134 ++++++----- .../siltstone_brick_slab_recombination.json | 80 +++--- .../recipes/siltstone_brick_stairs.json | 70 +++--- .../siltstone_brick_stairs_polishing.json | 134 ++++++----- .../recipes/siltstone_brick_wall.json | 70 +++--- .../siltstone_brick_wall_polishing.json | 134 ++++++----- .../recipes/siltstone_cobblestone.json | 62 ++--- .../recipes/siltstone_furnace.json | 70 +++--- ...one_polished_brick_slab_recombination.json | 80 +++--- ...siltstone_polished_slab_recombination.json | 80 +++--- .../siltstone_polished_slabs_to_brick.json | 80 +++--- .../siltstone_polished_stairs_to_brick.json | 80 +++--- .../siltstone_polished_walls_to_brick.json | 80 +++--- .../recipes/siltstone_raw_slab_polishing.json | 134 ++++++----- .../siltstone_raw_slab_recombination.json | 80 +++--- .../recipes/siltstone_raw_slabs_to_brick.json | 80 +++--- .../siltstone_raw_stairs_polishing.json | 134 ++++++----- .../siltstone_raw_stairs_to_brick.json | 80 +++--- .../recipes/siltstone_raw_wall_polishing.json | 134 ++++++----- .../recipes/siltstone_raw_walls_to_brick.json | 80 +++--- .../recipes/siltstone_relief_axe.json | 72 +++--- .../recipes/siltstone_relief_blank.json | 72 +++--- .../recipes/siltstone_relief_cross.json | 72 +++--- .../recipes/siltstone_relief_hammer.json | 72 +++--- .../recipes/siltstone_relief_hoe.json | 72 +++--- .../recipes/siltstone_relief_horizontal.json | 72 +++--- .../recipes/siltstone_relief_i.json | 72 +++--- .../recipes/siltstone_relief_left.json | 72 +++--- .../recipes/siltstone_relief_pickaxe.json | 72 +++--- .../recipes/siltstone_relief_plus.json | 72 +++--- .../recipes/siltstone_relief_right.json | 72 +++--- .../recipes/siltstone_relief_sword.json | 72 +++--- .../recipes/siltstone_relief_vertical.json | 72 +++--- .../advancements/recipes/siltstone_slab.json | 74 +++--- .../recipes/siltstone_smooth.json | 100 ++++---- .../recipes/siltstone_smooth_brick.json | 70 +++--- .../siltstone_smooth_brick_furnace.json | 70 +++--- .../recipes/siltstone_smooth_brick_slab.json | 72 +++--- .../siltstone_smooth_brick_stairs.json | 70 +++--- .../recipes/siltstone_smooth_brick_wall.json | 70 +++--- .../recipes/siltstone_smooth_furnace.json | 70 +++--- .../recipes/siltstone_smooth_slab.json | 72 +++--- .../recipes/siltstone_smooth_stairs.json | 70 +++--- .../recipes/siltstone_smooth_wall.json | 70 +++--- .../recipes/siltstone_stairs.json | 70 +++--- .../recipes/siltstone_to_stone.json | 60 ++--- .../advancements/recipes/siltstone_wall.json | 70 +++--- .../advancements/recipes/slate_brick.json | 70 +++--- .../recipes/slate_brick_block_polishing.json | 134 ++++++----- .../recipes/slate_brick_furnace.json | 70 +++--- .../recipes/slate_brick_slab.json | 72 +++--- .../recipes/slate_brick_slab_polishing.json | 134 ++++++----- .../slate_brick_slab_recombination.json | 80 +++--- .../recipes/slate_brick_stairs.json | 70 +++--- .../recipes/slate_brick_stairs_polishing.json | 134 ++++++----- .../recipes/slate_brick_wall.json | 70 +++--- .../recipes/slate_brick_wall_polishing.json | 134 ++++++----- .../recipes/slate_cobblestone.json | 62 ++--- .../advancements/recipes/slate_furnace.json | 70 +++--- ...ate_polished_brick_slab_recombination.json | 80 +++--- .../slate_polished_slab_recombination.json | 80 +++--- .../slate_polished_slabs_to_brick.json | 80 +++--- .../slate_polished_stairs_to_brick.json | 80 +++--- .../slate_polished_walls_to_brick.json | 80 +++--- .../recipes/slate_raw_slab_polishing.json | 134 ++++++----- .../recipes/slate_raw_slab_recombination.json | 80 +++--- .../recipes/slate_raw_slabs_to_brick.json | 80 +++--- .../recipes/slate_raw_stairs_polishing.json | 134 ++++++----- .../recipes/slate_raw_stairs_to_brick.json | 80 +++--- .../recipes/slate_raw_wall_polishing.json | 134 ++++++----- .../recipes/slate_raw_walls_to_brick.json | 80 +++--- .../recipes/slate_relief_axe.json | 72 +++--- .../recipes/slate_relief_blank.json | 72 +++--- .../recipes/slate_relief_cross.json | 72 +++--- .../recipes/slate_relief_hammer.json | 72 +++--- .../recipes/slate_relief_hoe.json | 72 +++--- .../recipes/slate_relief_horizontal.json | 72 +++--- .../advancements/recipes/slate_relief_i.json | 72 +++--- .../recipes/slate_relief_left.json | 72 +++--- .../recipes/slate_relief_pickaxe.json | 72 +++--- .../recipes/slate_relief_plus.json | 72 +++--- .../recipes/slate_relief_right.json | 72 +++--- .../recipes/slate_relief_sword.json | 72 +++--- .../recipes/slate_relief_vertical.json | 72 +++--- .../advancements/recipes/slate_slab.json | 74 +++--- .../advancements/recipes/slate_smooth.json | 100 ++++---- .../recipes/slate_smooth_brick.json | 70 +++--- .../recipes/slate_smooth_brick_furnace.json | 70 +++--- .../recipes/slate_smooth_brick_slab.json | 72 +++--- .../recipes/slate_smooth_brick_stairs.json | 70 +++--- .../recipes/slate_smooth_brick_wall.json | 70 +++--- .../recipes/slate_smooth_furnace.json | 70 +++--- .../recipes/slate_smooth_slab.json | 72 +++--- .../recipes/slate_smooth_stairs.json | 70 +++--- .../recipes/slate_smooth_wall.json | 70 +++--- .../advancements/recipes/slate_stairs.json | 70 +++--- .../advancements/recipes/slate_to_stone.json | 60 ++--- .../advancements/recipes/slate_wall.json | 70 +++--- .../advancements/recipes/sulfur_block.json | 80 +++--- .../advancements/recipes/sulfur_dust.json | 80 +++--- .../advancements/recipes/tuff_brick.json | 70 +++--- .../recipes/tuff_brick_block_polishing.json | 134 ++++++----- .../recipes/tuff_brick_furnace.json | 70 +++--- .../advancements/recipes/tuff_brick_slab.json | 72 +++--- .../recipes/tuff_brick_slab_polishing.json | 134 ++++++----- .../tuff_brick_slab_recombination.json | 80 +++--- .../recipes/tuff_brick_stairs.json | 70 +++--- .../recipes/tuff_brick_stairs_polishing.json | 134 ++++++----- .../advancements/recipes/tuff_brick_wall.json | 70 +++--- .../recipes/tuff_brick_wall_polishing.json | 134 ++++++----- .../recipes/tuff_cobblestone.json | 62 ++--- .../advancements/recipes/tuff_furnace.json | 70 +++--- ...uff_polished_brick_slab_recombination.json | 80 +++--- .../tuff_polished_slab_recombination.json | 80 +++--- .../recipes/tuff_polished_slabs_to_brick.json | 80 +++--- .../tuff_polished_stairs_to_brick.json | 80 +++--- .../recipes/tuff_polished_walls_to_brick.json | 80 +++--- .../recipes/tuff_raw_slab_polishing.json | 134 ++++++----- .../recipes/tuff_raw_slab_recombination.json | 80 +++--- .../recipes/tuff_raw_slabs_to_brick.json | 80 +++--- .../recipes/tuff_raw_stairs_polishing.json | 134 ++++++----- .../recipes/tuff_raw_stairs_to_brick.json | 80 +++--- .../recipes/tuff_raw_wall_polishing.json | 134 ++++++----- .../recipes/tuff_raw_walls_to_brick.json | 80 +++--- .../advancements/recipes/tuff_relief_axe.json | 72 +++--- .../recipes/tuff_relief_blank.json | 70 +++--- .../recipes/tuff_relief_cross.json | 72 +++--- .../recipes/tuff_relief_hammer.json | 72 +++--- .../advancements/recipes/tuff_relief_hoe.json | 72 +++--- .../recipes/tuff_relief_horizontal.json | 72 +++--- .../advancements/recipes/tuff_relief_i.json | 72 +++--- .../recipes/tuff_relief_left.json | 72 +++--- .../recipes/tuff_relief_pickaxe.json | 72 +++--- .../recipes/tuff_relief_plus.json | 72 +++--- .../recipes/tuff_relief_right.json | 72 +++--- .../recipes/tuff_relief_sword.json | 72 +++--- .../recipes/tuff_relief_vertical.json | 72 +++--- .../advancements/recipes/tuff_slab.json | 70 +++--- .../advancements/recipes/tuff_smooth.json | 100 ++++---- .../recipes/tuff_smooth_brick.json | 70 +++--- .../recipes/tuff_smooth_brick_furnace.json | 70 +++--- .../recipes/tuff_smooth_brick_slab.json | 72 +++--- .../recipes/tuff_smooth_brick_stairs.json | 70 +++--- .../recipes/tuff_smooth_brick_wall.json | 70 +++--- .../recipes/tuff_smooth_furnace.json | 70 +++--- .../recipes/tuff_smooth_slab.json | 70 +++--- .../recipes/tuff_smooth_stairs.json | 70 +++--- .../recipes/tuff_smooth_wall.json | 70 +++--- .../advancements/recipes/tuff_stairs.json | 70 +++--- .../advancements/recipes/tuff_to_stone.json | 60 ++--- .../advancements/recipes/tuff_wall.json | 70 +++--- .../data/mineralogy/orespawn/provider.json | 17 +- .../mineralogy/recipes/amphibolite_brick.json | 40 +-- .../amphibolite_brick_block_polishing.json | 46 ++-- .../recipes/amphibolite_brick_furnace.json | 48 ++-- .../recipes/amphibolite_brick_slab.json | 38 +-- .../amphibolite_brick_slab_polishing.json | 46 ++-- .../amphibolite_brick_slab_recombination.json | 46 ++-- .../recipes/amphibolite_brick_stairs.json | 42 ++-- .../amphibolite_brick_stairs_polishing.json | 46 ++-- .../recipes/amphibolite_brick_wall.json | 40 +-- .../amphibolite_brick_wall_polishing.json | 46 ++-- .../recipes/amphibolite_cobblestone.json | 42 ++-- .../recipes/amphibolite_furnace.json | 48 ++-- ...ite_polished_brick_slab_recombination.json | 46 ++-- ...phibolite_polished_slab_recombination.json | 46 ++-- .../amphibolite_polished_slabs_to_brick.json | 48 ++-- .../amphibolite_polished_stairs_to_brick.json | 48 ++-- .../amphibolite_polished_walls_to_brick.json | 48 ++-- .../amphibolite_raw_slab_polishing.json | 46 ++-- .../amphibolite_raw_slab_recombination.json | 46 ++-- .../amphibolite_raw_slabs_to_brick.json | 48 ++-- .../amphibolite_raw_stairs_polishing.json | 46 ++-- .../amphibolite_raw_stairs_to_brick.json | 48 ++-- .../amphibolite_raw_wall_polishing.json | 46 ++-- .../amphibolite_raw_walls_to_brick.json | 48 ++-- .../recipes/amphibolite_relief_axe.json | 80 +++--- .../recipes/amphibolite_relief_blank.json | 42 ++-- .../recipes/amphibolite_relief_cross.json | 42 ++-- .../recipes/amphibolite_relief_hammer.json | 54 ++--- .../recipes/amphibolite_relief_hoe.json | 80 +++--- .../amphibolite_relief_horizontal.json | 38 +-- .../recipes/amphibolite_relief_i.json | 42 ++-- .../recipes/amphibolite_relief_left.json | 42 ++-- .../recipes/amphibolite_relief_pickaxe.json | 80 +++--- .../recipes/amphibolite_relief_plus.json | 42 ++-- .../recipes/amphibolite_relief_right.json | 38 +-- .../recipes/amphibolite_relief_sword.json | 80 +++--- .../recipes/amphibolite_relief_vertical.json | 42 ++-- .../mineralogy/recipes/amphibolite_slab.json | 38 +-- .../recipes/amphibolite_smooth.json | 38 +-- .../recipes/amphibolite_smooth_brick.json | 40 +-- .../amphibolite_smooth_brick_furnace.json | 48 ++-- .../amphibolite_smooth_brick_slab.json | 38 +-- .../amphibolite_smooth_brick_stairs.json | 42 ++-- .../amphibolite_smooth_brick_wall.json | 40 +-- .../recipes/amphibolite_smooth_furnace.json | 48 ++-- .../recipes/amphibolite_smooth_slab.json | 38 +-- .../recipes/amphibolite_smooth_stairs.json | 42 ++-- .../recipes/amphibolite_smooth_wall.json | 40 +-- .../recipes/amphibolite_stairs.json | 42 ++-- .../mineralogy/recipes/amphibolite_wall.json | 40 +-- .../mineralogy/recipes/andesite_brick.json | 40 +-- .../andesite_brick_block_polishing.json | 46 ++-- .../recipes/andesite_brick_furnace.json | 48 ++-- .../recipes/andesite_brick_slab.json | 38 +-- .../andesite_brick_slab_polishing.json | 46 ++-- .../andesite_brick_slab_recombination.json | 46 ++-- .../recipes/andesite_brick_stairs.json | 42 ++-- .../andesite_brick_stairs_polishing.json | 46 ++-- .../recipes/andesite_brick_wall.json | 40 +-- .../andesite_brick_wall_polishing.json | 46 ++-- .../recipes/andesite_cobblestone.json | 42 ++-- .../mineralogy/recipes/andesite_furnace.json | 48 ++-- ...ite_polished_brick_slab_recombination.json | 46 ++-- .../andesite_polished_slab_recombination.json | 46 ++-- .../andesite_polished_slabs_to_brick.json | 48 ++-- .../andesite_polished_stairs_to_brick.json | 48 ++-- .../andesite_polished_walls_to_brick.json | 48 ++-- .../recipes/andesite_raw_slab_polishing.json | 46 ++-- .../andesite_raw_slab_recombination.json | 46 ++-- .../recipes/andesite_raw_slabs_to_brick.json | 48 ++-- .../andesite_raw_stairs_polishing.json | 46 ++-- .../recipes/andesite_raw_stairs_to_brick.json | 48 ++-- .../recipes/andesite_raw_wall_polishing.json | 46 ++-- .../recipes/andesite_raw_walls_to_brick.json | 48 ++-- .../recipes/andesite_relief_axe.json | 80 +++--- .../recipes/andesite_relief_blank.json | 42 ++-- .../recipes/andesite_relief_cross.json | 42 ++-- .../recipes/andesite_relief_hammer.json | 54 ++--- .../recipes/andesite_relief_hoe.json | 80 +++--- .../recipes/andesite_relief_horizontal.json | 38 +-- .../mineralogy/recipes/andesite_relief_i.json | 42 ++-- .../recipes/andesite_relief_left.json | 42 ++-- .../recipes/andesite_relief_pickaxe.json | 80 +++--- .../recipes/andesite_relief_plus.json | 42 ++-- .../recipes/andesite_relief_right.json | 38 +-- .../recipes/andesite_relief_sword.json | 80 +++--- .../recipes/andesite_relief_vertical.json | 42 ++-- .../mineralogy/recipes/andesite_slab.json | 38 +-- .../recipes/andesite_slab_from_vanilla.json | 40 +-- .../recipes/andesite_slab_to_vanilla.json | 40 +-- .../mineralogy/recipes/andesite_smooth.json | 38 +-- .../recipes/andesite_smooth_brick.json | 40 +-- .../andesite_smooth_brick_furnace.json | 48 ++-- .../recipes/andesite_smooth_brick_slab.json | 38 +-- .../recipes/andesite_smooth_brick_stairs.json | 42 ++-- .../recipes/andesite_smooth_brick_wall.json | 40 +-- .../recipes/andesite_smooth_furnace.json | 48 ++-- .../recipes/andesite_smooth_slab.json | 38 +-- .../andesite_smooth_slab_from_vanilla.json | 40 +-- .../andesite_smooth_slab_to_vanilla.json | 40 +-- .../recipes/andesite_smooth_stairs.json | 42 ++-- .../recipes/andesite_smooth_wall.json | 40 +-- .../mineralogy/recipes/andesite_stairs.json | 42 ++-- .../mineralogy/recipes/andesite_wall.json | 40 +-- .../data/mineralogy/recipes/basalt_brick.json | 40 +-- .../recipes/basalt_brick_block_polishing.json | 46 ++-- .../recipes/basalt_brick_furnace.json | 48 ++-- .../mineralogy/recipes/basalt_brick_slab.json | 38 +-- .../recipes/basalt_brick_slab_polishing.json | 46 ++-- .../basalt_brick_slab_recombination.json | 46 ++-- .../recipes/basalt_brick_stairs.json | 42 ++-- .../basalt_brick_stairs_polishing.json | 46 ++-- .../mineralogy/recipes/basalt_brick_wall.json | 40 +-- .../recipes/basalt_brick_wall_polishing.json | 46 ++-- .../recipes/basalt_cobblestone.json | 42 ++-- .../mineralogy/recipes/basalt_furnace.json | 48 ++-- ...alt_polished_brick_slab_recombination.json | 46 ++-- .../basalt_polished_slab_recombination.json | 46 ++-- .../basalt_polished_slabs_to_brick.json | 48 ++-- .../basalt_polished_stairs_to_brick.json | 48 ++-- .../basalt_polished_walls_to_brick.json | 48 ++-- .../recipes/basalt_raw_slab_polishing.json | 46 ++-- .../basalt_raw_slab_recombination.json | 46 ++-- .../recipes/basalt_raw_slabs_to_brick.json | 48 ++-- .../recipes/basalt_raw_stairs_polishing.json | 46 ++-- .../recipes/basalt_raw_stairs_to_brick.json | 48 ++-- .../recipes/basalt_raw_wall_polishing.json | 46 ++-- .../recipes/basalt_raw_walls_to_brick.json | 48 ++-- .../mineralogy/recipes/basalt_relief_axe.json | 80 +++--- .../recipes/basalt_relief_blank.json | 42 ++-- .../recipes/basalt_relief_cross.json | 42 ++-- .../recipes/basalt_relief_hammer.json | 54 ++--- .../mineralogy/recipes/basalt_relief_hoe.json | 80 +++--- .../recipes/basalt_relief_horizontal.json | 38 +-- .../mineralogy/recipes/basalt_relief_i.json | 42 ++-- .../recipes/basalt_relief_left.json | 42 ++-- .../recipes/basalt_relief_pickaxe.json | 80 +++--- .../recipes/basalt_relief_plus.json | 42 ++-- .../recipes/basalt_relief_right.json | 38 +-- .../recipes/basalt_relief_sword.json | 80 +++--- .../recipes/basalt_relief_vertical.json | 42 ++-- .../data/mineralogy/recipes/basalt_slab.json | 38 +-- .../mineralogy/recipes/basalt_smooth.json | 38 +-- .../recipes/basalt_smooth_brick.json | 40 +-- .../recipes/basalt_smooth_brick_furnace.json | 48 ++-- .../recipes/basalt_smooth_brick_slab.json | 38 +-- .../recipes/basalt_smooth_brick_stairs.json | 42 ++-- .../recipes/basalt_smooth_brick_wall.json | 40 +-- .../recipes/basalt_smooth_furnace.json | 48 ++-- .../recipes/basalt_smooth_slab.json | 38 +-- .../recipes/basalt_smooth_stairs.json | 42 ++-- .../recipes/basalt_smooth_wall.json | 40 +-- .../mineralogy/recipes/basalt_stairs.json | 42 ++-- .../data/mineralogy/recipes/basalt_wall.json | 40 +-- .../recipes/basaltic_glass_brick.json | 40 +-- .../basaltic_glass_brick_block_polishing.json | 46 ++-- .../recipes/basaltic_glass_brick_furnace.json | 48 ++-- .../recipes/basaltic_glass_brick_slab.json | 38 +-- .../basaltic_glass_brick_slab_polishing.json | 46 ++-- ...saltic_glass_brick_slab_recombination.json | 46 ++-- .../recipes/basaltic_glass_brick_stairs.json | 42 ++-- ...basaltic_glass_brick_stairs_polishing.json | 46 ++-- .../recipes/basaltic_glass_brick_wall.json | 40 +-- .../basaltic_glass_brick_wall_polishing.json | 46 ++-- .../recipes/basaltic_glass_cobblestone.json | 42 ++-- .../recipes/basaltic_glass_furnace.json | 48 ++-- ...ass_polished_brick_slab_recombination.json | 46 ++-- ...tic_glass_polished_slab_recombination.json | 46 ++-- ...asaltic_glass_polished_slabs_to_brick.json | 48 ++-- ...saltic_glass_polished_stairs_to_brick.json | 48 ++-- ...asaltic_glass_polished_walls_to_brick.json | 48 ++-- .../basaltic_glass_raw_slab_polishing.json | 46 ++-- ...basaltic_glass_raw_slab_recombination.json | 46 ++-- .../basaltic_glass_raw_slabs_to_brick.json | 48 ++-- .../basaltic_glass_raw_stairs_polishing.json | 46 ++-- .../basaltic_glass_raw_stairs_to_brick.json | 48 ++-- .../basaltic_glass_raw_wall_polishing.json | 46 ++-- .../basaltic_glass_raw_walls_to_brick.json | 48 ++-- .../recipes/basaltic_glass_relief_axe.json | 80 +++--- .../recipes/basaltic_glass_relief_blank.json | 42 ++-- .../recipes/basaltic_glass_relief_cross.json | 42 ++-- .../recipes/basaltic_glass_relief_hammer.json | 54 ++--- .../recipes/basaltic_glass_relief_hoe.json | 80 +++--- .../basaltic_glass_relief_horizontal.json | 38 +-- .../recipes/basaltic_glass_relief_i.json | 42 ++-- .../recipes/basaltic_glass_relief_left.json | 42 ++-- .../basaltic_glass_relief_pickaxe.json | 80 +++--- .../recipes/basaltic_glass_relief_plus.json | 42 ++-- .../recipes/basaltic_glass_relief_right.json | 38 +-- .../recipes/basaltic_glass_relief_sword.json | 80 +++--- .../basaltic_glass_relief_vertical.json | 42 ++-- .../recipes/basaltic_glass_slab.json | 38 +-- .../recipes/basaltic_glass_smooth.json | 38 +-- .../recipes/basaltic_glass_smooth_brick.json | 40 +-- .../basaltic_glass_smooth_brick_furnace.json | 48 ++-- .../basaltic_glass_smooth_brick_slab.json | 38 +-- .../basaltic_glass_smooth_brick_stairs.json | 42 ++-- .../basaltic_glass_smooth_brick_wall.json | 40 +-- .../basaltic_glass_smooth_furnace.json | 48 ++-- .../recipes/basaltic_glass_smooth_slab.json | 38 +-- .../recipes/basaltic_glass_smooth_stairs.json | 42 ++-- .../recipes/basaltic_glass_smooth_wall.json | 40 +-- .../recipes/basaltic_glass_stairs.json | 42 ++-- .../recipes/basaltic_glass_wall.json | 40 +-- .../data/mineralogy/recipes/chalk.json | 40 +-- .../data/mineralogy/recipes/chalk_dust.json | 32 +-- .../data/mineralogy/recipes/cobblestone.json | 42 ++-- .../recipes/conglomerate_brick.json | 40 +-- .../conglomerate_brick_block_polishing.json | 46 ++-- .../recipes/conglomerate_brick_furnace.json | 48 ++-- .../recipes/conglomerate_brick_slab.json | 38 +-- .../conglomerate_brick_slab_polishing.json | 46 ++-- ...conglomerate_brick_slab_recombination.json | 46 ++-- .../recipes/conglomerate_brick_stairs.json | 42 ++-- .../conglomerate_brick_stairs_polishing.json | 46 ++-- .../recipes/conglomerate_brick_wall.json | 40 +-- .../conglomerate_brick_wall_polishing.json | 46 ++-- .../recipes/conglomerate_cobblestone.json | 42 ++-- .../recipes/conglomerate_furnace.json | 48 ++-- ...ate_polished_brick_slab_recombination.json | 46 ++-- ...glomerate_polished_slab_recombination.json | 46 ++-- .../conglomerate_polished_slabs_to_brick.json | 48 ++-- ...conglomerate_polished_stairs_to_brick.json | 48 ++-- .../conglomerate_polished_walls_to_brick.json | 48 ++-- .../conglomerate_raw_slab_polishing.json | 46 ++-- .../conglomerate_raw_slab_recombination.json | 46 ++-- .../conglomerate_raw_slabs_to_brick.json | 48 ++-- .../conglomerate_raw_stairs_polishing.json | 46 ++-- .../conglomerate_raw_stairs_to_brick.json | 48 ++-- .../conglomerate_raw_wall_polishing.json | 46 ++-- .../conglomerate_raw_walls_to_brick.json | 48 ++-- .../recipes/conglomerate_relief_axe.json | 80 +++--- .../recipes/conglomerate_relief_blank.json | 42 ++-- .../recipes/conglomerate_relief_cross.json | 42 ++-- .../recipes/conglomerate_relief_hammer.json | 54 ++--- .../recipes/conglomerate_relief_hoe.json | 80 +++--- .../conglomerate_relief_horizontal.json | 38 +-- .../recipes/conglomerate_relief_i.json | 42 ++-- .../recipes/conglomerate_relief_left.json | 42 ++-- .../recipes/conglomerate_relief_pickaxe.json | 80 +++--- .../recipes/conglomerate_relief_plus.json | 42 ++-- .../recipes/conglomerate_relief_right.json | 38 +-- .../recipes/conglomerate_relief_sword.json | 80 +++--- .../recipes/conglomerate_relief_vertical.json | 42 ++-- .../mineralogy/recipes/conglomerate_slab.json | 38 +-- .../recipes/conglomerate_smooth.json | 38 +-- .../recipes/conglomerate_smooth_brick.json | 40 +-- .../conglomerate_smooth_brick_furnace.json | 48 ++-- .../conglomerate_smooth_brick_slab.json | 38 +-- .../conglomerate_smooth_brick_stairs.json | 42 ++-- .../conglomerate_smooth_brick_wall.json | 40 +-- .../recipes/conglomerate_smooth_furnace.json | 48 ++-- .../recipes/conglomerate_smooth_slab.json | 38 +-- .../recipes/conglomerate_smooth_stairs.json | 42 ++-- .../recipes/conglomerate_smooth_wall.json | 40 +-- .../recipes/conglomerate_stairs.json | 42 ++-- .../mineralogy/recipes/conglomerate_wall.json | 40 +-- .../mineralogy/recipes/diabase_brick.json | 40 +-- .../diabase_brick_block_polishing.json | 46 ++-- .../recipes/diabase_brick_furnace.json | 48 ++-- .../recipes/diabase_brick_slab.json | 38 +-- .../recipes/diabase_brick_slab_polishing.json | 46 ++-- .../diabase_brick_slab_recombination.json | 46 ++-- .../recipes/diabase_brick_stairs.json | 42 ++-- .../diabase_brick_stairs_polishing.json | 46 ++-- .../recipes/diabase_brick_wall.json | 40 +-- .../recipes/diabase_brick_wall_polishing.json | 46 ++-- .../recipes/diabase_cobblestone.json | 42 ++-- .../mineralogy/recipes/diabase_furnace.json | 48 ++-- ...ase_polished_brick_slab_recombination.json | 46 ++-- .../diabase_polished_slab_recombination.json | 46 ++-- .../diabase_polished_slabs_to_brick.json | 48 ++-- .../diabase_polished_stairs_to_brick.json | 48 ++-- .../diabase_polished_walls_to_brick.json | 48 ++-- .../recipes/diabase_raw_slab_polishing.json | 46 ++-- .../diabase_raw_slab_recombination.json | 46 ++-- .../recipes/diabase_raw_slabs_to_brick.json | 48 ++-- .../recipes/diabase_raw_stairs_polishing.json | 46 ++-- .../recipes/diabase_raw_stairs_to_brick.json | 48 ++-- .../recipes/diabase_raw_wall_polishing.json | 46 ++-- .../recipes/diabase_raw_walls_to_brick.json | 48 ++-- .../recipes/diabase_relief_axe.json | 80 +++--- .../recipes/diabase_relief_blank.json | 42 ++-- .../recipes/diabase_relief_cross.json | 42 ++-- .../recipes/diabase_relief_hammer.json | 54 ++--- .../recipes/diabase_relief_hoe.json | 80 +++--- .../recipes/diabase_relief_horizontal.json | 38 +-- .../mineralogy/recipes/diabase_relief_i.json | 42 ++-- .../recipes/diabase_relief_left.json | 42 ++-- .../recipes/diabase_relief_pickaxe.json | 80 +++--- .../recipes/diabase_relief_plus.json | 42 ++-- .../recipes/diabase_relief_right.json | 38 +-- .../recipes/diabase_relief_sword.json | 80 +++--- .../recipes/diabase_relief_vertical.json | 42 ++-- .../data/mineralogy/recipes/diabase_slab.json | 38 +-- .../mineralogy/recipes/diabase_smooth.json | 38 +-- .../recipes/diabase_smooth_brick.json | 40 +-- .../recipes/diabase_smooth_brick_furnace.json | 48 ++-- .../recipes/diabase_smooth_brick_slab.json | 38 +-- .../recipes/diabase_smooth_brick_stairs.json | 42 ++-- .../recipes/diabase_smooth_brick_wall.json | 40 +-- .../recipes/diabase_smooth_furnace.json | 48 ++-- .../recipes/diabase_smooth_slab.json | 38 +-- .../recipes/diabase_smooth_stairs.json | 42 ++-- .../recipes/diabase_smooth_wall.json | 40 +-- .../mineralogy/recipes/diabase_stairs.json | 42 ++-- .../data/mineralogy/recipes/diabase_wall.json | 40 +-- .../mineralogy/recipes/diorite_brick.json | 40 +-- .../diorite_brick_block_polishing.json | 46 ++-- .../recipes/diorite_brick_furnace.json | 48 ++-- .../recipes/diorite_brick_slab.json | 38 +-- .../recipes/diorite_brick_slab_polishing.json | 46 ++-- .../diorite_brick_slab_recombination.json | 46 ++-- .../recipes/diorite_brick_stairs.json | 42 ++-- .../diorite_brick_stairs_polishing.json | 46 ++-- .../recipes/diorite_brick_wall.json | 40 +-- .../recipes/diorite_brick_wall_polishing.json | 46 ++-- .../recipes/diorite_cobblestone.json | 42 ++-- .../mineralogy/recipes/diorite_furnace.json | 48 ++-- ...ite_polished_brick_slab_recombination.json | 46 ++-- .../diorite_polished_slab_recombination.json | 46 ++-- .../diorite_polished_slabs_to_brick.json | 48 ++-- .../diorite_polished_stairs_to_brick.json | 48 ++-- .../diorite_polished_walls_to_brick.json | 48 ++-- .../recipes/diorite_raw_slab_polishing.json | 46 ++-- .../diorite_raw_slab_recombination.json | 46 ++-- .../recipes/diorite_raw_slabs_to_brick.json | 48 ++-- .../recipes/diorite_raw_stairs_polishing.json | 46 ++-- .../recipes/diorite_raw_stairs_to_brick.json | 48 ++-- .../recipes/diorite_raw_wall_polishing.json | 46 ++-- .../recipes/diorite_raw_walls_to_brick.json | 48 ++-- .../recipes/diorite_relief_axe.json | 80 +++--- .../recipes/diorite_relief_blank.json | 42 ++-- .../recipes/diorite_relief_cross.json | 42 ++-- .../recipes/diorite_relief_hammer.json | 54 ++--- .../recipes/diorite_relief_hoe.json | 80 +++--- .../recipes/diorite_relief_horizontal.json | 38 +-- .../mineralogy/recipes/diorite_relief_i.json | 42 ++-- .../recipes/diorite_relief_left.json | 42 ++-- .../recipes/diorite_relief_pickaxe.json | 80 +++--- .../recipes/diorite_relief_plus.json | 42 ++-- .../recipes/diorite_relief_right.json | 38 +-- .../recipes/diorite_relief_sword.json | 80 +++--- .../recipes/diorite_relief_vertical.json | 42 ++-- .../data/mineralogy/recipes/diorite_slab.json | 38 +-- .../recipes/diorite_slab_from_vanilla.json | 40 +-- .../recipes/diorite_slab_to_vanilla.json | 40 +-- .../mineralogy/recipes/diorite_smooth.json | 38 +-- .../recipes/diorite_smooth_brick.json | 40 +-- .../recipes/diorite_smooth_brick_furnace.json | 48 ++-- .../recipes/diorite_smooth_brick_slab.json | 38 +-- .../recipes/diorite_smooth_brick_stairs.json | 42 ++-- .../recipes/diorite_smooth_brick_wall.json | 40 +-- .../recipes/diorite_smooth_furnace.json | 48 ++-- .../recipes/diorite_smooth_slab.json | 38 +-- .../diorite_smooth_slab_from_vanilla.json | 40 +-- .../diorite_smooth_slab_to_vanilla.json | 40 +-- .../recipes/diorite_smooth_stairs.json | 42 ++-- .../recipes/diorite_smooth_wall.json | 40 +-- .../mineralogy/recipes/diorite_stairs.json | 42 ++-- .../data/mineralogy/recipes/diorite_wall.json | 40 +-- .../mineralogy/recipes/dolomite_brick.json | 40 +-- .../dolomite_brick_block_polishing.json | 46 ++-- .../recipes/dolomite_brick_furnace.json | 48 ++-- .../recipes/dolomite_brick_slab.json | 38 +-- .../dolomite_brick_slab_polishing.json | 46 ++-- .../dolomite_brick_slab_recombination.json | 46 ++-- .../recipes/dolomite_brick_stairs.json | 42 ++-- .../dolomite_brick_stairs_polishing.json | 46 ++-- .../recipes/dolomite_brick_wall.json | 40 +-- .../dolomite_brick_wall_polishing.json | 46 ++-- .../recipes/dolomite_cobblestone.json | 42 ++-- .../mineralogy/recipes/dolomite_furnace.json | 48 ++-- ...ite_polished_brick_slab_recombination.json | 46 ++-- .../dolomite_polished_slab_recombination.json | 46 ++-- .../dolomite_polished_slabs_to_brick.json | 48 ++-- .../dolomite_polished_stairs_to_brick.json | 48 ++-- .../dolomite_polished_walls_to_brick.json | 48 ++-- .../recipes/dolomite_raw_slab_polishing.json | 46 ++-- .../dolomite_raw_slab_recombination.json | 46 ++-- .../recipes/dolomite_raw_slabs_to_brick.json | 48 ++-- .../dolomite_raw_stairs_polishing.json | 46 ++-- .../recipes/dolomite_raw_stairs_to_brick.json | 48 ++-- .../recipes/dolomite_raw_wall_polishing.json | 46 ++-- .../recipes/dolomite_raw_walls_to_brick.json | 48 ++-- .../recipes/dolomite_relief_axe.json | 80 +++--- .../recipes/dolomite_relief_blank.json | 42 ++-- .../recipes/dolomite_relief_cross.json | 42 ++-- .../recipes/dolomite_relief_hammer.json | 54 ++--- .../recipes/dolomite_relief_hoe.json | 80 +++--- .../recipes/dolomite_relief_horizontal.json | 38 +-- .../mineralogy/recipes/dolomite_relief_i.json | 42 ++-- .../recipes/dolomite_relief_left.json | 42 ++-- .../recipes/dolomite_relief_pickaxe.json | 80 +++--- .../recipes/dolomite_relief_plus.json | 42 ++-- .../recipes/dolomite_relief_right.json | 38 +-- .../recipes/dolomite_relief_sword.json | 80 +++--- .../recipes/dolomite_relief_vertical.json | 42 ++-- .../mineralogy/recipes/dolomite_slab.json | 38 +-- .../mineralogy/recipes/dolomite_smooth.json | 38 +-- .../recipes/dolomite_smooth_brick.json | 40 +-- .../dolomite_smooth_brick_furnace.json | 48 ++-- .../recipes/dolomite_smooth_brick_slab.json | 38 +-- .../recipes/dolomite_smooth_brick_stairs.json | 42 ++-- .../recipes/dolomite_smooth_brick_wall.json | 40 +-- .../recipes/dolomite_smooth_furnace.json | 48 ++-- .../recipes/dolomite_smooth_slab.json | 38 +-- .../recipes/dolomite_smooth_stairs.json | 42 ++-- .../recipes/dolomite_smooth_wall.json | 40 +-- .../mineralogy/recipes/dolomite_stairs.json | 42 ++-- .../mineralogy/recipes/dolomite_wall.json | 40 +-- .../data/mineralogy/recipes/drywall.json | 56 ++--- .../mineralogy/recipes/drywall_black.json | 46 ++-- .../data/mineralogy/recipes/drywall_blue.json | 46 ++-- .../mineralogy/recipes/drywall_brown.json | 46 ++-- .../data/mineralogy/recipes/drywall_cyan.json | 46 ++-- .../data/mineralogy/recipes/drywall_gray.json | 46 ++-- .../mineralogy/recipes/drywall_green.json | 46 ++-- .../recipes/drywall_light_blue.json | 46 ++-- .../data/mineralogy/recipes/drywall_lime.json | 46 ++-- .../mineralogy/recipes/drywall_magenta.json | 46 ++-- .../mineralogy/recipes/drywall_orange.json | 46 ++-- .../data/mineralogy/recipes/drywall_pink.json | 46 ++-- .../mineralogy/recipes/drywall_purple.json | 46 ++-- .../data/mineralogy/recipes/drywall_red.json | 46 ++-- .../mineralogy/recipes/drywall_silver.json | 46 ++-- .../mineralogy/recipes/drywall_white.json | 46 ++-- .../mineralogy/recipes/drywall_yellow.json | 46 ++-- .../data/mineralogy/recipes/gabbro_brick.json | 40 +-- .../recipes/gabbro_brick_block_polishing.json | 46 ++-- .../recipes/gabbro_brick_furnace.json | 48 ++-- .../mineralogy/recipes/gabbro_brick_slab.json | 38 +-- .../recipes/gabbro_brick_slab_polishing.json | 46 ++-- .../gabbro_brick_slab_recombination.json | 46 ++-- .../recipes/gabbro_brick_stairs.json | 42 ++-- .../gabbro_brick_stairs_polishing.json | 46 ++-- .../mineralogy/recipes/gabbro_brick_wall.json | 40 +-- .../recipes/gabbro_brick_wall_polishing.json | 46 ++-- .../recipes/gabbro_cobblestone.json | 42 ++-- .../mineralogy/recipes/gabbro_furnace.json | 48 ++-- ...bro_polished_brick_slab_recombination.json | 46 ++-- .../gabbro_polished_slab_recombination.json | 46 ++-- .../gabbro_polished_slabs_to_brick.json | 48 ++-- .../gabbro_polished_stairs_to_brick.json | 48 ++-- .../gabbro_polished_walls_to_brick.json | 48 ++-- .../recipes/gabbro_raw_slab_polishing.json | 46 ++-- .../gabbro_raw_slab_recombination.json | 46 ++-- .../recipes/gabbro_raw_slabs_to_brick.json | 48 ++-- .../recipes/gabbro_raw_stairs_polishing.json | 46 ++-- .../recipes/gabbro_raw_stairs_to_brick.json | 48 ++-- .../recipes/gabbro_raw_wall_polishing.json | 46 ++-- .../recipes/gabbro_raw_walls_to_brick.json | 48 ++-- .../mineralogy/recipes/gabbro_relief_axe.json | 80 +++--- .../recipes/gabbro_relief_blank.json | 42 ++-- .../recipes/gabbro_relief_cross.json | 42 ++-- .../recipes/gabbro_relief_hammer.json | 54 ++--- .../mineralogy/recipes/gabbro_relief_hoe.json | 80 +++--- .../recipes/gabbro_relief_horizontal.json | 38 +-- .../mineralogy/recipes/gabbro_relief_i.json | 42 ++-- .../recipes/gabbro_relief_left.json | 42 ++-- .../recipes/gabbro_relief_pickaxe.json | 80 +++--- .../recipes/gabbro_relief_plus.json | 42 ++-- .../recipes/gabbro_relief_right.json | 38 +-- .../recipes/gabbro_relief_sword.json | 80 +++--- .../recipes/gabbro_relief_vertical.json | 42 ++-- .../data/mineralogy/recipes/gabbro_slab.json | 38 +-- .../mineralogy/recipes/gabbro_smooth.json | 38 +-- .../recipes/gabbro_smooth_brick.json | 40 +-- .../recipes/gabbro_smooth_brick_furnace.json | 48 ++-- .../recipes/gabbro_smooth_brick_slab.json | 38 +-- .../recipes/gabbro_smooth_brick_stairs.json | 42 ++-- .../recipes/gabbro_smooth_brick_wall.json | 40 +-- .../recipes/gabbro_smooth_furnace.json | 48 ++-- .../recipes/gabbro_smooth_slab.json | 38 +-- .../recipes/gabbro_smooth_stairs.json | 42 ++-- .../recipes/gabbro_smooth_wall.json | 40 +-- .../mineralogy/recipes/gabbro_stairs.json | 42 ++-- .../data/mineralogy/recipes/gabbro_wall.json | 40 +-- .../data/mineralogy/recipes/gneiss_brick.json | 40 +-- .../recipes/gneiss_brick_block_polishing.json | 46 ++-- .../recipes/gneiss_brick_furnace.json | 48 ++-- .../mineralogy/recipes/gneiss_brick_slab.json | 38 +-- .../recipes/gneiss_brick_slab_polishing.json | 46 ++-- .../gneiss_brick_slab_recombination.json | 46 ++-- .../recipes/gneiss_brick_stairs.json | 42 ++-- .../gneiss_brick_stairs_polishing.json | 46 ++-- .../mineralogy/recipes/gneiss_brick_wall.json | 40 +-- .../recipes/gneiss_brick_wall_polishing.json | 46 ++-- .../recipes/gneiss_cobblestone.json | 42 ++-- .../mineralogy/recipes/gneiss_furnace.json | 48 ++-- ...iss_polished_brick_slab_recombination.json | 46 ++-- .../gneiss_polished_slab_recombination.json | 46 ++-- .../gneiss_polished_slabs_to_brick.json | 48 ++-- .../gneiss_polished_stairs_to_brick.json | 48 ++-- .../gneiss_polished_walls_to_brick.json | 48 ++-- .../recipes/gneiss_raw_slab_polishing.json | 46 ++-- .../gneiss_raw_slab_recombination.json | 46 ++-- .../recipes/gneiss_raw_slabs_to_brick.json | 48 ++-- .../recipes/gneiss_raw_stairs_polishing.json | 46 ++-- .../recipes/gneiss_raw_stairs_to_brick.json | 48 ++-- .../recipes/gneiss_raw_wall_polishing.json | 46 ++-- .../recipes/gneiss_raw_walls_to_brick.json | 48 ++-- .../mineralogy/recipes/gneiss_relief_axe.json | 80 +++--- .../recipes/gneiss_relief_blank.json | 42 ++-- .../recipes/gneiss_relief_cross.json | 42 ++-- .../recipes/gneiss_relief_hammer.json | 54 ++--- .../mineralogy/recipes/gneiss_relief_hoe.json | 80 +++--- .../recipes/gneiss_relief_horizontal.json | 38 +-- .../mineralogy/recipes/gneiss_relief_i.json | 42 ++-- .../recipes/gneiss_relief_left.json | 42 ++-- .../recipes/gneiss_relief_pickaxe.json | 80 +++--- .../recipes/gneiss_relief_plus.json | 42 ++-- .../recipes/gneiss_relief_right.json | 38 +-- .../recipes/gneiss_relief_sword.json | 80 +++--- .../recipes/gneiss_relief_vertical.json | 42 ++-- .../data/mineralogy/recipes/gneiss_slab.json | 38 +-- .../mineralogy/recipes/gneiss_smooth.json | 38 +-- .../recipes/gneiss_smooth_brick.json | 40 +-- .../recipes/gneiss_smooth_brick_furnace.json | 48 ++-- .../recipes/gneiss_smooth_brick_slab.json | 38 +-- .../recipes/gneiss_smooth_brick_stairs.json | 42 ++-- .../recipes/gneiss_smooth_brick_wall.json | 40 +-- .../recipes/gneiss_smooth_furnace.json | 48 ++-- .../recipes/gneiss_smooth_slab.json | 38 +-- .../recipes/gneiss_smooth_stairs.json | 42 ++-- .../recipes/gneiss_smooth_wall.json | 40 +-- .../mineralogy/recipes/gneiss_stairs.json | 42 ++-- .../data/mineralogy/recipes/gneiss_wall.json | 40 +-- .../mineralogy/recipes/granite_brick.json | 40 +-- .../granite_brick_block_polishing.json | 46 ++-- .../recipes/granite_brick_furnace.json | 48 ++-- .../recipes/granite_brick_slab.json | 38 +-- .../recipes/granite_brick_slab_polishing.json | 46 ++-- .../granite_brick_slab_recombination.json | 46 ++-- .../recipes/granite_brick_stairs.json | 42 ++-- .../granite_brick_stairs_polishing.json | 46 ++-- .../recipes/granite_brick_wall.json | 40 +-- .../recipes/granite_brick_wall_polishing.json | 46 ++-- .../recipes/granite_cobblestone.json | 42 ++-- .../mineralogy/recipes/granite_furnace.json | 48 ++-- ...ite_polished_brick_slab_recombination.json | 46 ++-- .../granite_polished_slab_recombination.json | 46 ++-- .../granite_polished_slabs_to_brick.json | 48 ++-- .../granite_polished_stairs_to_brick.json | 48 ++-- .../granite_polished_walls_to_brick.json | 48 ++-- .../recipes/granite_raw_slab_polishing.json | 46 ++-- .../granite_raw_slab_recombination.json | 46 ++-- .../recipes/granite_raw_slabs_to_brick.json | 48 ++-- .../recipes/granite_raw_stairs_polishing.json | 46 ++-- .../recipes/granite_raw_stairs_to_brick.json | 48 ++-- .../recipes/granite_raw_wall_polishing.json | 46 ++-- .../recipes/granite_raw_walls_to_brick.json | 48 ++-- .../recipes/granite_relief_axe.json | 80 +++--- .../recipes/granite_relief_blank.json | 42 ++-- .../recipes/granite_relief_cross.json | 42 ++-- .../recipes/granite_relief_hammer.json | 54 ++--- .../recipes/granite_relief_hoe.json | 80 +++--- .../recipes/granite_relief_horizontal.json | 38 +-- .../mineralogy/recipes/granite_relief_i.json | 42 ++-- .../recipes/granite_relief_left.json | 42 ++-- .../recipes/granite_relief_pickaxe.json | 80 +++--- .../recipes/granite_relief_plus.json | 42 ++-- .../recipes/granite_relief_right.json | 38 +-- .../recipes/granite_relief_sword.json | 80 +++--- .../recipes/granite_relief_vertical.json | 42 ++-- .../data/mineralogy/recipes/granite_slab.json | 38 +-- .../recipes/granite_slab_from_vanilla.json | 40 +-- .../recipes/granite_slab_to_vanilla.json | 40 +-- .../mineralogy/recipes/granite_smooth.json | 38 +-- .../recipes/granite_smooth_brick.json | 40 +-- .../recipes/granite_smooth_brick_furnace.json | 48 ++-- .../recipes/granite_smooth_brick_slab.json | 38 +-- .../recipes/granite_smooth_brick_stairs.json | 42 ++-- .../recipes/granite_smooth_brick_wall.json | 40 +-- .../recipes/granite_smooth_furnace.json | 48 ++-- .../recipes/granite_smooth_slab.json | 38 +-- .../granite_smooth_slab_from_vanilla.json | 40 +-- .../granite_smooth_slab_to_vanilla.json | 40 +-- .../recipes/granite_smooth_stairs.json | 42 ++-- .../recipes/granite_smooth_wall.json | 40 +-- .../mineralogy/recipes/granite_stairs.json | 42 ++-- .../data/mineralogy/recipes/granite_wall.json | 40 +-- .../mineralogy/recipes/gravel_to_stone.json | 27 +-- .../recipes/gunpowder_from_carbon_dust.json | 58 ++--- .../recipes/gunpowder_from_charcoal.json | 44 ++-- .../recipes/gunpowder_from_coal_dust.json | 58 ++--- .../recipes/gunpowder_from_sugar.json | 44 ++-- .../data/mineralogy/recipes/gypsum.json | 40 +-- .../data/mineralogy/recipes/gypsum_dust.json | 32 +-- .../mineralogy/recipes/hornfels_brick.json | 40 +-- .../hornfels_brick_block_polishing.json | 46 ++-- .../recipes/hornfels_brick_furnace.json | 48 ++-- .../recipes/hornfels_brick_slab.json | 38 +-- .../hornfels_brick_slab_polishing.json | 46 ++-- .../hornfels_brick_slab_recombination.json | 46 ++-- .../recipes/hornfels_brick_stairs.json | 42 ++-- .../hornfels_brick_stairs_polishing.json | 46 ++-- .../recipes/hornfels_brick_wall.json | 40 +-- .../hornfels_brick_wall_polishing.json | 46 ++-- .../recipes/hornfels_cobblestone.json | 42 ++-- .../mineralogy/recipes/hornfels_furnace.json | 48 ++-- ...els_polished_brick_slab_recombination.json | 46 ++-- .../hornfels_polished_slab_recombination.json | 46 ++-- .../hornfels_polished_slabs_to_brick.json | 48 ++-- .../hornfels_polished_stairs_to_brick.json | 48 ++-- .../hornfels_polished_walls_to_brick.json | 48 ++-- .../recipes/hornfels_raw_slab_polishing.json | 46 ++-- .../hornfels_raw_slab_recombination.json | 46 ++-- .../recipes/hornfels_raw_slabs_to_brick.json | 48 ++-- .../hornfels_raw_stairs_polishing.json | 46 ++-- .../recipes/hornfels_raw_stairs_to_brick.json | 48 ++-- .../recipes/hornfels_raw_wall_polishing.json | 46 ++-- .../recipes/hornfels_raw_walls_to_brick.json | 48 ++-- .../recipes/hornfels_relief_axe.json | 80 +++--- .../recipes/hornfels_relief_blank.json | 42 ++-- .../recipes/hornfels_relief_cross.json | 42 ++-- .../recipes/hornfels_relief_hammer.json | 54 ++--- .../recipes/hornfels_relief_hoe.json | 80 +++--- .../recipes/hornfels_relief_horizontal.json | 38 +-- .../mineralogy/recipes/hornfels_relief_i.json | 42 ++-- .../recipes/hornfels_relief_left.json | 42 ++-- .../recipes/hornfels_relief_pickaxe.json | 80 +++--- .../recipes/hornfels_relief_plus.json | 42 ++-- .../recipes/hornfels_relief_right.json | 38 +-- .../recipes/hornfels_relief_sword.json | 80 +++--- .../recipes/hornfels_relief_vertical.json | 42 ++-- .../mineralogy/recipes/hornfels_slab.json | 38 +-- .../mineralogy/recipes/hornfels_smooth.json | 38 +-- .../recipes/hornfels_smooth_brick.json | 40 +-- .../hornfels_smooth_brick_furnace.json | 48 ++-- .../recipes/hornfels_smooth_brick_slab.json | 38 +-- .../recipes/hornfels_smooth_brick_stairs.json | 42 ++-- .../recipes/hornfels_smooth_brick_wall.json | 40 +-- .../recipes/hornfels_smooth_furnace.json | 48 ++-- .../recipes/hornfels_smooth_slab.json | 38 +-- .../recipes/hornfels_smooth_stairs.json | 42 ++-- .../recipes/hornfels_smooth_wall.json | 40 +-- .../mineralogy/recipes/hornfels_stairs.json | 42 ++-- .../mineralogy/recipes/hornfels_wall.json | 40 +-- .../mineralogy/recipes/limestone_brick.json | 40 +-- .../limestone_brick_block_polishing.json | 46 ++-- .../recipes/limestone_brick_furnace.json | 48 ++-- .../recipes/limestone_brick_slab.json | 38 +-- .../limestone_brick_slab_polishing.json | 46 ++-- .../limestone_brick_slab_recombination.json | 46 ++-- .../recipes/limestone_brick_stairs.json | 42 ++-- .../limestone_brick_stairs_polishing.json | 46 ++-- .../recipes/limestone_brick_wall.json | 40 +-- .../limestone_brick_wall_polishing.json | 46 ++-- .../recipes/limestone_cobblestone.json | 42 ++-- .../mineralogy/recipes/limestone_furnace.json | 48 ++-- ...one_polished_brick_slab_recombination.json | 46 ++-- ...limestone_polished_slab_recombination.json | 46 ++-- .../limestone_polished_slabs_to_brick.json | 48 ++-- .../limestone_polished_stairs_to_brick.json | 48 ++-- .../limestone_polished_walls_to_brick.json | 48 ++-- .../recipes/limestone_raw_slab_polishing.json | 46 ++-- .../limestone_raw_slab_recombination.json | 46 ++-- .../recipes/limestone_raw_slabs_to_brick.json | 48 ++-- .../limestone_raw_stairs_polishing.json | 46 ++-- .../limestone_raw_stairs_to_brick.json | 48 ++-- .../recipes/limestone_raw_wall_polishing.json | 46 ++-- .../recipes/limestone_raw_walls_to_brick.json | 48 ++-- .../recipes/limestone_relief_axe.json | 80 +++--- .../recipes/limestone_relief_blank.json | 42 ++-- .../recipes/limestone_relief_cross.json | 42 ++-- .../recipes/limestone_relief_hammer.json | 54 ++--- .../recipes/limestone_relief_hoe.json | 80 +++--- .../recipes/limestone_relief_horizontal.json | 38 +-- .../recipes/limestone_relief_i.json | 42 ++-- .../recipes/limestone_relief_left.json | 42 ++-- .../recipes/limestone_relief_pickaxe.json | 80 +++--- .../recipes/limestone_relief_plus.json | 42 ++-- .../recipes/limestone_relief_right.json | 38 +-- .../recipes/limestone_relief_sword.json | 80 +++--- .../recipes/limestone_relief_vertical.json | 42 ++-- .../mineralogy/recipes/limestone_slab.json | 38 +-- .../mineralogy/recipes/limestone_smooth.json | 38 +-- .../recipes/limestone_smooth_brick.json | 40 +-- .../limestone_smooth_brick_furnace.json | 48 ++-- .../recipes/limestone_smooth_brick_slab.json | 38 +-- .../limestone_smooth_brick_stairs.json | 42 ++-- .../recipes/limestone_smooth_brick_wall.json | 40 +-- .../recipes/limestone_smooth_furnace.json | 48 ++-- .../recipes/limestone_smooth_slab.json | 38 +-- .../recipes/limestone_smooth_stairs.json | 42 ++-- .../recipes/limestone_smooth_wall.json | 40 +-- .../mineralogy/recipes/limestone_stairs.json | 42 ++-- .../mineralogy/recipes/limestone_wall.json | 40 +-- .../data/mineralogy/recipes/marble_brick.json | 40 +-- .../recipes/marble_brick_block_polishing.json | 46 ++-- .../recipes/marble_brick_furnace.json | 48 ++-- .../mineralogy/recipes/marble_brick_slab.json | 38 +-- .../recipes/marble_brick_slab_polishing.json | 46 ++-- .../marble_brick_slab_recombination.json | 46 ++-- .../recipes/marble_brick_stairs.json | 42 ++-- .../marble_brick_stairs_polishing.json | 46 ++-- .../mineralogy/recipes/marble_brick_wall.json | 40 +-- .../recipes/marble_brick_wall_polishing.json | 46 ++-- .../recipes/marble_cobblestone.json | 42 ++-- .../mineralogy/recipes/marble_furnace.json | 48 ++-- ...ble_polished_brick_slab_recombination.json | 46 ++-- .../marble_polished_slab_recombination.json | 46 ++-- .../marble_polished_slabs_to_brick.json | 48 ++-- .../marble_polished_stairs_to_brick.json | 48 ++-- .../marble_polished_walls_to_brick.json | 48 ++-- .../recipes/marble_raw_slab_polishing.json | 46 ++-- .../marble_raw_slab_recombination.json | 46 ++-- .../recipes/marble_raw_slabs_to_brick.json | 48 ++-- .../recipes/marble_raw_stairs_polishing.json | 46 ++-- .../recipes/marble_raw_stairs_to_brick.json | 48 ++-- .../recipes/marble_raw_wall_polishing.json | 46 ++-- .../recipes/marble_raw_walls_to_brick.json | 48 ++-- .../mineralogy/recipes/marble_relief_axe.json | 80 +++--- .../recipes/marble_relief_blank.json | 42 ++-- .../recipes/marble_relief_cross.json | 42 ++-- .../recipes/marble_relief_hammer.json | 54 ++--- .../mineralogy/recipes/marble_relief_hoe.json | 80 +++--- .../recipes/marble_relief_horizontal.json | 38 +-- .../mineralogy/recipes/marble_relief_i.json | 42 ++-- .../recipes/marble_relief_left.json | 42 ++-- .../recipes/marble_relief_pickaxe.json | 80 +++--- .../recipes/marble_relief_plus.json | 42 ++-- .../recipes/marble_relief_right.json | 38 +-- .../recipes/marble_relief_sword.json | 80 +++--- .../recipes/marble_relief_vertical.json | 42 ++-- .../data/mineralogy/recipes/marble_slab.json | 38 +-- .../mineralogy/recipes/marble_smooth.json | 38 +-- .../recipes/marble_smooth_brick.json | 40 +-- .../recipes/marble_smooth_brick_furnace.json | 48 ++-- .../recipes/marble_smooth_brick_slab.json | 38 +-- .../recipes/marble_smooth_brick_stairs.json | 42 ++-- .../recipes/marble_smooth_brick_wall.json | 40 +-- .../recipes/marble_smooth_furnace.json | 48 ++-- .../recipes/marble_smooth_slab.json | 38 +-- .../recipes/marble_smooth_stairs.json | 42 ++-- .../recipes/marble_smooth_wall.json | 40 +-- .../mineralogy/recipes/marble_stairs.json | 42 ++-- .../data/mineralogy/recipes/marble_wall.json | 40 +-- .../mineralogy/recipes/mineralfertilizer.json | 46 ++-- .../mineralogy/recipes/nitrate_block.json | 50 ++-- .../data/mineralogy/recipes/nitrate_dust.json | 40 +-- .../mineralogy/recipes/novaculite_brick.json | 40 +-- .../novaculite_brick_block_polishing.json | 46 ++-- .../recipes/novaculite_brick_furnace.json | 48 ++-- .../recipes/novaculite_brick_slab.json | 38 +-- .../novaculite_brick_slab_polishing.json | 46 ++-- .../novaculite_brick_slab_recombination.json | 46 ++-- .../recipes/novaculite_brick_stairs.json | 42 ++-- .../novaculite_brick_stairs_polishing.json | 46 ++-- .../recipes/novaculite_brick_wall.json | 40 +-- .../novaculite_brick_wall_polishing.json | 46 ++-- .../recipes/novaculite_cobblestone.json | 42 ++-- .../recipes/novaculite_furnace.json | 48 ++-- ...ite_polished_brick_slab_recombination.json | 46 ++-- ...ovaculite_polished_slab_recombination.json | 46 ++-- .../novaculite_polished_slabs_to_brick.json | 48 ++-- .../novaculite_polished_stairs_to_brick.json | 48 ++-- .../novaculite_polished_walls_to_brick.json | 48 ++-- .../novaculite_raw_slab_polishing.json | 46 ++-- .../novaculite_raw_slab_recombination.json | 46 ++-- .../novaculite_raw_slabs_to_brick.json | 48 ++-- .../novaculite_raw_stairs_polishing.json | 46 ++-- .../novaculite_raw_stairs_to_brick.json | 48 ++-- .../novaculite_raw_wall_polishing.json | 46 ++-- .../novaculite_raw_walls_to_brick.json | 48 ++-- .../recipes/novaculite_relief_axe.json | 80 +++--- .../recipes/novaculite_relief_blank.json | 42 ++-- .../recipes/novaculite_relief_cross.json | 42 ++-- .../recipes/novaculite_relief_hammer.json | 54 ++--- .../recipes/novaculite_relief_hoe.json | 80 +++--- .../recipes/novaculite_relief_horizontal.json | 38 +-- .../recipes/novaculite_relief_i.json | 42 ++-- .../recipes/novaculite_relief_left.json | 42 ++-- .../recipes/novaculite_relief_pickaxe.json | 80 +++--- .../recipes/novaculite_relief_plus.json | 42 ++-- .../recipes/novaculite_relief_right.json | 38 +-- .../recipes/novaculite_relief_sword.json | 80 +++--- .../recipes/novaculite_relief_vertical.json | 42 ++-- .../mineralogy/recipes/novaculite_slab.json | 38 +-- .../mineralogy/recipes/novaculite_smooth.json | 38 +-- .../recipes/novaculite_smooth_brick.json | 40 +-- .../novaculite_smooth_brick_furnace.json | 48 ++-- .../recipes/novaculite_smooth_brick_slab.json | 38 +-- .../novaculite_smooth_brick_stairs.json | 42 ++-- .../recipes/novaculite_smooth_brick_wall.json | 40 +-- .../recipes/novaculite_smooth_furnace.json | 48 ++-- .../recipes/novaculite_smooth_slab.json | 38 +-- .../recipes/novaculite_smooth_stairs.json | 42 ++-- .../recipes/novaculite_smooth_wall.json | 40 +-- .../mineralogy/recipes/novaculite_stairs.json | 42 ++-- .../mineralogy/recipes/novaculite_wall.json | 40 +-- .../mineralogy/recipes/pegmatite_brick.json | 40 +-- .../pegmatite_brick_block_polishing.json | 46 ++-- .../recipes/pegmatite_brick_furnace.json | 48 ++-- .../recipes/pegmatite_brick_slab.json | 38 +-- .../pegmatite_brick_slab_polishing.json | 46 ++-- .../pegmatite_brick_slab_recombination.json | 46 ++-- .../recipes/pegmatite_brick_stairs.json | 42 ++-- .../pegmatite_brick_stairs_polishing.json | 46 ++-- .../recipes/pegmatite_brick_wall.json | 40 +-- .../pegmatite_brick_wall_polishing.json | 46 ++-- .../recipes/pegmatite_cobblestone.json | 42 ++-- .../mineralogy/recipes/pegmatite_furnace.json | 48 ++-- ...ite_polished_brick_slab_recombination.json | 46 ++-- ...pegmatite_polished_slab_recombination.json | 46 ++-- .../pegmatite_polished_slabs_to_brick.json | 48 ++-- .../pegmatite_polished_stairs_to_brick.json | 48 ++-- .../pegmatite_polished_walls_to_brick.json | 48 ++-- .../recipes/pegmatite_raw_slab_polishing.json | 46 ++-- .../pegmatite_raw_slab_recombination.json | 46 ++-- .../recipes/pegmatite_raw_slabs_to_brick.json | 48 ++-- .../pegmatite_raw_stairs_polishing.json | 46 ++-- .../pegmatite_raw_stairs_to_brick.json | 48 ++-- .../recipes/pegmatite_raw_wall_polishing.json | 46 ++-- .../recipes/pegmatite_raw_walls_to_brick.json | 48 ++-- .../recipes/pegmatite_relief_axe.json | 80 +++--- .../recipes/pegmatite_relief_blank.json | 42 ++-- .../recipes/pegmatite_relief_cross.json | 42 ++-- .../recipes/pegmatite_relief_hammer.json | 54 ++--- .../recipes/pegmatite_relief_hoe.json | 80 +++--- .../recipes/pegmatite_relief_horizontal.json | 38 +-- .../recipes/pegmatite_relief_i.json | 42 ++-- .../recipes/pegmatite_relief_left.json | 42 ++-- .../recipes/pegmatite_relief_pickaxe.json | 80 +++--- .../recipes/pegmatite_relief_plus.json | 42 ++-- .../recipes/pegmatite_relief_right.json | 38 +-- .../recipes/pegmatite_relief_sword.json | 80 +++--- .../recipes/pegmatite_relief_vertical.json | 42 ++-- .../mineralogy/recipes/pegmatite_slab.json | 38 +-- .../mineralogy/recipes/pegmatite_smooth.json | 38 +-- .../recipes/pegmatite_smooth_brick.json | 40 +-- .../pegmatite_smooth_brick_furnace.json | 48 ++-- .../recipes/pegmatite_smooth_brick_slab.json | 38 +-- .../pegmatite_smooth_brick_stairs.json | 42 ++-- .../recipes/pegmatite_smooth_brick_wall.json | 40 +-- .../recipes/pegmatite_smooth_furnace.json | 48 ++-- .../recipes/pegmatite_smooth_slab.json | 38 +-- .../recipes/pegmatite_smooth_stairs.json | 42 ++-- .../recipes/pegmatite_smooth_wall.json | 40 +-- .../mineralogy/recipes/pegmatite_stairs.json | 42 ++-- .../mineralogy/recipes/pegmatite_wall.json | 40 +-- .../mineralogy/recipes/peridotite_brick.json | 40 +-- .../peridotite_brick_block_polishing.json | 46 ++-- .../recipes/peridotite_brick_furnace.json | 48 ++-- .../recipes/peridotite_brick_slab.json | 38 +-- .../peridotite_brick_slab_polishing.json | 46 ++-- .../peridotite_brick_slab_recombination.json | 46 ++-- .../recipes/peridotite_brick_stairs.json | 42 ++-- .../peridotite_brick_stairs_polishing.json | 46 ++-- .../recipes/peridotite_brick_wall.json | 40 +-- .../peridotite_brick_wall_polishing.json | 46 ++-- .../recipes/peridotite_cobblestone.json | 42 ++-- .../recipes/peridotite_furnace.json | 48 ++-- ...ite_polished_brick_slab_recombination.json | 46 ++-- ...eridotite_polished_slab_recombination.json | 46 ++-- .../peridotite_polished_slabs_to_brick.json | 48 ++-- .../peridotite_polished_stairs_to_brick.json | 48 ++-- .../peridotite_polished_walls_to_brick.json | 48 ++-- .../peridotite_raw_slab_polishing.json | 46 ++-- .../peridotite_raw_slab_recombination.json | 46 ++-- .../peridotite_raw_slabs_to_brick.json | 48 ++-- .../peridotite_raw_stairs_polishing.json | 46 ++-- .../peridotite_raw_stairs_to_brick.json | 48 ++-- .../peridotite_raw_wall_polishing.json | 46 ++-- .../peridotite_raw_walls_to_brick.json | 48 ++-- .../recipes/peridotite_relief_axe.json | 80 +++--- .../recipes/peridotite_relief_blank.json | 42 ++-- .../recipes/peridotite_relief_cross.json | 42 ++-- .../recipes/peridotite_relief_hammer.json | 54 ++--- .../recipes/peridotite_relief_hoe.json | 80 +++--- .../recipes/peridotite_relief_horizontal.json | 38 +-- .../recipes/peridotite_relief_i.json | 42 ++-- .../recipes/peridotite_relief_left.json | 42 ++-- .../recipes/peridotite_relief_pickaxe.json | 80 +++--- .../recipes/peridotite_relief_plus.json | 42 ++-- .../recipes/peridotite_relief_right.json | 38 +-- .../recipes/peridotite_relief_sword.json | 80 +++--- .../recipes/peridotite_relief_vertical.json | 42 ++-- .../mineralogy/recipes/peridotite_slab.json | 38 +-- .../mineralogy/recipes/peridotite_smooth.json | 38 +-- .../recipes/peridotite_smooth_brick.json | 40 +-- .../peridotite_smooth_brick_furnace.json | 48 ++-- .../recipes/peridotite_smooth_brick_slab.json | 38 +-- .../peridotite_smooth_brick_stairs.json | 42 ++-- .../recipes/peridotite_smooth_brick_wall.json | 40 +-- .../recipes/peridotite_smooth_furnace.json | 48 ++-- .../recipes/peridotite_smooth_slab.json | 38 +-- .../recipes/peridotite_smooth_stairs.json | 42 ++-- .../recipes/peridotite_smooth_wall.json | 40 +-- .../mineralogy/recipes/peridotite_stairs.json | 42 ++-- .../mineralogy/recipes/peridotite_wall.json | 40 +-- .../mineralogy/recipes/phosphorous_block.json | 50 ++-- .../mineralogy/recipes/phosphorous_dust.json | 40 +-- .../mineralogy/recipes/phyllite_brick.json | 40 +-- .../phyllite_brick_block_polishing.json | 46 ++-- .../recipes/phyllite_brick_furnace.json | 48 ++-- .../recipes/phyllite_brick_slab.json | 38 +-- .../phyllite_brick_slab_polishing.json | 46 ++-- .../phyllite_brick_slab_recombination.json | 46 ++-- .../recipes/phyllite_brick_stairs.json | 42 ++-- .../phyllite_brick_stairs_polishing.json | 46 ++-- .../recipes/phyllite_brick_wall.json | 40 +-- .../phyllite_brick_wall_polishing.json | 46 ++-- .../recipes/phyllite_cobblestone.json | 42 ++-- .../mineralogy/recipes/phyllite_furnace.json | 48 ++-- ...ite_polished_brick_slab_recombination.json | 46 ++-- .../phyllite_polished_slab_recombination.json | 46 ++-- .../phyllite_polished_slabs_to_brick.json | 48 ++-- .../phyllite_polished_stairs_to_brick.json | 48 ++-- .../phyllite_polished_walls_to_brick.json | 48 ++-- .../recipes/phyllite_raw_slab_polishing.json | 46 ++-- .../phyllite_raw_slab_recombination.json | 46 ++-- .../recipes/phyllite_raw_slabs_to_brick.json | 48 ++-- .../phyllite_raw_stairs_polishing.json | 46 ++-- .../recipes/phyllite_raw_stairs_to_brick.json | 48 ++-- .../recipes/phyllite_raw_wall_polishing.json | 46 ++-- .../recipes/phyllite_raw_walls_to_brick.json | 48 ++-- .../recipes/phyllite_relief_axe.json | 80 +++--- .../recipes/phyllite_relief_blank.json | 42 ++-- .../recipes/phyllite_relief_cross.json | 42 ++-- .../recipes/phyllite_relief_hammer.json | 54 ++--- .../recipes/phyllite_relief_hoe.json | 80 +++--- .../recipes/phyllite_relief_horizontal.json | 38 +-- .../mineralogy/recipes/phyllite_relief_i.json | 42 ++-- .../recipes/phyllite_relief_left.json | 42 ++-- .../recipes/phyllite_relief_pickaxe.json | 80 +++--- .../recipes/phyllite_relief_plus.json | 42 ++-- .../recipes/phyllite_relief_right.json | 38 +-- .../recipes/phyllite_relief_sword.json | 80 +++--- .../recipes/phyllite_relief_vertical.json | 42 ++-- .../mineralogy/recipes/phyllite_slab.json | 38 +-- .../mineralogy/recipes/phyllite_smooth.json | 38 +-- .../recipes/phyllite_smooth_brick.json | 40 +-- .../phyllite_smooth_brick_furnace.json | 48 ++-- .../recipes/phyllite_smooth_brick_slab.json | 38 +-- .../recipes/phyllite_smooth_brick_stairs.json | 42 ++-- .../recipes/phyllite_smooth_brick_wall.json | 40 +-- .../recipes/phyllite_smooth_furnace.json | 48 ++-- .../recipes/phyllite_smooth_slab.json | 38 +-- .../recipes/phyllite_smooth_stairs.json | 42 ++-- .../recipes/phyllite_smooth_wall.json | 40 +-- .../mineralogy/recipes/phyllite_stairs.json | 42 ++-- .../mineralogy/recipes/phyllite_wall.json | 40 +-- .../mineralogy/recipes/quartzite_brick.json | 40 +-- .../quartzite_brick_block_polishing.json | 46 ++-- .../recipes/quartzite_brick_furnace.json | 48 ++-- .../recipes/quartzite_brick_slab.json | 38 +-- .../quartzite_brick_slab_polishing.json | 46 ++-- .../quartzite_brick_slab_recombination.json | 46 ++-- .../recipes/quartzite_brick_stairs.json | 42 ++-- .../quartzite_brick_stairs_polishing.json | 46 ++-- .../recipes/quartzite_brick_wall.json | 40 +-- .../quartzite_brick_wall_polishing.json | 46 ++-- .../recipes/quartzite_cobblestone.json | 42 ++-- .../mineralogy/recipes/quartzite_furnace.json | 48 ++-- ...ite_polished_brick_slab_recombination.json | 46 ++-- ...quartzite_polished_slab_recombination.json | 46 ++-- .../quartzite_polished_slabs_to_brick.json | 48 ++-- .../quartzite_polished_stairs_to_brick.json | 48 ++-- .../quartzite_polished_walls_to_brick.json | 48 ++-- .../recipes/quartzite_raw_slab_polishing.json | 46 ++-- .../quartzite_raw_slab_recombination.json | 46 ++-- .../recipes/quartzite_raw_slabs_to_brick.json | 48 ++-- .../quartzite_raw_stairs_polishing.json | 46 ++-- .../quartzite_raw_stairs_to_brick.json | 48 ++-- .../recipes/quartzite_raw_wall_polishing.json | 46 ++-- .../recipes/quartzite_raw_walls_to_brick.json | 48 ++-- .../recipes/quartzite_relief_axe.json | 80 +++--- .../recipes/quartzite_relief_blank.json | 42 ++-- .../recipes/quartzite_relief_cross.json | 42 ++-- .../recipes/quartzite_relief_hammer.json | 54 ++--- .../recipes/quartzite_relief_hoe.json | 80 +++--- .../recipes/quartzite_relief_horizontal.json | 38 +-- .../recipes/quartzite_relief_i.json | 42 ++-- .../recipes/quartzite_relief_left.json | 42 ++-- .../recipes/quartzite_relief_pickaxe.json | 80 +++--- .../recipes/quartzite_relief_plus.json | 42 ++-- .../recipes/quartzite_relief_right.json | 38 +-- .../recipes/quartzite_relief_sword.json | 80 +++--- .../recipes/quartzite_relief_vertical.json | 42 ++-- .../mineralogy/recipes/quartzite_slab.json | 38 +-- .../mineralogy/recipes/quartzite_smooth.json | 38 +-- .../recipes/quartzite_smooth_brick.json | 40 +-- .../quartzite_smooth_brick_furnace.json | 48 ++-- .../recipes/quartzite_smooth_brick_slab.json | 38 +-- .../quartzite_smooth_brick_stairs.json | 42 ++-- .../recipes/quartzite_smooth_brick_wall.json | 40 +-- .../recipes/quartzite_smooth_furnace.json | 48 ++-- .../recipes/quartzite_smooth_slab.json | 38 +-- .../recipes/quartzite_smooth_stairs.json | 42 ++-- .../recipes/quartzite_smooth_wall.json | 40 +-- .../mineralogy/recipes/quartzite_stairs.json | 42 ++-- .../mineralogy/recipes/quartzite_wall.json | 40 +-- .../mineralogy/recipes/rhyolite_brick.json | 40 +-- .../rhyolite_brick_block_polishing.json | 46 ++-- .../recipes/rhyolite_brick_furnace.json | 48 ++-- .../recipes/rhyolite_brick_slab.json | 38 +-- .../rhyolite_brick_slab_polishing.json | 46 ++-- .../rhyolite_brick_slab_recombination.json | 46 ++-- .../recipes/rhyolite_brick_stairs.json | 42 ++-- .../rhyolite_brick_stairs_polishing.json | 46 ++-- .../recipes/rhyolite_brick_wall.json | 40 +-- .../rhyolite_brick_wall_polishing.json | 46 ++-- .../recipes/rhyolite_cobblestone.json | 42 ++-- .../mineralogy/recipes/rhyolite_furnace.json | 48 ++-- ...ite_polished_brick_slab_recombination.json | 46 ++-- .../rhyolite_polished_slab_recombination.json | 46 ++-- .../rhyolite_polished_slabs_to_brick.json | 48 ++-- .../rhyolite_polished_stairs_to_brick.json | 48 ++-- .../rhyolite_polished_walls_to_brick.json | 48 ++-- .../recipes/rhyolite_raw_slab_polishing.json | 46 ++-- .../rhyolite_raw_slab_recombination.json | 46 ++-- .../recipes/rhyolite_raw_slabs_to_brick.json | 48 ++-- .../rhyolite_raw_stairs_polishing.json | 46 ++-- .../recipes/rhyolite_raw_stairs_to_brick.json | 48 ++-- .../recipes/rhyolite_raw_wall_polishing.json | 46 ++-- .../recipes/rhyolite_raw_walls_to_brick.json | 48 ++-- .../recipes/rhyolite_relief_axe.json | 80 +++--- .../recipes/rhyolite_relief_blank.json | 42 ++-- .../recipes/rhyolite_relief_cross.json | 42 ++-- .../recipes/rhyolite_relief_hammer.json | 54 ++--- .../recipes/rhyolite_relief_hoe.json | 80 +++--- .../recipes/rhyolite_relief_horizontal.json | 38 +-- .../mineralogy/recipes/rhyolite_relief_i.json | 42 ++-- .../recipes/rhyolite_relief_left.json | 42 ++-- .../recipes/rhyolite_relief_pickaxe.json | 80 +++--- .../recipes/rhyolite_relief_plus.json | 42 ++-- .../recipes/rhyolite_relief_right.json | 38 +-- .../recipes/rhyolite_relief_sword.json | 80 +++--- .../recipes/rhyolite_relief_vertical.json | 42 ++-- .../mineralogy/recipes/rhyolite_slab.json | 38 +-- .../mineralogy/recipes/rhyolite_smooth.json | 38 +-- .../recipes/rhyolite_smooth_brick.json | 40 +-- .../rhyolite_smooth_brick_furnace.json | 48 ++-- .../recipes/rhyolite_smooth_brick_slab.json | 38 +-- .../recipes/rhyolite_smooth_brick_stairs.json | 42 ++-- .../recipes/rhyolite_smooth_brick_wall.json | 40 +-- .../recipes/rhyolite_smooth_furnace.json | 48 ++-- .../recipes/rhyolite_smooth_slab.json | 38 +-- .../recipes/rhyolite_smooth_stairs.json | 42 ++-- .../recipes/rhyolite_smooth_wall.json | 40 +-- .../mineralogy/recipes/rhyolite_stairs.json | 42 ++-- .../mineralogy/recipes/rhyolite_wall.json | 40 +-- .../data/mineralogy/recipes/rock_salt.json | 40 +-- .../mineralogy/recipes/rock_salt_brick.json | 40 +-- .../rock_salt_brick_block_polishing.json | 46 ++-- .../recipes/rock_salt_brick_furnace.json | 48 ++-- .../recipes/rock_salt_brick_slab.json | 38 +-- .../rock_salt_brick_slab_polishing.json | 46 ++-- .../rock_salt_brick_slab_recombination.json | 46 ++-- .../recipes/rock_salt_brick_stairs.json | 42 ++-- .../rock_salt_brick_stairs_polishing.json | 46 ++-- .../recipes/rock_salt_brick_wall.json | 40 +-- .../rock_salt_brick_wall_polishing.json | 46 ++-- .../recipes/rock_salt_cobblestone.json | 42 ++-- .../mineralogy/recipes/rock_salt_dust.json | 32 +-- .../mineralogy/recipes/rock_salt_furnace.json | 48 ++-- ...alt_polished_brick_slab_recombination.json | 46 ++-- ...rock_salt_polished_slab_recombination.json | 46 ++-- .../rock_salt_polished_slabs_to_brick.json | 48 ++-- .../rock_salt_polished_stairs_to_brick.json | 48 ++-- .../rock_salt_polished_walls_to_brick.json | 48 ++-- .../recipes/rock_salt_raw_slab_polishing.json | 46 ++-- .../rock_salt_raw_slab_recombination.json | 46 ++-- .../recipes/rock_salt_raw_slabs_to_brick.json | 48 ++-- .../rock_salt_raw_stairs_polishing.json | 46 ++-- .../rock_salt_raw_stairs_to_brick.json | 48 ++-- .../recipes/rock_salt_raw_wall_polishing.json | 46 ++-- .../recipes/rock_salt_raw_walls_to_brick.json | 48 ++-- .../recipes/rock_salt_relief_axe.json | 80 +++--- .../recipes/rock_salt_relief_blank.json | 42 ++-- .../recipes/rock_salt_relief_cross.json | 42 ++-- .../recipes/rock_salt_relief_hammer.json | 54 ++--- .../recipes/rock_salt_relief_hoe.json | 80 +++--- .../recipes/rock_salt_relief_horizontal.json | 38 +-- .../recipes/rock_salt_relief_i.json | 42 ++-- .../recipes/rock_salt_relief_left.json | 42 ++-- .../recipes/rock_salt_relief_pickaxe.json | 80 +++--- .../recipes/rock_salt_relief_plus.json | 42 ++-- .../recipes/rock_salt_relief_right.json | 38 +-- .../recipes/rock_salt_relief_sword.json | 80 +++--- .../recipes/rock_salt_relief_vertical.json | 42 ++-- .../mineralogy/recipes/rock_salt_slab.json | 38 +-- .../mineralogy/recipes/rock_salt_smooth.json | 38 +-- .../recipes/rock_salt_smooth_brick.json | 40 +-- .../rock_salt_smooth_brick_furnace.json | 48 ++-- .../recipes/rock_salt_smooth_brick_slab.json | 38 +-- .../rock_salt_smooth_brick_stairs.json | 42 ++-- .../recipes/rock_salt_smooth_brick_wall.json | 40 +-- .../recipes/rock_salt_smooth_furnace.json | 48 ++-- .../recipes/rock_salt_smooth_slab.json | 38 +-- .../recipes/rock_salt_smooth_stairs.json | 42 ++-- .../recipes/rock_salt_smooth_wall.json | 40 +-- .../mineralogy/recipes/rock_salt_stairs.json | 42 ++-- .../mineralogy/recipes/rock_salt_wall.json | 40 +-- .../data/mineralogy/recipes/rocksaltlamp.json | 52 ++-- .../recipes/rocksaltstreetlamp.json | 56 ++--- .../data/mineralogy/recipes/schist_brick.json | 40 +-- .../recipes/schist_brick_block_polishing.json | 46 ++-- .../recipes/schist_brick_furnace.json | 48 ++-- .../mineralogy/recipes/schist_brick_slab.json | 38 +-- .../recipes/schist_brick_slab_polishing.json | 46 ++-- .../schist_brick_slab_recombination.json | 46 ++-- .../recipes/schist_brick_stairs.json | 42 ++-- .../schist_brick_stairs_polishing.json | 46 ++-- .../mineralogy/recipes/schist_brick_wall.json | 40 +-- .../recipes/schist_brick_wall_polishing.json | 46 ++-- .../recipes/schist_cobblestone.json | 42 ++-- .../mineralogy/recipes/schist_furnace.json | 48 ++-- ...ist_polished_brick_slab_recombination.json | 46 ++-- .../schist_polished_slab_recombination.json | 46 ++-- .../schist_polished_slabs_to_brick.json | 48 ++-- .../schist_polished_stairs_to_brick.json | 48 ++-- .../schist_polished_walls_to_brick.json | 48 ++-- .../recipes/schist_raw_slab_polishing.json | 46 ++-- .../schist_raw_slab_recombination.json | 46 ++-- .../recipes/schist_raw_slabs_to_brick.json | 48 ++-- .../recipes/schist_raw_stairs_polishing.json | 46 ++-- .../recipes/schist_raw_stairs_to_brick.json | 48 ++-- .../recipes/schist_raw_wall_polishing.json | 46 ++-- .../recipes/schist_raw_walls_to_brick.json | 48 ++-- .../mineralogy/recipes/schist_relief_axe.json | 80 +++--- .../recipes/schist_relief_blank.json | 42 ++-- .../recipes/schist_relief_cross.json | 42 ++-- .../recipes/schist_relief_hammer.json | 54 ++--- .../mineralogy/recipes/schist_relief_hoe.json | 80 +++--- .../recipes/schist_relief_horizontal.json | 38 +-- .../mineralogy/recipes/schist_relief_i.json | 42 ++-- .../recipes/schist_relief_left.json | 42 ++-- .../recipes/schist_relief_pickaxe.json | 80 +++--- .../recipes/schist_relief_plus.json | 42 ++-- .../recipes/schist_relief_right.json | 38 +-- .../recipes/schist_relief_sword.json | 80 +++--- .../recipes/schist_relief_vertical.json | 42 ++-- .../data/mineralogy/recipes/schist_slab.json | 38 +-- .../mineralogy/recipes/schist_smooth.json | 38 +-- .../recipes/schist_smooth_brick.json | 40 +-- .../recipes/schist_smooth_brick_furnace.json | 48 ++-- .../recipes/schist_smooth_brick_slab.json | 38 +-- .../recipes/schist_smooth_brick_stairs.json | 42 ++-- .../recipes/schist_smooth_brick_wall.json | 40 +-- .../recipes/schist_smooth_furnace.json | 48 ++-- .../recipes/schist_smooth_slab.json | 38 +-- .../recipes/schist_smooth_stairs.json | 42 ++-- .../recipes/schist_smooth_wall.json | 40 +-- .../mineralogy/recipes/schist_stairs.json | 42 ++-- .../data/mineralogy/recipes/schist_wall.json | 40 +-- .../data/mineralogy/recipes/scoria_brick.json | 40 +-- .../recipes/scoria_brick_block_polishing.json | 46 ++-- .../recipes/scoria_brick_furnace.json | 48 ++-- .../mineralogy/recipes/scoria_brick_slab.json | 38 +-- .../recipes/scoria_brick_slab_polishing.json | 46 ++-- .../scoria_brick_slab_recombination.json | 46 ++-- .../recipes/scoria_brick_stairs.json | 42 ++-- .../scoria_brick_stairs_polishing.json | 46 ++-- .../mineralogy/recipes/scoria_brick_wall.json | 40 +-- .../recipes/scoria_brick_wall_polishing.json | 46 ++-- .../recipes/scoria_cobblestone.json | 42 ++-- .../mineralogy/recipes/scoria_furnace.json | 48 ++-- ...ria_polished_brick_slab_recombination.json | 46 ++-- .../scoria_polished_slab_recombination.json | 46 ++-- .../scoria_polished_slabs_to_brick.json | 48 ++-- .../scoria_polished_stairs_to_brick.json | 48 ++-- .../scoria_polished_walls_to_brick.json | 48 ++-- .../recipes/scoria_raw_slab_polishing.json | 46 ++-- .../scoria_raw_slab_recombination.json | 46 ++-- .../recipes/scoria_raw_slabs_to_brick.json | 48 ++-- .../recipes/scoria_raw_stairs_polishing.json | 46 ++-- .../recipes/scoria_raw_stairs_to_brick.json | 48 ++-- .../recipes/scoria_raw_wall_polishing.json | 46 ++-- .../recipes/scoria_raw_walls_to_brick.json | 48 ++-- .../mineralogy/recipes/scoria_relief_axe.json | 80 +++--- .../recipes/scoria_relief_blank.json | 42 ++-- .../recipes/scoria_relief_cross.json | 42 ++-- .../recipes/scoria_relief_hammer.json | 54 ++--- .../mineralogy/recipes/scoria_relief_hoe.json | 80 +++--- .../recipes/scoria_relief_horizontal.json | 38 +-- .../mineralogy/recipes/scoria_relief_i.json | 42 ++-- .../recipes/scoria_relief_left.json | 42 ++-- .../recipes/scoria_relief_pickaxe.json | 80 +++--- .../recipes/scoria_relief_plus.json | 42 ++-- .../recipes/scoria_relief_right.json | 38 +-- .../recipes/scoria_relief_sword.json | 80 +++--- .../recipes/scoria_relief_vertical.json | 42 ++-- .../data/mineralogy/recipes/scoria_slab.json | 38 +-- .../mineralogy/recipes/scoria_smooth.json | 38 +-- .../recipes/scoria_smooth_brick.json | 40 +-- .../recipes/scoria_smooth_brick_furnace.json | 48 ++-- .../recipes/scoria_smooth_brick_slab.json | 38 +-- .../recipes/scoria_smooth_brick_stairs.json | 42 ++-- .../recipes/scoria_smooth_brick_wall.json | 40 +-- .../recipes/scoria_smooth_furnace.json | 48 ++-- .../recipes/scoria_smooth_slab.json | 38 +-- .../recipes/scoria_smooth_stairs.json | 42 ++-- .../recipes/scoria_smooth_wall.json | 40 +-- .../mineralogy/recipes/scoria_stairs.json | 42 ++-- .../data/mineralogy/recipes/scoria_wall.json | 40 +-- .../data/mineralogy/recipes/shale_brick.json | 40 +-- .../recipes/shale_brick_block_polishing.json | 46 ++-- .../recipes/shale_brick_furnace.json | 48 ++-- .../mineralogy/recipes/shale_brick_slab.json | 38 +-- .../recipes/shale_brick_slab_polishing.json | 46 ++-- .../shale_brick_slab_recombination.json | 46 ++-- .../recipes/shale_brick_stairs.json | 42 ++-- .../recipes/shale_brick_stairs_polishing.json | 46 ++-- .../mineralogy/recipes/shale_brick_wall.json | 40 +-- .../recipes/shale_brick_wall_polishing.json | 46 ++-- .../mineralogy/recipes/shale_cobblestone.json | 42 ++-- .../mineralogy/recipes/shale_furnace.json | 48 ++-- ...ale_polished_brick_slab_recombination.json | 46 ++-- .../shale_polished_slab_recombination.json | 46 ++-- .../shale_polished_slabs_to_brick.json | 48 ++-- .../shale_polished_stairs_to_brick.json | 48 ++-- .../shale_polished_walls_to_brick.json | 48 ++-- .../recipes/shale_raw_slab_polishing.json | 46 ++-- .../recipes/shale_raw_slab_recombination.json | 46 ++-- .../recipes/shale_raw_slabs_to_brick.json | 48 ++-- .../recipes/shale_raw_stairs_polishing.json | 46 ++-- .../recipes/shale_raw_stairs_to_brick.json | 48 ++-- .../recipes/shale_raw_wall_polishing.json | 46 ++-- .../recipes/shale_raw_walls_to_brick.json | 48 ++-- .../mineralogy/recipes/shale_relief_axe.json | 80 +++--- .../recipes/shale_relief_blank.json | 42 ++-- .../recipes/shale_relief_cross.json | 42 ++-- .../recipes/shale_relief_hammer.json | 54 ++--- .../mineralogy/recipes/shale_relief_hoe.json | 80 +++--- .../recipes/shale_relief_horizontal.json | 38 +-- .../mineralogy/recipes/shale_relief_i.json | 42 ++-- .../mineralogy/recipes/shale_relief_left.json | 42 ++-- .../recipes/shale_relief_pickaxe.json | 80 +++--- .../mineralogy/recipes/shale_relief_plus.json | 42 ++-- .../recipes/shale_relief_right.json | 38 +-- .../recipes/shale_relief_sword.json | 80 +++--- .../recipes/shale_relief_vertical.json | 42 ++-- .../data/mineralogy/recipes/shale_slab.json | 38 +-- .../data/mineralogy/recipes/shale_smooth.json | 38 +-- .../recipes/shale_smooth_brick.json | 40 +-- .../recipes/shale_smooth_brick_furnace.json | 48 ++-- .../recipes/shale_smooth_brick_slab.json | 38 +-- .../recipes/shale_smooth_brick_stairs.json | 42 ++-- .../recipes/shale_smooth_brick_wall.json | 40 +-- .../recipes/shale_smooth_furnace.json | 48 ++-- .../mineralogy/recipes/shale_smooth_slab.json | 38 +-- .../recipes/shale_smooth_stairs.json | 42 ++-- .../mineralogy/recipes/shale_smooth_wall.json | 40 +-- .../data/mineralogy/recipes/shale_stairs.json | 42 ++-- .../data/mineralogy/recipes/shale_wall.json | 40 +-- .../mineralogy/recipes/siltstone_brick.json | 40 +-- .../siltstone_brick_block_polishing.json | 46 ++-- .../recipes/siltstone_brick_furnace.json | 48 ++-- .../recipes/siltstone_brick_slab.json | 38 +-- .../siltstone_brick_slab_polishing.json | 46 ++-- .../siltstone_brick_slab_recombination.json | 46 ++-- .../recipes/siltstone_brick_stairs.json | 42 ++-- .../siltstone_brick_stairs_polishing.json | 46 ++-- .../recipes/siltstone_brick_wall.json | 40 +-- .../siltstone_brick_wall_polishing.json | 46 ++-- .../recipes/siltstone_cobblestone.json | 42 ++-- .../mineralogy/recipes/siltstone_furnace.json | 48 ++-- ...one_polished_brick_slab_recombination.json | 46 ++-- ...siltstone_polished_slab_recombination.json | 46 ++-- .../siltstone_polished_slabs_to_brick.json | 48 ++-- .../siltstone_polished_stairs_to_brick.json | 48 ++-- .../siltstone_polished_walls_to_brick.json | 48 ++-- .../recipes/siltstone_raw_slab_polishing.json | 46 ++-- .../siltstone_raw_slab_recombination.json | 46 ++-- .../recipes/siltstone_raw_slabs_to_brick.json | 48 ++-- .../siltstone_raw_stairs_polishing.json | 46 ++-- .../siltstone_raw_stairs_to_brick.json | 48 ++-- .../recipes/siltstone_raw_wall_polishing.json | 46 ++-- .../recipes/siltstone_raw_walls_to_brick.json | 48 ++-- .../recipes/siltstone_relief_axe.json | 80 +++--- .../recipes/siltstone_relief_blank.json | 42 ++-- .../recipes/siltstone_relief_cross.json | 42 ++-- .../recipes/siltstone_relief_hammer.json | 54 ++--- .../recipes/siltstone_relief_hoe.json | 80 +++--- .../recipes/siltstone_relief_horizontal.json | 38 +-- .../recipes/siltstone_relief_i.json | 42 ++-- .../recipes/siltstone_relief_left.json | 42 ++-- .../recipes/siltstone_relief_pickaxe.json | 80 +++--- .../recipes/siltstone_relief_plus.json | 42 ++-- .../recipes/siltstone_relief_right.json | 38 +-- .../recipes/siltstone_relief_sword.json | 80 +++--- .../recipes/siltstone_relief_vertical.json | 42 ++-- .../mineralogy/recipes/siltstone_slab.json | 38 +-- .../mineralogy/recipes/siltstone_smooth.json | 38 +-- .../recipes/siltstone_smooth_brick.json | 40 +-- .../siltstone_smooth_brick_furnace.json | 48 ++-- .../recipes/siltstone_smooth_brick_slab.json | 38 +-- .../siltstone_smooth_brick_stairs.json | 42 ++-- .../recipes/siltstone_smooth_brick_wall.json | 40 +-- .../recipes/siltstone_smooth_furnace.json | 48 ++-- .../recipes/siltstone_smooth_slab.json | 38 +-- .../recipes/siltstone_smooth_stairs.json | 42 ++-- .../recipes/siltstone_smooth_wall.json | 40 +-- .../mineralogy/recipes/siltstone_stairs.json | 42 ++-- .../mineralogy/recipes/siltstone_wall.json | 40 +-- .../data/mineralogy/recipes/slate_brick.json | 40 +-- .../recipes/slate_brick_block_polishing.json | 46 ++-- .../recipes/slate_brick_furnace.json | 48 ++-- .../mineralogy/recipes/slate_brick_slab.json | 38 +-- .../recipes/slate_brick_slab_polishing.json | 46 ++-- .../slate_brick_slab_recombination.json | 46 ++-- .../recipes/slate_brick_stairs.json | 42 ++-- .../recipes/slate_brick_stairs_polishing.json | 46 ++-- .../mineralogy/recipes/slate_brick_wall.json | 40 +-- .../recipes/slate_brick_wall_polishing.json | 46 ++-- .../mineralogy/recipes/slate_cobblestone.json | 42 ++-- .../mineralogy/recipes/slate_furnace.json | 48 ++-- ...ate_polished_brick_slab_recombination.json | 46 ++-- .../slate_polished_slab_recombination.json | 46 ++-- .../slate_polished_slabs_to_brick.json | 48 ++-- .../slate_polished_stairs_to_brick.json | 48 ++-- .../slate_polished_walls_to_brick.json | 48 ++-- .../recipes/slate_raw_slab_polishing.json | 46 ++-- .../recipes/slate_raw_slab_recombination.json | 46 ++-- .../recipes/slate_raw_slabs_to_brick.json | 48 ++-- .../recipes/slate_raw_stairs_polishing.json | 46 ++-- .../recipes/slate_raw_stairs_to_brick.json | 48 ++-- .../recipes/slate_raw_wall_polishing.json | 46 ++-- .../recipes/slate_raw_walls_to_brick.json | 48 ++-- .../mineralogy/recipes/slate_relief_axe.json | 80 +++--- .../recipes/slate_relief_blank.json | 42 ++-- .../recipes/slate_relief_cross.json | 42 ++-- .../recipes/slate_relief_hammer.json | 54 ++--- .../mineralogy/recipes/slate_relief_hoe.json | 80 +++--- .../recipes/slate_relief_horizontal.json | 38 +-- .../mineralogy/recipes/slate_relief_i.json | 42 ++-- .../mineralogy/recipes/slate_relief_left.json | 42 ++-- .../recipes/slate_relief_pickaxe.json | 80 +++--- .../mineralogy/recipes/slate_relief_plus.json | 42 ++-- .../recipes/slate_relief_right.json | 38 +-- .../recipes/slate_relief_sword.json | 80 +++--- .../recipes/slate_relief_vertical.json | 42 ++-- .../data/mineralogy/recipes/slate_slab.json | 38 +-- .../data/mineralogy/recipes/slate_smooth.json | 38 +-- .../recipes/slate_smooth_brick.json | 40 +-- .../recipes/slate_smooth_brick_furnace.json | 48 ++-- .../recipes/slate_smooth_brick_slab.json | 38 +-- .../recipes/slate_smooth_brick_stairs.json | 42 ++-- .../recipes/slate_smooth_brick_wall.json | 40 +-- .../recipes/slate_smooth_furnace.json | 48 ++-- .../mineralogy/recipes/slate_smooth_slab.json | 38 +-- .../recipes/slate_smooth_stairs.json | 42 ++-- .../mineralogy/recipes/slate_smooth_wall.json | 40 +-- .../data/mineralogy/recipes/slate_stairs.json | 42 ++-- .../data/mineralogy/recipes/slate_wall.json | 40 +-- .../data/mineralogy/recipes/sulfur_block.json | 50 ++-- .../data/mineralogy/recipes/sulfur_dust.json | 40 +-- .../data/mineralogy/recipes/tuff_brick.json | 40 +-- .../recipes/tuff_brick_block_polishing.json | 46 ++-- .../recipes/tuff_brick_furnace.json | 48 ++-- .../mineralogy/recipes/tuff_brick_slab.json | 38 +-- .../recipes/tuff_brick_slab_polishing.json | 46 ++-- .../tuff_brick_slab_recombination.json | 46 ++-- .../mineralogy/recipes/tuff_brick_stairs.json | 42 ++-- .../recipes/tuff_brick_stairs_polishing.json | 46 ++-- .../mineralogy/recipes/tuff_brick_wall.json | 40 +-- .../recipes/tuff_brick_wall_polishing.json | 46 ++-- .../mineralogy/recipes/tuff_cobblestone.json | 42 ++-- .../data/mineralogy/recipes/tuff_furnace.json | 48 ++-- ...uff_polished_brick_slab_recombination.json | 46 ++-- .../tuff_polished_slab_recombination.json | 46 ++-- .../recipes/tuff_polished_slabs_to_brick.json | 48 ++-- .../tuff_polished_stairs_to_brick.json | 48 ++-- .../recipes/tuff_polished_walls_to_brick.json | 48 ++-- .../recipes/tuff_raw_slab_polishing.json | 46 ++-- .../recipes/tuff_raw_slab_recombination.json | 46 ++-- .../recipes/tuff_raw_slabs_to_brick.json | 48 ++-- .../recipes/tuff_raw_stairs_polishing.json | 46 ++-- .../recipes/tuff_raw_stairs_to_brick.json | 48 ++-- .../recipes/tuff_raw_wall_polishing.json | 46 ++-- .../recipes/tuff_raw_walls_to_brick.json | 48 ++-- .../mineralogy/recipes/tuff_relief_axe.json | 80 +++--- .../mineralogy/recipes/tuff_relief_blank.json | 42 ++-- .../mineralogy/recipes/tuff_relief_cross.json | 42 ++-- .../recipes/tuff_relief_hammer.json | 54 ++--- .../mineralogy/recipes/tuff_relief_hoe.json | 80 +++--- .../recipes/tuff_relief_horizontal.json | 38 +-- .../mineralogy/recipes/tuff_relief_i.json | 42 ++-- .../mineralogy/recipes/tuff_relief_left.json | 42 ++-- .../recipes/tuff_relief_pickaxe.json | 80 +++--- .../mineralogy/recipes/tuff_relief_plus.json | 42 ++-- .../mineralogy/recipes/tuff_relief_right.json | 38 +-- .../mineralogy/recipes/tuff_relief_sword.json | 80 +++--- .../recipes/tuff_relief_vertical.json | 42 ++-- .../data/mineralogy/recipes/tuff_slab.json | 38 +-- .../data/mineralogy/recipes/tuff_smooth.json | 38 +-- .../mineralogy/recipes/tuff_smooth_brick.json | 40 +-- .../recipes/tuff_smooth_brick_furnace.json | 48 ++-- .../recipes/tuff_smooth_brick_slab.json | 38 +-- .../recipes/tuff_smooth_brick_stairs.json | 42 ++-- .../recipes/tuff_smooth_brick_wall.json | 40 +-- .../recipes/tuff_smooth_furnace.json | 48 ++-- .../mineralogy/recipes/tuff_smooth_slab.json | 38 +-- .../recipes/tuff_smooth_stairs.json | 42 ++-- .../mineralogy/recipes/tuff_smooth_wall.json | 40 +-- .../data/mineralogy/recipes/tuff_stairs.json | 42 ++-- .../data/mineralogy/recipes/tuff_wall.json | 40 +-- .../tags/blocks/stones/amphibolite.json | 8 +- .../tags/blocks/stones/andesite.json | 10 +- .../mineralogy/tags/blocks/stones/basalt.json | 10 +- .../tags/blocks/stones/basaltic_glass.json | 8 +- .../tags/blocks/stones/conglomerate.json | 8 +- .../tags/blocks/stones/diabase.json | 8 +- .../tags/blocks/stones/diorite.json | 10 +- .../tags/blocks/stones/dolomite.json | 8 +- .../mineralogy/tags/blocks/stones/gabbro.json | 8 +- .../mineralogy/tags/blocks/stones/gneiss.json | 8 +- .../tags/blocks/stones/granite.json | 10 +- .../tags/blocks/stones/hornfels.json | 8 +- .../tags/blocks/stones/limestone.json | 8 +- .../mineralogy/tags/blocks/stones/marble.json | 8 +- .../tags/blocks/stones/novaculite.json | 8 +- .../tags/blocks/stones/pegmatite.json | 8 +- .../tags/blocks/stones/peridotite.json | 8 +- .../tags/blocks/stones/phyllite.json | 8 +- .../tags/blocks/stones/quartzite.json | 8 +- .../tags/blocks/stones/rhyolite.json | 8 +- .../tags/blocks/stones/rock_salt.json | 8 +- .../mineralogy/tags/blocks/stones/schist.json | 8 +- .../mineralogy/tags/blocks/stones/scoria.json | 8 +- .../mineralogy/tags/blocks/stones/shale.json | 8 +- .../tags/blocks/stones/siltstone.json | 8 +- .../mineralogy/tags/blocks/stones/slate.json | 8 +- .../mineralogy/tags/blocks/stones/tuff.json | 9 +- .../tags/items/cobblestone_equivalents.json | 62 ++--- .../tags/items/slabs/amphibolite.json | 8 +- .../tags/items/slabs/amphibolite/brick.json | 8 +- .../tags/items/slabs/amphibolite/smooth.json | 8 +- .../items/slabs/amphibolite/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/andesite.json | 10 +- .../tags/items/slabs/andesite/brick.json | 8 +- .../tags/items/slabs/andesite/smooth.json | 10 +- .../items/slabs/andesite/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/basalt.json | 8 +- .../tags/items/slabs/basalt/brick.json | 8 +- .../tags/items/slabs/basalt/smooth.json | 8 +- .../tags/items/slabs/basalt/smooth_brick.json | 8 +- .../tags/items/slabs/basaltic_glass.json | 8 +- .../items/slabs/basaltic_glass/brick.json | 8 +- .../items/slabs/basaltic_glass/smooth.json | 8 +- .../slabs/basaltic_glass/smooth_brick.json | 8 +- .../tags/items/slabs/conglomerate.json | 8 +- .../tags/items/slabs/conglomerate/brick.json | 8 +- .../tags/items/slabs/conglomerate/smooth.json | 8 +- .../slabs/conglomerate/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/diabase.json | 8 +- .../tags/items/slabs/diabase/brick.json | 8 +- .../tags/items/slabs/diabase/smooth.json | 8 +- .../items/slabs/diabase/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/diorite.json | 10 +- .../tags/items/slabs/diorite/brick.json | 8 +- .../tags/items/slabs/diorite/smooth.json | 10 +- .../items/slabs/diorite/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/dolomite.json | 8 +- .../tags/items/slabs/dolomite/brick.json | 8 +- .../tags/items/slabs/dolomite/smooth.json | 8 +- .../items/slabs/dolomite/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/gabbro.json | 8 +- .../tags/items/slabs/gabbro/brick.json | 8 +- .../tags/items/slabs/gabbro/smooth.json | 8 +- .../tags/items/slabs/gabbro/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/gneiss.json | 8 +- .../tags/items/slabs/gneiss/brick.json | 8 +- .../tags/items/slabs/gneiss/smooth.json | 8 +- .../tags/items/slabs/gneiss/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/granite.json | 10 +- .../tags/items/slabs/granite/brick.json | 8 +- .../tags/items/slabs/granite/smooth.json | 10 +- .../items/slabs/granite/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/hornfels.json | 8 +- .../tags/items/slabs/hornfels/brick.json | 8 +- .../tags/items/slabs/hornfels/smooth.json | 8 +- .../items/slabs/hornfels/smooth_brick.json | 8 +- .../tags/items/slabs/limestone.json | 8 +- .../tags/items/slabs/limestone/brick.json | 8 +- .../tags/items/slabs/limestone/smooth.json | 8 +- .../items/slabs/limestone/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/marble.json | 8 +- .../tags/items/slabs/marble/brick.json | 8 +- .../tags/items/slabs/marble/smooth.json | 8 +- .../tags/items/slabs/marble/smooth_brick.json | 8 +- .../tags/items/slabs/novaculite.json | 8 +- .../tags/items/slabs/novaculite/brick.json | 8 +- .../tags/items/slabs/novaculite/smooth.json | 8 +- .../items/slabs/novaculite/smooth_brick.json | 8 +- .../tags/items/slabs/pegmatite.json | 8 +- .../tags/items/slabs/pegmatite/brick.json | 8 +- .../tags/items/slabs/pegmatite/smooth.json | 8 +- .../items/slabs/pegmatite/smooth_brick.json | 8 +- .../tags/items/slabs/peridotite.json | 8 +- .../tags/items/slabs/peridotite/brick.json | 8 +- .../tags/items/slabs/peridotite/smooth.json | 8 +- .../items/slabs/peridotite/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/phyllite.json | 8 +- .../tags/items/slabs/phyllite/brick.json | 8 +- .../tags/items/slabs/phyllite/smooth.json | 8 +- .../items/slabs/phyllite/smooth_brick.json | 8 +- .../tags/items/slabs/quartzite.json | 8 +- .../tags/items/slabs/quartzite/brick.json | 8 +- .../tags/items/slabs/quartzite/smooth.json | 8 +- .../items/slabs/quartzite/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/rhyolite.json | 8 +- .../tags/items/slabs/rhyolite/brick.json | 8 +- .../tags/items/slabs/rhyolite/smooth.json | 8 +- .../items/slabs/rhyolite/smooth_brick.json | 8 +- .../tags/items/slabs/rock_salt.json | 8 +- .../tags/items/slabs/rock_salt/brick.json | 8 +- .../tags/items/slabs/rock_salt/smooth.json | 8 +- .../items/slabs/rock_salt/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/schist.json | 8 +- .../tags/items/slabs/schist/brick.json | 8 +- .../tags/items/slabs/schist/smooth.json | 8 +- .../tags/items/slabs/schist/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/scoria.json | 8 +- .../tags/items/slabs/scoria/brick.json | 8 +- .../tags/items/slabs/scoria/smooth.json | 8 +- .../tags/items/slabs/scoria/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/shale.json | 8 +- .../tags/items/slabs/shale/brick.json | 8 +- .../tags/items/slabs/shale/smooth.json | 8 +- .../tags/items/slabs/shale/smooth_brick.json | 8 +- .../tags/items/slabs/siltstone.json | 8 +- .../tags/items/slabs/siltstone/brick.json | 8 +- .../tags/items/slabs/siltstone/smooth.json | 8 +- .../items/slabs/siltstone/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/slate.json | 8 +- .../tags/items/slabs/slate/brick.json | 8 +- .../tags/items/slabs/slate/smooth.json | 8 +- .../tags/items/slabs/slate/smooth_brick.json | 8 +- .../mineralogy/tags/items/slabs/tuff.json | 8 +- .../tags/items/slabs/tuff/brick.json | 8 +- .../tags/items/slabs/tuff/smooth.json | 8 +- .../tags/items/slabs/tuff/smooth_brick.json | 8 +- .../tags/items/stone_crafting_materials.json | 62 ++--- .../tags/items/stone_tool_materials.json | 62 ++--- .../tags/items/stones/amphibolite.json | 8 +- .../tags/items/stones/amphibolite/brick.json | 8 +- .../tags/items/stones/amphibolite/smooth.json | 8 +- .../stones/amphibolite/smooth_brick.json | 8 +- .../tags/items/stones/andesite.json | 10 +- .../tags/items/stones/andesite/brick.json | 8 +- .../tags/items/stones/andesite/smooth.json | 10 +- .../items/stones/andesite/smooth_brick.json | 8 +- .../mineralogy/tags/items/stones/basalt.json | 10 +- .../tags/items/stones/basalt/brick.json | 8 +- .../tags/items/stones/basalt/smooth.json | 11 +- .../items/stones/basalt/smooth_brick.json | 8 +- .../tags/items/stones/basaltic_glass.json | 8 +- .../items/stones/basaltic_glass/brick.json | 8 +- .../items/stones/basaltic_glass/smooth.json | 8 +- .../stones/basaltic_glass/smooth_brick.json | 8 +- .../tags/items/stones/conglomerate.json | 8 +- .../tags/items/stones/conglomerate/brick.json | 8 +- .../items/stones/conglomerate/smooth.json | 8 +- .../stones/conglomerate/smooth_brick.json | 8 +- .../mineralogy/tags/items/stones/diabase.json | 8 +- .../tags/items/stones/diabase/brick.json | 8 +- .../tags/items/stones/diabase/smooth.json | 8 +- .../items/stones/diabase/smooth_brick.json | 8 +- .../mineralogy/tags/items/stones/diorite.json | 10 +- .../tags/items/stones/diorite/brick.json | 8 +- .../tags/items/stones/diorite/smooth.json | 10 +- .../items/stones/diorite/smooth_brick.json | 8 +- .../tags/items/stones/dolomite.json | 8 +- .../tags/items/stones/dolomite/brick.json | 8 +- .../tags/items/stones/dolomite/smooth.json | 8 +- .../items/stones/dolomite/smooth_brick.json | 8 +- .../mineralogy/tags/items/stones/gabbro.json | 8 +- .../tags/items/stones/gabbro/brick.json | 8 +- .../tags/items/stones/gabbro/smooth.json | 8 +- .../items/stones/gabbro/smooth_brick.json | 8 +- .../mineralogy/tags/items/stones/gneiss.json | 8 +- .../tags/items/stones/gneiss/brick.json | 8 +- .../tags/items/stones/gneiss/smooth.json | 8 +- .../items/stones/gneiss/smooth_brick.json | 8 +- .../mineralogy/tags/items/stones/granite.json | 10 +- .../tags/items/stones/granite/brick.json | 8 +- .../tags/items/stones/granite/smooth.json | 10 +- .../items/stones/granite/smooth_brick.json | 8 +- .../tags/items/stones/hornfels.json | 8 +- .../tags/items/stones/hornfels/brick.json | 8 +- .../tags/items/stones/hornfels/smooth.json | 8 +- .../items/stones/hornfels/smooth_brick.json | 8 +- .../tags/items/stones/limestone.json | 8 +- .../tags/items/stones/limestone/brick.json | 8 +- .../tags/items/stones/limestone/smooth.json | 8 +- .../items/stones/limestone/smooth_brick.json | 8 +- .../mineralogy/tags/items/stones/marble.json | 8 +- .../tags/items/stones/marble/brick.json | 8 +- .../tags/items/stones/marble/smooth.json | 8 +- .../items/stones/marble/smooth_brick.json | 8 +- .../tags/items/stones/novaculite.json | 8 +- .../tags/items/stones/novaculite/brick.json | 8 +- .../tags/items/stones/novaculite/smooth.json | 8 +- .../items/stones/novaculite/smooth_brick.json | 8 +- .../tags/items/stones/pegmatite.json | 8 +- .../tags/items/stones/pegmatite/brick.json | 8 +- .../tags/items/stones/pegmatite/smooth.json | 8 +- .../items/stones/pegmatite/smooth_brick.json | 8 +- .../tags/items/stones/peridotite.json | 8 +- .../tags/items/stones/peridotite/brick.json | 8 +- .../tags/items/stones/peridotite/smooth.json | 8 +- .../items/stones/peridotite/smooth_brick.json | 8 +- .../tags/items/stones/phyllite.json | 8 +- .../tags/items/stones/phyllite/brick.json | 8 +- .../tags/items/stones/phyllite/smooth.json | 8 +- .../items/stones/phyllite/smooth_brick.json | 8 +- .../tags/items/stones/quartzite.json | 8 +- .../tags/items/stones/quartzite/brick.json | 8 +- .../tags/items/stones/quartzite/smooth.json | 8 +- .../items/stones/quartzite/smooth_brick.json | 8 +- .../tags/items/stones/rhyolite.json | 8 +- .../tags/items/stones/rhyolite/brick.json | 8 +- .../tags/items/stones/rhyolite/smooth.json | 8 +- .../items/stones/rhyolite/smooth_brick.json | 8 +- .../tags/items/stones/rock_salt.json | 8 +- .../tags/items/stones/rock_salt/brick.json | 8 +- .../tags/items/stones/rock_salt/smooth.json | 8 +- .../items/stones/rock_salt/smooth_brick.json | 8 +- .../mineralogy/tags/items/stones/schist.json | 8 +- .../tags/items/stones/schist/brick.json | 8 +- .../tags/items/stones/schist/smooth.json | 8 +- .../items/stones/schist/smooth_brick.json | 8 +- .../mineralogy/tags/items/stones/scoria.json | 8 +- .../tags/items/stones/scoria/brick.json | 8 +- .../tags/items/stones/scoria/smooth.json | 8 +- .../items/stones/scoria/smooth_brick.json | 8 +- .../mineralogy/tags/items/stones/shale.json | 8 +- .../tags/items/stones/shale/brick.json | 8 +- .../tags/items/stones/shale/smooth.json | 8 +- .../tags/items/stones/shale/smooth_brick.json | 8 +- .../tags/items/stones/siltstone.json | 8 +- .../tags/items/stones/siltstone/brick.json | 8 +- .../tags/items/stones/siltstone/smooth.json | 8 +- .../items/stones/siltstone/smooth_brick.json | 8 +- .../mineralogy/tags/items/stones/slate.json | 8 +- .../tags/items/stones/slate/brick.json | 8 +- .../tags/items/stones/slate/smooth.json | 8 +- .../tags/items/stones/slate/smooth_brick.json | 8 +- .../mineralogy/tags/items/stones/tuff.json | 9 +- .../tags/items/stones/tuff/brick.json | 8 +- .../tags/items/stones/tuff/smooth.json | 8 +- .../tags/items/stones/tuff/smooth_brick.json | 8 +- src/main/resources/pack.mcmeta | 2 +- .../mc/mineralogy/GameplayContractTest.java | 46 ++-- .../mineralogy/LocalizationQualityTest.java | 2 +- .../mineralogy/NativeRecipeManagerTest.java | 227 +++++++++++------- .../mc/mineralogy/ResourceContractTest.java | 123 ++++++++-- .../mc/mineralogy/WorkflowContractTest.java | 18 +- .../compat/CobblestoneTagPolicyTest.java | 9 +- 3174 files changed, 97513 insertions(+), 94235 deletions(-) delete mode 100644 src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_moss_block.json create mode 100644 src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_vine.json delete mode 100644 src/main/resources/data/minecraft/recipes/mossy_cobblestone.json create mode 100644 src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b205efdd6..a8440613a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,19 +1,19 @@ -name: Mineralogy 1.16.5 CI +name: Mineralogy 1.17.1 CI on: push: branches: - - master-1.16.5 + - master-1.17.1 - 'feature/**' pull_request: branches: - - master-1.16.5 + - master-1.17.1 permissions: contents: read concurrency: - group: mineralogy-1.16-${{ github.workflow }}-${{ github.ref }} + group: mineralogy-1.17-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: @@ -26,11 +26,11 @@ jobs: - name: Check out source uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - - name: Install Java 8 toolchain + - name: Install Java 16 toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin - java-version: '8.0.502+7' + java-version: '16.0.2+7' - name: Install Java 17 for Gradle uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 @@ -64,13 +64,13 @@ jobs: - name: Upload audited release candidate uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: Mineralogy-1.16.5-${{ github.sha }} + name: Mineralogy-1.17.1-${{ github.sha }} if-no-files-found: error retention-days: 30 path: | - build/libs/Mineralogy-6.1.0.116051.jar - build/libs/Mineralogy-6.1.0.116051-sources.jar - build/libs/Mineralogy-6.1.0.116051-javadoc.jar + build/libs/Mineralogy-6.1.0.117011.jar + build/libs/Mineralogy-6.1.0.117011-sources.jar + build/libs/Mineralogy-6.1.0.117011-javadoc.jar build/release/SHA256SUMS CHANGELOG.txt @@ -78,7 +78,7 @@ jobs: if: failure() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: Mineralogy-1.16.5-diagnostics-${{ github.sha }} + name: Mineralogy-1.17.1-diagnostics-${{ github.sha }} if-no-files-found: ignore retention-days: 14 path: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index bf5ea7c28..acceaed2d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -3,11 +3,11 @@ name: CodeQL on: push: branches: - - master-1.16.5 + - master-1.17.1 - 'feature/**' pull_request: branches: - - master-1.16.5 + - master-1.17.1 permissions: actions: read @@ -24,11 +24,11 @@ jobs: - name: Check out source uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - - name: Install Java 8 toolchain + - name: Install Java 16 toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: distribution: temurin - java-version: '8.0.502+7' + java-version: '16.0.2+7' - name: Install Java 17 for Gradle uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 diff --git a/.github/workflows/validate-gradle-build.yml b/.github/workflows/validate-gradle-build.yml index fc66575a5..0bf04b841 100644 --- a/.github/workflows/validate-gradle-build.yml +++ b/.github/workflows/validate-gradle-build.yml @@ -3,11 +3,11 @@ name: Validate Gradle Wrapper on: push: branches: - - master-1.16.5 + - master-1.17.1 - 'feature/**' pull_request: branches: - - master-1.16.5 + - master-1.17.1 permissions: contents: read diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b16db7481..2568cde18 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,13 +1,13 @@ -Mineralogy 6.1.0.116051 for Minecraft 1.16.5 +Mineralogy 6.1.0.117011 for Minecraft 1.17.1 - Delegated terrain, strata, ore, and covered fluid-deposit generation to the - released OreSpawn 4.0.9.116051 provider engine, retaining the supported + released OreSpawn 4.0.9.117011 provider engine, retaining the supported `[4.0.6,5.0.0)` range; removed Mineralogy's parallel geology, geome, ore, noise, and stone-replacement generators. - Preserved all world-facing registry, tile, NBT, recipe, asset, patch, and pre-flattening conversion identities while moving production packages to zone.moddev.mc.mineralogy. Existing 1.10/1.12 chunks are protected during - 1.16.5's flattening conversion. Legacy rock-furnace IDs are established + 1.17.1's flattening conversion. Legacy rock-furnace IDs are established before Mojang data fixing, then all pre-namespaced tile IDs are made safe before Forge constructs tile entities, so inventories and progress survive and an uppercase vanilla ID cannot abort the complete chunk load. @@ -22,13 +22,15 @@ Mineralogy 6.1.0.116051 for Minecraft 1.16.5 - Made the historical `COBBLESTONE_EQUIVILENT` option functional through target-native per-family block and item tags, including vanilla aliases, reapplied after data reloads by updating the exact immutable tag objects - retained by already-parsed Forge 36 recipe ingredients. Chert and pumice + retained by already-parsed Forge 37 recipe ingredients. Chert and pumice remain unconditional cobblestone equivalents. - Added isolated Mineralogy crude-oil source and flowing fluids, block, bucket, rendering resources, and the covered Ocean deposit declaration. -- Uses Minecraft 1.16's native basalt for new OreSpawn terrain while retaining - Mineralogy's historical basalt registrations and conversion aliases; tuff - remains Mineralogy content because vanilla tuff is not present in 1.16.5. +- Uses Minecraft 1.17's native granite, diorite, andesite, basalt, and tuff for + new OreSpawn terrain while retaining Mineralogy's historical registrations + and conversion aliases. Native smooth basalt joins Mineralogy's smooth-basalt + family without replacing Minecraft's basalt-smelting route. Deepslate remains + a terrain and ore host rather than becoming a construction family. - Preserved rock-furnace save recovery and novaculite's 3/15/1 properties; corrected replacement drop semantics and exact full-block Silk Touch results for double slabs. @@ -50,16 +52,16 @@ Mineralogy 6.1.0.116051 for Minecraft 1.16.5 slab and back at a lossless 1:1 ratio for modpacks that require an exact vanilla item. Recipe advancements use the same exact item or family tag as the recipe they reveal. -- Extended Minecraft 1.16's native stone crafting and tool-material tags so +- Extended Minecraft 1.17's native stone crafting and tool-material tags so every enabled cobblestone equivalent, including all 27 legacy rock families - and target-native aliases, works in the complete vanilla contract. Fifteen + and target-native aliases, works in the complete vanilla contract. Sixteen conditional JSON overrides cover furnaces, brewing stands, redstone and conversion recipes, and all stone tools without changing their IDs, patterns, outputs or other ingredients. Disabled mode restores the native ingredients and keeps blackstone, chert and pumice valid. Matching-slab rock-furnace upgrades and vanilla cobblestone construction recipes remain distinct. -- Prevented Forge 36 from silently reducing optional carbon- or coal-dust +- Prevented Forge 37 from silently reducing optional carbon- or coal-dust gunpowder recipes to nitrate plus sulfur when their compatibility tag is empty; every loaded gunpowder recipe now requires all three components. - Added 17 reviewed UTF-8 JSON locales with the same 938 ordered keys, including @@ -67,18 +69,18 @@ Mineralogy 6.1.0.116051 for Minecraft 1.16.5 Russian. - Added first-start player, developer, content, provider, and version guides, plus an exact provider example. Existing exported guides are never - overwritten. Forge 36 Eclipse launches keep their required merged + overwritten. Forge 37 Eclipse launches keep their required merged `bin/main` mod output; if Eclipse removes Gradle's staged guide copies, the exporter reads the authoritative source-checkout guides without weakening packaged-jar validation. - Added independent, atomic migration of valid non-default legacy ore settings into a Mineralogy OreSpawn provider override, including deterministic reports and exclusive-to-inclusive maximum-height conversion. -- Preserved 1.16-native wall tall-side blockstates and models, wall/item tags, - loot tables, fluid APIs, rendering setup, and pack format 6 resources. -- Added reproducible Java 8 main, sources, and Javadoc artifacts, exact released - OreSpawn dependency verification, guarded 1.16.5 CI, and the four-component - release tag `6.1.0.116051`. +- Preserved 1.17-native wall tall-side blockstates and models, wall/item tags, + loot tables, fluid APIs, rendering setup, and pack format 7 resources. +- Added reproducible Java 16 main, sources, and Javadoc artifacts, exact released + OreSpawn dependency verification, guarded 1.17.1 CI, and the four-component + release tag `6.1.0.117011`. - Isolated CI's verified OreSpawn artifact in an exclusive Gradle repository so dependency resolution cannot fall through to an unverified public copy. Release verification also enforces Maven coordinate diff --git a/README.md b/README.md index 0ed0b394a..c3be7a183 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ [![Discord](https://img.shields.io/badge/Discord-MMD-green.svg?style=flat&logo=Discord)](https://discord.moddev.zone) [![CurseForge downloads](https://cf.way2muchnoise.eu/full_minecraft-mineralogy_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy) [![Supported Minecraft versions](https://cf.way2muchnoise.eu/versions/Minecraft_minecraft-mineralogy_all.svg)](https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy) -[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml/badge.svg?branch=master-1.16.5)](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml?query=branch%3Amaster-1.16.5) +[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml/badge.svg?branch=master-1.17.1)](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml?query=branch%3Amaster-1.17.1) -# Mineralogy 6 for Minecraft 1.16.5 +# Mineralogy 6 for Minecraft 1.17.1 Mineralogy adds real-world rock families, matching construction blocks, mineral ores and dusts, rock furnaces, drywall, rock-salt lighting, fertilizer, and crude oil. OreSpawn 4 is the sole terrain, strata, ore, and deposit engine; Mineralogy no longer installs a parallel world generator. -This branch builds Mineralogy `6.1.0.116051` for Forge `36.2.34` and is built -and tested against OreSpawn `4.0.9.116051`. Its declared compatibility range is +This branch builds Mineralogy `6.1.0.117011` for Forge `37.1.1` and is built +and tested against OreSpawn `4.0.9.117011`. Its declared compatibility range is OreSpawn `[4.0.6,5.0.0)`. Install both mods on clients and servers. ## Configuration and help diff --git a/build.gradle b/build.gradle index 344aefb85..4a38b2ba3 100644 --- a/build.gradle +++ b/build.gradle @@ -31,13 +31,13 @@ def versionParts = project.mod_version.toString().tokenize('.') if (versionParts.size() != 4 || !versionParts.every { it ==~ /\d+/ }) { throw new GradleException("mod_version must use Major.Minor.Bug.Target numeric form: ${project.mod_version}") } -if (versionParts[3] != '116051') { - throw new GradleException("Mineralogy 1.16.5 Forge releases must use target 116051: ${project.mod_version}") +if (versionParts[3] != '117011') { + throw new GradleException("Mineralogy 1.17.1 Forge releases must use target 117011: ${project.mod_version}") } java { toolchain { - languageVersion = JavaLanguageVersion.of(8) + languageVersion = JavaLanguageVersion.of(16) vendor = JvmVendorSpec.ADOPTIUM } withSourcesJar() @@ -51,11 +51,11 @@ tasks.named('sourcesJar', Jar) { tasks.withType(JavaCompile).configureEach { javaCompiler = javaToolchains.compilerFor { - languageVersion = JavaLanguageVersion.of(8) + languageVersion = JavaLanguageVersion.of(16) vendor = JvmVendorSpec.ADOPTIUM } - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_16 + targetCompatibility = JavaVersion.VERSION_16 options.encoding = 'UTF-8' options.compilerArgs.addAll(['-Xlint:deprecation', '-Xmaxerrs', '1000']) } @@ -71,6 +71,7 @@ minecraft { configureEach { workingDir.convention layout.projectDirectory.dir( providers.gradleProperty('runDirectory').getOrElse('run')) + jvmArgs '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED' systemProperty 'forge.logging.markers', 'REGISTRIES' systemProperty 'forge.logging.console.level', 'debug' mods { @@ -87,14 +88,14 @@ minecraft { def developmentModOutput = layout.buildDirectory.dir('forge-run-mod-classes/main') def prepareDevelopmentMod = tasks.register('prepareDevelopmentMod', Sync) { group = 'ide' - description = 'Merges production classes and resources for Forge 36 development discovery.' + description = 'Merges production classes and resources for Forge 37 development discovery.' dependsOn tasks.named('classes') from sourceSets.main.output.classesDirs from sourceSets.main.output.resourcesDir into developmentModOutput } -def configureForge36Run = { JavaExec runTask, String launchTarget -> +def configureForge37Run = { JavaExec runTask, String launchTarget -> runTask.dependsOn prepareDevelopmentMod runTask.environment 'target', launchTarget runTask.environment 'MCP_MAPPINGS', "${mcp_mappings_channel}_${mcp_mappings_version}" @@ -102,10 +103,9 @@ def configureForge36Run = { JavaExec runTask, String launchTarget -> runTask.environment 'FORGE_VERSION', forge_version runTask.environment 'FORGE_GROUP', 'net.minecraftforge' runTask.environment 'MC_VERSION', mc_version - runTask.environment 'MOD_CLASSES', "mineralogy%%${developmentModOutput.get().asFile}${File.pathSeparator}" + - "mineralogy%%${developmentModOutput.get().asFile}" + runTask.environment 'MOD_CLASSES', "mineralogy%%${developmentModOutput.get().asFile}" runTask.doFirst { - // Forge 36 scans the mods directory before FML creates it and logs an + // Forge scans the mods directory before FML creates it and logs an // otherwise harmless ERROR on a completely fresh run directory. File modsDirectory = new File(runTask.workingDir, 'mods') if (!modsDirectory.isDirectory() && !modsDirectory.mkdirs()) { @@ -116,7 +116,7 @@ def configureForge36Run = { JavaExec runTask, String launchTarget -> tasks.withType(JavaExec).configureEach { JavaExec runTask -> String launchTarget = [runClient: 'fmluserdevclient', runServer: 'fmluserdevserver'][runTask.name] - if (launchTarget != null) configureForge36Run(runTask, launchTarget) + if (launchTarget != null) configureForge37Run(runTask, launchTarget) } def orespawnModule = "mmd-orespawn-${project.orespawn_curse_project_id}" @@ -220,7 +220,7 @@ tasks.named('jar', Jar) { 'Implementation-Title' : 'Mineralogy', 'Implementation-Version': project.version, 'Implementation-Vendor' : 'SkyBlade1978', - 'Built-On-Java' : '8', + 'Built-On-Java' : '16', 'Built-On' : "${project.mc_version}-${project.forge_version}" ]) } @@ -334,15 +334,15 @@ tasks.register('verifyMavenCoordinates') { tasks.register('verifyReleaseConfiguration') { group = 'verification' - description = 'Verifies the exact Mineralogy 1.16 release identity.' + description = 'Verifies the exact Mineralogy 1.17 release identity.' doLast { - if (project.mod_version != '6.1.0.116051' + if (project.mod_version != '6.1.0.117011' || project.mod_group != expectedMavenGroup - || project.minecraft_version != '1.16.5' - || project.forge_version != '36.2.34' - || project.mcp_mappings_channel != 'snapshot' - || project.mcp_mappings_version != '20210309-1.16.5') { - throw new GradleException('Unexpected Mineralogy 1.16.5 release identity') + || project.minecraft_version != '1.17.1' + || project.forge_version != '37.1.1' + || project.mcp_mappings_channel != 'official' + || project.mcp_mappings_version != '1.17.1') { + throw new GradleException('Unexpected Mineralogy 1.17.1 release identity') } } } @@ -351,20 +351,20 @@ tasks.register('verifyReleaseDependencies') { group = 'verification' description = 'Resolves and verifies the exact released OreSpawn dependency.' doLast { - if (project.mod_version != '6.1.0.116051' + if (project.mod_version != '6.1.0.117011' || project.minecraft_version != project.mc_version - || project.mc_version != '1.16.5' + || project.mc_version != '1.17.1' || project.loader_name != 'forge' || project.loader_code != '1' - || project.java_version != '8' - || project.java_toolchain_version != '8.0.502+7' + || project.java_version != '16' + || project.java_toolchain_version != '16.0.2+7' || project.gradle_java_version != '17' || project.curseforge_project_id != '240974') { throw new GradleException('Unexpected generic release dispatcher metadata') } - if (project.orespawn_version != '4.0.9.116051' || + if (project.orespawn_version != '4.0.9.117011' || project.orespawn_curse_project_id != '245586' || - project.orespawn_curse_file_id != '8742102') { + project.orespawn_curse_file_id != '8748648') { throw new GradleException('Unexpected OreSpawn release coordinates') } File artifact = configurations.orespawnRelease.resolvedConfiguration.resolvedArtifacts @@ -453,7 +453,7 @@ tasks.register('verifyReleaseArtifacts') { throw new GradleException("Invalid class header in ${entry.name}") } int major = ((header[6] & 0xff) << 8) | (header[7] & 0xff) - if (major != 52) throw new GradleException("${entry.name} is class version ${major}, expected Java 8 (52)") + if (major != 60) throw new GradleException("${entry.name} is class version ${major}, expected Java 16 (60)") } finally { stream.close() @@ -465,14 +465,20 @@ tasks.register('verifyReleaseArtifacts') { throw new GradleException('Packaged provider contract is invalid') } if (provider.rocks['mineralogy:rock/minecraft/basalt']?.block != 'minecraft:basalt' || - provider.rocks['mineralogy:rock/minecraft/tuff']?.block != 'mineralogy:tuff' || + provider.rocks['mineralogy:rock/minecraft/tuff']?.block != 'minecraft:tuff' || provider.profile_defaults?.worldgen_aliases != [ 'mineralogy:andesite': 'minecraft:andesite', 'mineralogy:basalt': 'minecraft:basalt', 'mineralogy:diorite': 'minecraft:diorite', - 'mineralogy:granite': 'minecraft:granite' - ]) { - throw new GradleException('Packaged provider does not use the Minecraft 1.16 native basalt contract') + 'mineralogy:granite': 'minecraft:granite', + 'mineralogy:tuff': 'minecraft:tuff' + ] || provider.profile_defaults?.terrain_dimensions?.get('minecraft:overworld')?.host_blocks != + ['minecraft:stone', 'minecraft:deepslate'] || + !provider.ores.values().every { ore -> + ore.dimensions?.get('minecraft:overworld')?.host_tags == + ['minecraft:stone_ore_replaceables', 'minecraft:deepslate_ore_replaceables'] + }) { + throw new GradleException('Packaged provider does not use the Minecraft 1.17 native-rock and deepslate contract') } String recipePrefix = 'data/mineralogy/recipes/' String advancementPrefix = 'data/mineralogy/advancements/recipes/' @@ -483,6 +489,26 @@ tasks.register('verifyReleaseArtifacts') { if (recipes.size() != 1427 || advancements.size() != 1427) { throw new GradleException("Release jar must contain 1427 recipes and advancements, found ${recipes.size()} and ${advancements.size()}") } + def verifyAdvancementPredicates = { advancement, String source -> + advancement.criteria?.each { criterionName, criterion -> + if (criterion.trigger == 'minecraft:inventory_changed') { + def predicates = criterion.conditions?.items + if (!(predicates instanceof Collection) || predicates.any { predicate -> + predicate.item != null || (predicate.tag == null && + (!(predicate.items instanceof Collection) || predicate.items.isEmpty())) + }) { + throw new GradleException("Invalid Minecraft 1.17 item predicate in ${source}: ${criterionName}") + } + } + } + } + names.findAll { + it.startsWith('data/mineralogy/advancements/') && it.endsWith('.json') && + !it.endsWith('/_factories.json') + }.each { entryName -> + def advancement = new JsonSlurper().parse(zip.getInputStream(zip.getEntry(entryName))) + if (advancement.criteria != null) verifyAdvancementPredicates(advancement, entryName) + } def slabBridges = ['andesite', 'diorite', 'granite'].collectMany { family -> [ [name: "${family}_slab_to_vanilla", source: "mineralogy:${family}_slab", result: "minecraft:${family}_slab"], @@ -500,15 +526,15 @@ tasks.register('verifyReleaseArtifacts') { recipe.ingredients[0].item != bridge.source || recipe.result?.item != bridge.result || recipe.result?.count != 1 || recipe.conditions?.size() != 2 || advancement.conditions != recipe.conditions || - advancement.criteria?.has_rock?.conditions?.items?.getAt(0)?.item != bridge.source) { + advancement.criteria?.has_rock?.conditions?.items?.getAt(0)?.items?.getAt(0) != bridge.source) { throw new GradleException("Invalid native/Mineralogy slab conversion: ${bridge.name}") } } def minecraftRecipes = names.findAll { it.startsWith('data/minecraft/recipes/') && it.endsWith('.json') } def cobblestoneOverrides = ['furnace', 'brewing_stand', 'lever', 'piston', - 'dispenser', 'dropper', 'observer', 'mossy_cobblestone', 'andesite', - 'diorite', 'stone_axe', 'stone_hoe', 'stone_pickaxe', 'stone_shovel', - 'stone_sword'] + 'dispenser', 'dropper', 'observer', 'mossy_cobblestone_from_vine', + 'mossy_cobblestone_from_moss_block', 'andesite', 'diorite', 'stone_axe', + 'stone_hoe', 'stone_pickaxe', 'stone_shovel', 'stone_sword'] def slabOverrides = ['andesite', 'diorite', 'granite'].collectMany { family -> ["${family}_slab", "polished_${family}_slab", "${family}_slab_from_${family}_stonecutting", @@ -521,8 +547,8 @@ tasks.register('verifyReleaseArtifacts') { def expectedMinecraftRecipes = (cobblestoneOverrides + slabOverrides + polishedOverrides).collect { "data/minecraft/recipes/${it}.json" } as Set - if ((minecraftRecipes as Set) != expectedMinecraftRecipes || minecraftRecipes.size() != 34) { - throw new GradleException('Release jar must contain exactly 15 cobblestone, 15 slab, and four polished-block recipe overrides') + if ((minecraftRecipes as Set) != expectedMinecraftRecipes || minecraftRecipes.size() != 35) { + throw new GradleException('Release jar must contain exactly 16 cobblestone, 15 slab, and four polished-block recipe overrides') } cobblestoneOverrides.each { recipe -> def data = new JsonSlurper().parse(zip.getInputStream(zip.getEntry("data/minecraft/recipes/${recipe}.json"))) @@ -532,6 +558,10 @@ tasks.register('verifyReleaseArtifacts') { data.recipes[1].conditions?.getAt(0)?.type != 'forge:not') { throw new GradleException("Invalid conditional cobblestone override: ${recipe}") } + if (recipe.startsWith('mossy_cobblestone_from_') && + !data.recipes.every { it.recipe?.group == 'mossy_cobblestone' }) { + throw new GradleException("Mossy cobblestone override lost its vanilla recipe group: ${recipe}") + } } slabOverrides.each { recipe -> def data = new JsonSlurper().parse(zip.getInputStream(zip.getEntry("data/minecraft/recipes/${recipe}.json"))) @@ -563,7 +593,8 @@ tasks.register('verifyReleaseArtifacts') { def advancementCategories = [ furnace: 'decorations', brewing_stand: 'brewing', lever: 'redstone', piston: 'redstone', dispenser: 'redstone', dropper: 'redstone', - observer: 'redstone', mossy_cobblestone: 'building_blocks', + observer: 'redstone', mossy_cobblestone_from_vine: 'building_blocks', + mossy_cobblestone_from_moss_block: 'building_blocks', andesite: 'building_blocks', diorite: 'building_blocks', stone_axe: 'tools', stone_hoe: 'tools', stone_pickaxe: 'tools', stone_shovel: 'tools', stone_sword: 'combat' @@ -578,7 +609,7 @@ tasks.register('verifyReleaseArtifacts') { it.startsWith('data/minecraft/advancements/recipes/') && it.endsWith('.json') } as Set if (minecraftAdvancements != expectedMinecraftAdvancements) { - throw new GradleException('Release jar must contain exactly 15 cobblestone and four polished-block advancement overrides') + throw new GradleException('Release jar must contain exactly 16 cobblestone and four polished-block advancement overrides') } advancementCategories.each { recipe, category -> def data = new JsonSlurper().parse(zip.getInputStream(zip.getEntry( @@ -588,11 +619,20 @@ tasks.register('verifyReleaseArtifacts') { data.advancements[1].conditions?.getAt(0)?.type != 'forge:not') { throw new GradleException("Invalid conditional advancement override: ${recipe}") } + data.advancements.eachWithIndex { branch, index -> + verifyAdvancementPredicates(branch.advancement, + "minecraft:${category}/${recipe} branch ${index}") + } + } + ['andesite', 'basalt', 'diorite', 'granite'].each { family -> + String entryName = "data/minecraft/advancements/recipes/building_blocks/polished_${family}.json" + def advancement = new JsonSlurper().parse(zip.getInputStream(zip.getEntry(entryName))) + verifyAdvancementPredicates(advancement, entryName) } def wallBlockstates = names.findAll { it ==~ /assets\/mineralogy\/blockstates\/.+_wall\.json/ } def tallWallModels = names.findAll { it ==~ /assets\/mineralogy\/models\/block\/.+_wall_side_tall\.json/ } if (wallBlockstates.size() != 108 || tallWallModels.size() != 108) { - throw new GradleException("Release jar must contain all 108 Forge 36 wall blockstates and tall-side models") + throw new GradleException("Release jar must contain all 108 Forge 37 wall blockstates and tall-side models") } } finally { @@ -685,14 +725,13 @@ tasks.withType(PublishToMavenRepository).configureEach { : tasks.named('verifyPreparedReleaseArtifacts')) } -tasks.register('syncForge36EclipseLaunches') { +tasks.register('syncForge37EclipseLaunches') { group = 'ide' dependsOn tasks.named('processResources') doLast { String mainClass = 'net.minecraftforge.userdev.LaunchTesting' String mainOutput = new File(projectDir, 'bin/main').absolutePath - String modClasses = "mineralogy%%${mainOutput}${File.pathSeparator}" + - "mineralogy%%${mainOutput}" + String modClasses = "mineralogy%%${mainOutput}" String eclipseGradleJavaHome = System.getenv('JAVA_HOME') ?: System.getProperty('java.home') def escapePreference = { String value -> value.replace('\\', '\\\\').replace(':', '\\:') @@ -719,7 +758,7 @@ tasks.register('syncForge36EclipseLaunches') { 'show.executions.view=false', '' ].join('\r\n'), 'UTF-8') - // Forge 36 loads the mod solely from Eclipse's merged bin/main output. + // Forge 37 loads the mod solely from Eclipse's merged bin/main output. // Copy the processed production resources as a normal doLast action so // token-expanded metadata and externally edited JSON cannot lag behind // the source tree without making bin/main a Gradle-owned task output. @@ -805,7 +844,7 @@ tasks.register('syncForge36EclipseLaunches') { tasks.register('verifyEclipseProductionClasspath') { group = 'verification' - dependsOn tasks.named('syncForge36EclipseLaunches') + dependsOn tasks.named('syncForge37EclipseLaunches') doLast { File classpath = file('.classpath') if (!classpath.isFile()) throw new GradleException('Eclipse .classpath was not generated') @@ -850,10 +889,9 @@ tasks.register('verifyEclipseProductionClasspath') { throw new GradleException("Eclipse launch targets the wrong workspace project: ${name}") } String mainOutput = new File(projectDir, 'bin/main').absolutePath - String expectedModClasses = "mineralogy%%${mainOutput}${File.pathSeparator}" + - "mineralogy%%${mainOutput}" + String expectedModClasses = "mineralogy%%${mainOutput}" if (!launch.contains(expectedModClasses)) { - throw new GradleException("Eclipse launch is not using Forge 36's merged production output: ${name}") + throw new GradleException("Eclipse launch is not using Forge 37's merged production output: ${name}") } ['cache', 'metadata', 'to-srg', 'to-obf'].each { flag -> if (!launch.contains("--${flag} "")) { @@ -880,17 +918,17 @@ tasks.register('verifyEclipseProductionClasspath') { } tasks.matching { it.name == 'genEclipseRuns' }.configureEach { - finalizedBy tasks.named('syncForge36EclipseLaunches') + finalizedBy tasks.named('syncForge37EclipseLaunches') } tasks.register('isolateEclipseProductionRuns') { group = 'ide' dependsOn tasks.named('genEclipseRuns') - dependsOn tasks.named('syncForge36EclipseLaunches') + dependsOn tasks.named('syncForge37EclipseLaunches') } tasks.matching { it.name == 'eclipse' }.configureEach { - finalizedBy tasks.named('syncForge36EclipseLaunches') + finalizedBy tasks.named('syncForge37EclipseLaunches') } tasks.named('check') { diff --git a/docs/CONTENT_CONFIG.md b/docs/CONTENT_CONFIG.md index 6490be204..cbcf005eb 100644 --- a/docs/CONTENT_CONFIG.md +++ b/docs/CONTENT_CONFIG.md @@ -67,7 +67,7 @@ GROUP_TABS_BY_TYPE = true With `COBBLESTONE_EQUIVILENT=true`, all 27 raw Mineralogy rock families, including rock salt, participate in Forge `cobblestone` tag recipes such as levers, pistons, dispensers, droppers, and brewing stands. Setting it to -`false` removes ordinary rocks from the fifteen covered cobblestone, stone-tool, +`false` removes ordinary rocks from the sixteen covered cobblestone, stone-tool, and stone-crafting recipes while restoring their target-native ingredients. Rocks remain `stone`, retain their material-specific tags, and use exact Mineralogy slab, stair, and wall recipes. Chert and pumice remain historical diff --git a/docs/DEVELOPER_GUIDE.md b/docs/DEVELOPER_GUIDE.md index 5b4b172d6..ba1df0fdf 100644 --- a/docs/DEVELOPER_GUIDE.md +++ b/docs/DEVELOPER_GUIDE.md @@ -38,38 +38,46 @@ families additionally use `cobblestone`; chert and pumice always retain that identity. Gypsum, chalk, rock salt, and both rock salt lamps retain their specialty aliases. -Minecraft 1.16's `minecraft:stone_crafting_materials` and +Minecraft 1.17's `minecraft:stone_crafting_materials` and `minecraft:stone_tool_materials` item tags include `#forge:cobblestone`, so -enabled Mineralogy rocks work in native tool recipes. Forge 36 exposes +enabled Mineralogy rocks work in native tool recipes. Forge 37 exposes immutable tag snapshots; Mineralogy rebuilds only the block and item tag membership after initial tag loading and every data reload, preserves other mods' members, updates the exact tag instances retained by parsed recipes, then invalidates recipe ingredient caches. The nested Minecraft crafting and tool tags are updated alongside the direct Forge tag. -Fifteen vanilla recipes and their advancements use conditional JSON overrides +Sixteen vanilla recipes and their advancements use conditional JSON overrides for the complete exact-cobblestone, stone-crafting-material, and stone-tool-material contracts. Enabled branches use stable Mineralogy union -tags; disabled branches restore the target-native ingredients. Forge 36's +tags; disabled branches restore the target-native ingredients. Forge 37's already-resolved nested tags do not observe a replacement tag collection, so Mineralogy also mutates retained tag instances rather than swapping the collection. -Minecraft 1.16 also owns andesite, basalt, diorite, granite, and their polished -full blocks. Mineralogy's family tags include both native and retained legacy -identities. Four `data/minecraft/recipes/polished_*.json` overrides move the -native polished-block route from 2x2 crafting to one exact native block plus -sand. That leaves 2x2 matching raw blocks available for Mineralogy bricks. -The matching vanilla advancements are overridden too, so native polishing is +Minecraft 1.17 also owns andesite, basalt, diorite, granite, tuff, and several +matching finishes. Mineralogy's family tags include both native and retained +legacy identities. Four `data/minecraft/recipes/polished_*.json` overrides move +the native polished-block route from 2x2 crafting to one exact native block plus +sand. That leaves 2x2 matching raw blocks available for Mineralogy bricks. The +matching vanilla advancements are overridden too, so native polishing is revealed only after the player has both the exact native rock and sand. +Native `minecraft:tuff` is the raw tuff-family input; Mineralogy supplies all +of its construction and polished forms. `minecraft:smooth_basalt` joins the +smooth-basalt family and can unlock and craft Mineralogy smooth-basalt forms, +while Minecraft's basalt-to-smooth-basalt smelting recipe remains intact. +Deepslate is deliberately only an OreSpawn terrain and ore host, not a +Mineralogy construction family. + Do not broaden vanilla slab, stair, or wall recipes. Where Minecraft already owns a matching form (raw and polished andesite/diorite/granite slabs and stairs, plus their raw walls), the Mineralogy-output recipe keeps an exact -legacy Mineralogy input. Basalt has no native construction forms in 1.16.5, so -its raw and polished family tags safely feed Mineralogy slabs, stairs, and -walls. Polished andesite/diorite/granite have no native walls, so those three -Mineralogy wall recipes may also accept the matching family tag. +legacy Mineralogy input except for the deliberate slab overrides below. Basalt +and tuff have no native construction forms in 1.17.1, so their safe family tags +feed Mineralogy slabs, stairs, and walls. Polished andesite/diorite/granite have +no native walls, so those three Mineralogy wall recipes may also accept the +matching family tag. The six shared raw/polished slab crafting recipes and nine corresponding stonecutting routes deliberately output Mineralogy's upright-capable slabs. @@ -84,7 +92,7 @@ material and finish so basalt cannot produce a different rock's slab or wall. ## Crafting Data -All Mineralogy recipes are native Minecraft/Forge 1.16.5 JSON under +All Mineralogy recipes are native Minecraft/Forge 1.17.1 JSON under `data/mineralogy/recipes/`. Run `scripts/generate-recipes.ps1` after changing the recipe matrix; it generates the 27 stone families and global recipes, the native slab/stonecutting overrides and compatibility conversions, and the four @@ -94,7 +102,7 @@ advancement with the same Forge conditions and the same exact-item or family-tag material predicate as the recipe. Unlocks use direct inventory ingredients instead of listening to other recipe unlocks, which would recursively reveal an entire construction tree. Polishing uses Minecraft -1.16.5's advancement requirements matrix to require the matching source plus +1.17.1's advancement requirements matrix to require the matching source plus accepted sand; manually crafting a recipe is the target-native fallback for Forge's delayed crafting-output inventory trigger. Rock-furnace advancements use the matching slab-family tag as their sole material criterion. They @@ -119,12 +127,11 @@ The legacy `GENERATE_*` flags can remove registrations on the next start. The new issue-121 switches only change creative visibility and Mineralogy-owned recipes, so existing content remains loadable. -Forge 36 converts pre-flattening chunks lazily. The legacy chunk-loader hook -must establish historical block and rock-furnace identities before Mojang's -data fixer, then normalize old tile-entity IDs after data fixing but before -Forge constructs them. Forge 36 parses a tile ID as a `ResourceLocation` before -registry lookup, so an uppercase legacy vanilla ID such as `Chest` can otherwise -abort the complete chunk future. The hook also preserves already populated +Forge 37 converts pre-flattening chunks lazily. The coremod expands Minecraft's +fixed legacy state tables before conversion, and the selected-world hook +installs the complete saved block mapping before Mojang's data fixer. It +reinstalls that mapping after the client enumerates other old saves, normalizes +legacy rock-furnace tile IDs, retains sidecar recovery, and protects populated chunks from cross-boundary feature writes. Its packaged runtime uses SRG method names, so transformer matching relies on stable owners and descriptors and fails startup if an insertion point cannot be found. Validate both previously @@ -134,7 +141,7 @@ reobfuscated jar; a development launch alone cannot prove this path. ## Building The build uses ForgeGradle 7.0.34 and the Gradle 9.6.1 wrapper on Java 17, -while an exact Java 8 toolchain compiles production and test bytecode: +while an exact Java 16 toolchain compiles production and test bytecode: ```powershell $env:JAVA_HOME='path-to-a-Java-17-jdk' @@ -149,5 +156,5 @@ OreSpawn in a launcher-like Forge installation. The normal jar packages this guide under `META-INF/mineralogy/docs/`. The complete release version is `Major.Minor.Bug.Target`; see -[Mineralogy Versioning](VERSIONS.md). This branch validates target `116051` -for Minecraft 1.16.5 Forge and does not append CI build numbers. +[Mineralogy Versioning](VERSIONS.md). This branch validates target `117011` +for Minecraft 1.17.1 Forge and does not append CI build numbers. diff --git a/docs/PLAYER_GUIDE.md b/docs/PLAYER_GUIDE.md index 945f6dc3f..e8560233b 100644 --- a/docs/PLAYER_GUIDE.md +++ b/docs/PLAYER_GUIDE.md @@ -2,8 +2,8 @@ ## Installing -Mineralogy 6 needs Minecraft 1.16.5, Forge 36.2.34, and OreSpawn -4.0.9.116051. +Mineralogy 6 needs Minecraft 1.17.1, Forge 37.1.1, and OreSpawn +4.0.9.117011. Install matching Mineralogy and OreSpawn jars on both clients and servers. Do not open a world containing Mineralogy blocks without Mineralogy installed. @@ -19,7 +19,7 @@ Cyano/`LEGACY` engine with their established family order and layer settings. It does not silently convert old terrain to Stable Layers. Back up an important world before changing its profile or upgrading mods. -On the first 1.16.5 start, Mineralogy recognizes the old saved registry and +On the first 1.17.1 start, Mineralogy recognizes the old saved registry and protects existing Overworld chunks while Minecraft converts them to flattened block states. Rock furnaces are converted when their chunk is first loaded; their inventory and cooking progress are retained. Old vanilla tile IDs are @@ -52,6 +52,12 @@ exact Minecraft slab item, place one matching Mineralogy slab by itself in a crafting grid to convert it 1:1; placing the vanilla slab by itself converts it back without loss. +Minecraft's native basalt and tuff work as members of their matching Mineralogy +families. Native smooth basalt also works wherever Mineralogy expects smooth +basalt, while Minecraft's normal basalt-smelting recipe is left unchanged. +Deepslate is used as terrain and an ore host, but is not a Mineralogy +construction family. + Because raw rocks are cobblestone equivalents, eight raw Mineralogy rocks around an empty crafting-grid centre make a normal Minecraft furnace. A Mineralogy rock furnace is an upgrade recipe: surround an existing Minecraft @@ -78,7 +84,7 @@ Its **Rock Settings** screen provides four altitude controls: - **Minimum Y** (`min_y`) and **Maximum Y** (`max_y`) are inclusive hard limits. The rock cannot replace terrain outside them. -Minecraft 1.16.5 accepts Y `0` through `255`; Depth Spread accepts `1` through +Minecraft 1.17.1 accepts Y `0` through `255`; Depth Spread accepts `1` through `512`. The saved fields are independent of the rock's geological family, overall weight, and geome weights, which also affect where it is selected. @@ -93,10 +99,10 @@ retro-generate different rock strata into existing chunks. Mineralogy does not maintain a separate replacement blocklist. OreSpawn owns terrain replacement through each dimension's `host_blocks` and `host_tags`. -The packaged Mineralogy profile initially uses `minecraft:stone` in the -Overworld. +The packaged Mineralogy profile initially uses `minecraft:stone` and +`minecraft:deepslate` in the Overworld. -The terrain-host list is not exposed by OreSpawn's 1.16.5 graphical editor. Stop +The terrain-host list is not exposed by OreSpawn's 1.17.1 graphical editor. Stop Minecraft or the server before editing the JSON. For defaults inherited by worlds created afterward, edit: @@ -121,6 +127,7 @@ each natural terrain block that Mineralogy rock may replace: "biome_namespaces": [], "host_blocks": [ "minecraft:stone", + "minecraft:deepslate", "examplemod:custom_stone" ], "host_tags": [] @@ -129,11 +136,11 @@ each natural terrain block that Mineralogy rock may replace: ``` Use `host_tags` when an OreSpawn/pack-provided group is more appropriate; on -Minecraft 1.16.5 these resolve through target-native block tags. Exact +Minecraft 1.17.1 these resolve through target-native block tags. Exact `host_blocks` entries are the clearest choice for one modded stone. -Minecraft 1.16.5 matches a `host_blocks` entry by flattened block registry +Minecraft 1.17.1 matches a `host_blocks` entry by flattened block registry identity. Add only natural base-terrain blocks, not machines, containers, or construction blocks. Restart after editing. The change affects only chunks generated afterward; @@ -142,11 +149,11 @@ OreSpawn never retro-generates Mineralogy rock strata into existing chunks. ### Enabling Mineralogy Geology In Another Dimension OreSpawn can apply Mineralogy rocks to a stone-based mod dimension without a -separate Mineralogy dimension option. Minecraft 1.16.5 uses the dimension +separate Mineralogy dimension option. Minecraft 1.17.1 uses the dimension type's registered ID. For example, use `examplemod:moon` when that is the ID documented by the installed dimension mod. -The 1.16.5 graphical editor does not expose terrain-dimension or rock-membership +The 1.17.1 graphical editor does not expose terrain-dimension or rock-membership fields. Stop Minecraft or the server and edit the appropriate OreSpawn JSON: `config/orespawn-worldgen.json` for defaults inherited by future worlds, or `/serverconfig/orespawn-worldgen.json` for an established world. diff --git a/docs/PROVIDER.md b/docs/PROVIDER.md index e1f1244b5..2f118e5a5 100644 --- a/docs/PROVIDER.md +++ b/docs/PROVIDER.md @@ -14,11 +14,13 @@ The exact bytes from the installed build are exported as - Provider schema 4, mod ID `mineralogy`, and provider revision 3. - 32 enabled rock rules across the four geological families. - Sulfur, phosphorous, and nitrate ore rules. -- Minecraft 1.16.5 heights `0` through `255` and Overworld-only terrain defaults. -- Minecraft blocks for granite, diorite, andesite, and basalt; Mineralogy tuff - because Minecraft 1.16.5 does not supply vanilla tuff. Worldgen aliases map - the four matching historical Mineralogy rock IDs to their vanilla outputs, - while all historical Mineralogy blocks remain registered for old worlds. +- Minecraft 1.17.1 heights `0` through `255` and Overworld-only terrain defaults. +- Minecraft blocks for granite, diorite, andesite, basalt, and tuff. Worldgen + aliases map the five matching historical Mineralogy rock IDs to their native + outputs, while all historical Mineralogy blocks remain registered for old + worlds. Native smooth basalt is also accepted by the matching smooth family. +- Both `minecraft:stone` and `minecraft:deepslate` are terrain hosts. The three + ore rules use Minecraft's stone- and deepslate-ore-replaceable tags. - Sky/geome Stable Layers defaults for fresh worlds plus Cyano defaults used when OreSpawn migrates an established Mineralogy 3 world. - The covered `mineralogy:fluid_deposit/crude_oil` rule at Y `0` through `48`, @@ -69,7 +71,7 @@ that same dimension ID to each desired rock rule's `dimensions` array. A rock without `dimensions` is Overworld-only. A configured custom dimension is disabled during baking when no valid rock rules include it. -Minecraft 1.16.5 uses the registered dimension-type ID, such as +Minecraft 1.17.1 uses the registered dimension-type ID, such as `examplemod:moon`; consult the dimension mod's documentation for its exact ID. Rock membership makes different stone sets possible per dimension. To use different altitude settings for the same output block, define unique rock rule @@ -77,7 +79,7 @@ IDs with different `depth_peak`, `depth_spread`, `min_y`, or `max_y` values and non-overlapping dimension lists. Duplicate output states within one dimension are rejected. -The 1.16.5 editor does not expose terrain-dimension or rock-membership fields, so +The 1.17.1 editor does not expose terrain-dimension or rock-membership fields, so players edit the stopped world's saved profile and pack authors may provide global defaults or a complete provider override. Changes affect newly generated chunks only. @@ -86,9 +88,9 @@ chunks only. Issue #57's replacement blocklist is provided by OreSpawn rather than `mineralogy-common.toml`. The packaged profile enables -`terrain_dimensions.minecraft:overworld` with `minecraft:stone` in -`host_blocks`. Pack authors may add installed natural-terrain registry IDs or -appropriate host tags to that dimension. +`terrain_dimensions.minecraft:overworld` with `minecraft:stone` and +`minecraft:deepslate` in `host_blocks`. Pack authors may add installed +natural-terrain registry IDs or appropriate host tags to that dimension. Use `config/orespawn-worldgen.json` for installed-pack defaults applied to new worlds. Once a world exists, its @@ -99,6 +101,6 @@ intends to replace the whole packaged Mineralogy provider; it is unnecessary for an ordinary per-world host-list change and does not rewrite established world profiles. -On Minecraft 1.16.5, terrain hosts are baked as flattened block identities. +On Minecraft 1.17.1, terrain hosts are baked as flattened block identities. Changes affect only newly generated chunks because Mineralogy strata are never retro-generated. diff --git a/docs/README.md b/docs/README.md index ab31a333b..ccf503f43 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,6 +1,6 @@ # Mineralogy Guide -Mineralogy 6 for Minecraft 1.16.5 supplies rock, mineral, construction, and +Mineralogy 6 for Minecraft 1.17.1 supplies rock, mineral, construction, and crude-oil content to OreSpawn 4. OreSpawn is the only terrain and deposit engine. diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index 87fc6b390..6004c077b 100644 --- a/docs/VERSIONS.md +++ b/docs/VERSIONS.md @@ -13,10 +13,10 @@ The first three components are the **functional version**. Mineralogy `6.1.0` means major generation 6, minor release 1, and bug revision 0. The fourth component identifies the target build. The complete version for -this Minecraft 1.16.5 Forge release is therefore: +this Minecraft 1.17.1 Forge release is therefore: ```text -6.1.0.116051 +6.1.0.117011 ``` This expanded numeric form is compatible with Maven version ordering, but it @@ -25,7 +25,7 @@ components. The release tag is exactly the complete four-component version, with no redundant Minecraft-version prefix. For this branch the tag is therefore -`6.1.0.116051`, not `1.16.5-6.1.0.116051`. The Target already makes tags unique +`6.1.0.117011`, not `1.17.1-6.1.0.117011`. The Target already makes tags unique across Minecraft versions and loaders. ## Reading the target component @@ -51,13 +51,14 @@ minor digits, and all remaining digits for the Minecraft major version. | 1.14.4 | Forge | `114041` | `6.0.1.114041` | | 1.15.2 | Forge | `115021` | `6.0.1.115021` | | 1.16.5 | Forge | `116051` | `6.1.0.116051` | +| 1.17.1 | Forge | `117011` | `6.1.0.117011` | | 1.18.2 | Forge | `118021` | `6.0.0.118021` | | 1.20.6 | Forge | `120061` | `6.0.0.120061` | | 1.21.11 | Forge | `121111` | `6.0.0.121111` | | 26.2 | Forge | `2602001` | `6.0.0.2602001` | | 26.2 | NeoForge | `2602002` | `6.0.0.2602002` | -The 1.16.5 row records this branch's current release. The other rows illustrate +The 1.17.1 row records this branch's current release. The other rows illustrate target encoding only; they do not claim that the 6.1.0 changes have already been forward-ported. @@ -89,8 +90,8 @@ When Major changes, Minor and Bug reset to zero. When Minor changes, Bug resets to zero. The target for the actual build is then appended: ```text -6.1.0.116051 -> 6.2.0.116051 -6.2.4.116051 -> 7.0.0.116051 +6.1.0.117011 -> 6.2.0.117011 +6.2.4.117011 -> 7.0.0.117011 ``` ## Bug version @@ -114,7 +115,7 @@ Minecraft 1.10.2 / Forge / Mineralogy 6.0.0.110021 Minecraft 1.12.2 / Forge / Mineralogy 6.0.1.112021 Minecraft 1.14.4 / Forge / Mineralogy 6.0.1.114041 Minecraft 1.15.2 / Forge / Mineralogy 6.0.1.115021 -Minecraft 1.16.5 / Forge / Mineralogy 6.1.0.116051 +Minecraft 1.17.1 / Forge / Mineralogy 6.1.0.117011 Minecraft 1.18.2 / Forge / Mineralogy 6.0.0.118021 ``` @@ -147,8 +148,8 @@ excluding Mineralogy 7. Minecraft and loader metadata still decide whether a particular jar can load on the current game. Mineralogy 6 also requires OreSpawn `[4.0.6,5.0.0)`. OreSpawn uses the same -target calculation, so the matching Minecraft 1.16.5 Forge release is -`4.0.9.116051`. The dependency range deliberately describes the supported +target calculation, so the matching Minecraft 1.17.1 Forge release is +`4.0.9.117011`. The dependency range deliberately describes the supported functional OreSpawn generation; Forge still prevents jars for another Minecraft target from loading together. @@ -161,7 +162,7 @@ feature generation, not the exact jar. The Gradle build reads the complete version from `mod_version`, verifies that it has four numeric components, and checks that its Target matches the declared Minecraft version and Forge loader. CI build numbers are not appended. For this -branch, published metadata and artifacts therefore use `6.1.0.116051`. +branch, published metadata and artifacts therefore use `6.1.0.117011`. Every release note should state: diff --git a/gradle.properties b/gradle.properties index 9571f3e68..ab297b10d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,25 +7,25 @@ org.gradle.caching=true org.gradle.parallel=false net.minecraftforge.gradle.merge-source-sets=false -mod_version=6.1.0.116051 +mod_version=6.1.0.117011 mod_group=zone.moddev.mc.mineralogy # Release metadata consumed by the generic dispatcher. -minecraft_version=1.16.5 +minecraft_version=1.17.1 loader_name=forge loader_code=1 -java_version=8 -java_toolchain_version=8.0.502+7 +java_version=16 +java_toolchain_version=16.0.2+7 gradle_java_version=17 curseforge_project_id=240974 -mc_version=1.16.5 -forge_version=36.2.34 -mcp_mappings_channel=snapshot -mcp_mappings_version=20210309-1.16.5 -mcp_version=20210115.111550 +mc_version=1.17.1 +forge_version=37.1.1 +mcp_mappings_channel=official +mcp_mappings_version=1.17.1 +mcp_version=20210706.113038 -orespawn_version=4.0.9.116051 +orespawn_version=4.0.9.117011 orespawn_curse_project_id=245586 -orespawn_curse_file_id=8742102 -orespawn_sha256=6F5E61E89547BBF779C18EDFCF4D1D47BED8D6FA0FE9EDECE87B376F117D1147 +orespawn_curse_file_id=8748648 +orespawn_sha256=945D1601FA3BF195CBF0A941CAC31E640D013B63139CCCCDB3B0A1896A727990 diff --git a/scripts/generate-locales.ps1 b/scripts/generate-locales.ps1 index b5d4a61ca..0f41e4c35 100644 --- a/scripts/generate-locales.ps1 +++ b/scripts/generate-locales.ps1 @@ -53,4 +53,4 @@ $actual = @(Get-ChildItem -LiteralPath $targetRoot -Filter '*.json' | Sort-Objec if ($actual.Count -ne 17) { throw "Expected exactly 17 generated locale files, found $($actual.Count)" } -Write-Output 'Generated 17 reviewed Mineralogy 1.16.5 JSON locales with 938 ordered keys each.' +Write-Output 'Generated 17 reviewed Mineralogy 1.17.1 JSON locales with 938 ordered keys each.' diff --git a/scripts/generate-recipes.ps1 b/scripts/generate-recipes.ps1 index 3117edc3d..45117f34b 100644 --- a/scripts/generate-recipes.ps1 +++ b/scripts/generate-recipes.ps1 @@ -27,7 +27,7 @@ $colors = @( 'gray', 'pink', 'lime', 'yellow', 'light_blue', 'magenta', 'orange', 'white' ) -# Minecraft owns these full-block identities in 1.16.5. Mineralogy keeps its +# Minecraft owns these full-block identities in 1.17.1. Mineralogy keeps its # legacy blocks registered, but recipes may accept either identity where doing # so cannot compete with a native recipe. $nativeFullBlocks = @{ @@ -35,6 +35,7 @@ $nativeFullBlocks = @{ basalt = @{ raw = 'minecraft:basalt'; smooth = 'minecraft:polished_basalt' } diorite = @{ raw = 'minecraft:diorite'; smooth = 'minecraft:polished_diorite' } granite = @{ raw = 'minecraft:granite'; smooth = 'minecraft:polished_granite' } + tuff = @{ raw = 'minecraft:tuff' } } $nativeConstructionForms = @{ @@ -95,6 +96,30 @@ function ItemIngredient([string] $item, [object] $data = $null) { return $ingredient } +function AdvancementPredicate([object] $ingredient) { + if ($ingredient -is [System.Collections.IDictionary]) { + if ($ingredient.Contains('item')) { + return [ordered]@{ items = @([string]$ingredient['item']) } + } + if ($ingredient.Contains('tag')) { + return [ordered]@{ tag = [string]$ingredient['tag'] } + } + if ($ingredient.Contains('items')) { + return [ordered]@{ items = @($ingredient['items']) } + } + } + if ($null -ne $ingredient.PSObject.Properties['item']) { + return [ordered]@{ items = @([string]$ingredient.item) } + } + if ($null -ne $ingredient.PSObject.Properties['tag']) { + return [ordered]@{ tag = [string]$ingredient.tag } + } + if ($null -ne $ingredient.PSObject.Properties['items']) { + return [ordered]@{ items = @($ingredient.items) } + } + throw "Cannot convert recipe ingredient into a Minecraft 1.17 advancement predicate" +} + function OreIngredient([string] $ore) { if ($ore -eq 'sand') { return [ordered]@{ tag = 'forge:sand' } } if ($ore -eq 'paper') { return [ordered]@{ tag = 'forge:paper' } } @@ -118,7 +143,7 @@ function OreIngredient([string] $ore) { $finish = if ($Matches[2]) { '/' + (Convert-CamelToSnake $Matches[2]) } else { '' } return [ordered]@{ tag = "mineralogy:slabs/$family$finish" } } - throw "No Minecraft 1.16.5 tag mapping for legacy OreDictionary key $ore" + throw "No Minecraft 1.17.1 tag mapping for legacy OreDictionary key $ore" } function Convert-CamelToSnake([string] $value) { @@ -152,13 +177,18 @@ function VanillaShapedRecipe( function VanillaShapelessRecipe( [object[]] $ingredients, [string] $result, - [int] $count = 1 + [int] $count = 1, + [string] $group = '' ) { - return [ordered]@{ + $recipe = [ordered]@{ type = 'minecraft:crafting_shapeless' ingredients = $ingredients result = VanillaResult $result $count } + if (-not [string]::IsNullOrWhiteSpace($group)) { + $recipe.Insert(1, 'group', $group) + } + return $recipe } function VanillaStonecuttingRecipe( @@ -242,14 +272,14 @@ function Add-SandUnlockCriteria( $criteria['has_sand'] = [ordered]@{ trigger = 'minecraft:inventory_changed' conditions = [ordered]@{ - items = @([ordered]@{ item = 'minecraft:sand' }) + items = @([ordered]@{ items = @('minecraft:sand') }) } } if ($sandMode -eq 'ore_dictionary') { $criteria['has_red_sand'] = [ordered]@{ trigger = 'minecraft:inventory_changed' conditions = [ordered]@{ - items = @([ordered]@{ item = 'minecraft:red_sand' }) + items = @([ordered]@{ items = @('minecraft:red_sand') }) } } } @@ -331,7 +361,13 @@ function NativeTagAliases( if ($nativeFinish -notin @('raw', 'smooth')) { return @() } + if (-not $nativeFullBlocks[$family].ContainsKey($nativeFinish)) { + return @() + } if ($kind -eq 'stones') { + if ($family -eq 'basalt' -and $nativeFinish -eq 'smooth') { + return @($nativeFullBlocks[$family][$nativeFinish], 'minecraft:smooth_basalt') + } return @($nativeFullBlocks[$family][$nativeFinish]) } if ($kind -eq 'slabs' -and @@ -689,7 +725,7 @@ function Ensure-MissingRecipeAdvancements() { has_rock = [ordered]@{ trigger = 'minecraft:inventory_changed' conditions = [ordered]@{ - items = @($sourceIngredient) + items = @((AdvancementPredicate $sourceIngredient)) } } } @@ -741,7 +777,7 @@ function Synchronize-AdvancementConditions() { else { $sourceIngredient = ItemIngredient "mineralogy:${family}_relief_blank" } - $advancement.criteria.has_rock.conditions.items = @($sourceIngredient) + $advancement.criteria.has_rock.conditions.items = @((AdvancementPredicate $sourceIngredient)) } if ($null -eq $advancement.criteria.has_the_recipe -or $null -eq $advancement.criteria.has_rock) { throw "Advancement $($file.Name) must have self-recipe and direct-input criteria" @@ -860,7 +896,7 @@ function VanillaRecipeAdvancement( criteria = [ordered]@{ $criterionName = [ordered]@{ trigger = 'minecraft:inventory_changed' - conditions = [ordered]@{ items = @($criterionIngredient) } + conditions = [ordered]@{ items = @((AdvancementPredicate $criterionIngredient)) } } has_the_recipe = [ordered]@{ trigger = 'minecraft:recipe_unlocked' @@ -955,9 +991,12 @@ function Write-CobblestoneRecipeOverrides() { Q = ItemIngredient 'minecraft:quartz'; R = ItemIngredient 'minecraft:redstone' '#' = $fallbackCobblestone }) 'minecraft:observer') - Write-ConditionalMinecraftRecipe 'mossy_cobblestone' $condition ` - (VanillaShapelessRecipe @($enabledCobblestone, (ItemIngredient 'minecraft:vine')) 'minecraft:mossy_cobblestone') ` - (VanillaShapelessRecipe @($fallbackCobblestone, (ItemIngredient 'minecraft:vine')) 'minecraft:mossy_cobblestone') + Write-ConditionalMinecraftRecipe 'mossy_cobblestone_from_vine' $condition ` + (VanillaShapelessRecipe @($enabledCobblestone, (ItemIngredient 'minecraft:vine')) 'minecraft:mossy_cobblestone' 1 'mossy_cobblestone') ` + (VanillaShapelessRecipe @($fallbackCobblestone, (ItemIngredient 'minecraft:vine')) 'minecraft:mossy_cobblestone' 1 'mossy_cobblestone') + Write-ConditionalMinecraftRecipe 'mossy_cobblestone_from_moss_block' $condition ` + (VanillaShapelessRecipe @($enabledCobblestone, (ItemIngredient 'minecraft:moss_block')) 'minecraft:mossy_cobblestone' 1 'mossy_cobblestone') ` + (VanillaShapelessRecipe @($fallbackCobblestone, (ItemIngredient 'minecraft:moss_block')) 'minecraft:mossy_cobblestone' 1 'mossy_cobblestone') Write-ConditionalMinecraftRecipe 'andesite' $condition ` (VanillaShapelessRecipe @((ItemIngredient 'minecraft:diorite'), $enabledCobblestone) 'minecraft:andesite' 2) ` (VanillaShapelessRecipe @((ItemIngredient 'minecraft:diorite'), $fallbackCobblestone) 'minecraft:andesite' 2) @@ -994,7 +1033,8 @@ function Write-CobblestoneRecipeOverrides() { @('redstone', 'dispenser', 'has_bow', (ItemIngredient 'minecraft:bow'), (ItemIngredient 'minecraft:bow')), @('redstone', 'dropper', 'has_redstone', (ItemIngredient 'minecraft:redstone'), (ItemIngredient 'minecraft:redstone')), @('redstone', 'observer', 'has_quartz', (ItemIngredient 'minecraft:quartz'), (ItemIngredient 'minecraft:quartz')), - @('building_blocks', 'mossy_cobblestone', 'has_vine', (ItemIngredient 'minecraft:vine'), (ItemIngredient 'minecraft:vine')), + @('building_blocks', 'mossy_cobblestone_from_vine', 'has_vine', (ItemIngredient 'minecraft:vine'), (ItemIngredient 'minecraft:vine')), + @('building_blocks', 'mossy_cobblestone_from_moss_block', 'has_moss_block', (ItemIngredient 'minecraft:moss_block'), (ItemIngredient 'minecraft:moss_block')), @('building_blocks', 'andesite', 'has_stone', (ItemIngredient 'minecraft:diorite'), (ItemIngredient 'minecraft:diorite')), @('building_blocks', 'diorite', 'has_quartz', (ItemIngredient 'minecraft:quartz'), (ItemIngredient 'minecraft:quartz')), @('tools', 'stone_axe', 'has_cobblestone', $enabledTools, $fallbackTools), @@ -1059,7 +1099,7 @@ function Write-NativePolishedOverrides() { New-Item -ItemType Directory -Force -Path $minecraftRecipeRoot | Out-Null $minecraftBuildingAdvancementRoot = Join-Path $minecraftAdvancementRoot 'building_blocks' New-Item -ItemType Directory -Force -Path $minecraftBuildingAdvancementRoot | Out-Null - foreach ($family in $nativeFullBlocks.Keys) { + foreach ($family in @($nativeFullBlocks.Keys | Where-Object { $nativeFullBlocks[$_].ContainsKey('smooth') })) { $raw = $nativeFullBlocks[$family].raw $smooth = $nativeFullBlocks[$family].smooth $recipeName = "polished_$family" @@ -1074,11 +1114,11 @@ function Write-NativePolishedOverrides() { criteria = [ordered]@{ has_rock = [ordered]@{ trigger = 'minecraft:inventory_changed' - conditions = [ordered]@{ items = @((ItemIngredient $raw)) } + conditions = [ordered]@{ items = @((AdvancementPredicate (ItemIngredient $raw))) } } has_sand = [ordered]@{ trigger = 'minecraft:inventory_changed' - conditions = [ordered]@{ items = @((ItemIngredient 'minecraft:sand')) } + conditions = [ordered]@{ items = @((AdvancementPredicate (ItemIngredient 'minecraft:sand'))) } } has_the_recipe = [ordered]@{ trigger = 'minecraft:recipe_unlocked' diff --git a/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java b/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java index 86e0c8e26..c35ed5e1c 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java +++ b/src/main/java/zone/moddev/mc/mineralogy/MineralogyConfig.java @@ -19,11 +19,11 @@ import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; -import net.minecraft.advancements.criterion.ItemPredicate; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; +import net.minecraft.advancements.critereon.ItemPredicate; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.util.GsonHelper; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.crafting.conditions.ICondition; import net.minecraftforge.common.crafting.conditions.IConditionSerializer; @@ -253,12 +253,12 @@ public static void registerAdvancementPredicates() { private static ItemPredicate configItemPredicate(JsonObject json) { List flags = new ArrayList<>(); if (json.has("flags")) { - JsonArray array = JSONUtils.getJsonArray(json, "flags"); - for (JsonElement flag : array) flags.add(configFlagCondition(JSONUtils.getString(flag, "flag"))); + JsonArray array = GsonHelper.getAsJsonArray(json, "flags"); + for (JsonElement flag : array) flags.add(configFlagCondition(GsonHelper.convertToString(flag, "flag"))); } else { - flags.add(configFlagCondition(JSONUtils.getString(json, "flag"))); + flags.add(configFlagCondition(GsonHelper.getAsString(json, "flag"))); } - return new ConfigItemPredicate(flags, new ResourceLocation(JSONUtils.getString(json, "item"))); + return new ConfigItemPredicate(flags, new ResourceLocation(GsonHelper.getAsString(json, "item"))); } private static BooleanSupplier configFlagCondition(String flag) { @@ -352,7 +352,7 @@ private static final class ConfigConditionSerializer implements IConditionSerial } @Override public ConfigCondition read(JsonObject json) { - return new ConfigCondition(JSONUtils.getString(json, "flag")); + return new ConfigCondition(GsonHelper.getAsString(json, "flag")); } @Override public ResourceLocation getID() { return CONFIG_CONDITION_ID; } @@ -365,7 +365,7 @@ private ConfigItemPredicate(List flags, ResourceLocation itemNa this.flags = flags; this.itemName = itemName; } - @Override public boolean test(ItemStack stack) { + @Override public boolean matches(ItemStack stack) { for (BooleanSupplier flag : flags) if (!flag.getAsBoolean()) return false; Item item = ForgeRegistries.ITEMS.getValue(itemName); return item != null && stack.getItem() == item; diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java index 626c64edf..c3b4505d7 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java @@ -3,18 +3,18 @@ import java.util.Collections; import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.BlockState; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; -import net.minecraft.loot.LootContext.Builder; -import net.minecraft.loot.LootParameters; -import net.minecraftforge.common.ToolType; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.enchantment.EnchantmentHelper; +import net.minecraft.world.item.enchantment.Enchantments; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.storage.loot.LootContext.Builder; +import net.minecraft.world.level.storage.loot.parameters.LootContextParams; public class DoubleSlab extends Block { private final Block drops; @@ -28,7 +28,8 @@ public DoubleSlab(float hardness, float blastResistance, int toolHardnessLevel, public DoubleSlab(float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, Block drops, Block fullBlock, String name) { - super(Block.Properties.create(Material.ROCK).hardnessAndResistance(hardness, blastResistance).sound(sound)); + super(BlockBehaviour.Properties.of(Material.STONE).strength(hardness, blastResistance).sound(sound) + .requiresCorrectToolForDrops()); this.drops = drops; this.fullBlock = fullBlock; this.toolHardnessLevel = toolHardnessLevel; @@ -36,25 +37,16 @@ public DoubleSlab(float hardness, float blastResistance, int toolHardnessLevel, } @Override - public ItemStack getItem(IBlockReader world, BlockPos pos, BlockState state) { + public ItemStack getCloneItemStack(BlockGetter world, BlockPos pos, BlockState state) { return new ItemStack(drops); } public List getDrops(BlockState state, Builder builder) { - ItemStack tool = builder.get(LootParameters.TOOL); - if (!tool.isEmpty() && EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) { + ItemStack tool = builder.getOptionalParameter(LootContextParams.TOOL); + if (tool != null && !tool.isEmpty() + && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) { return Collections.singletonList(new ItemStack(fullBlock)); } return Collections.singletonList(new ItemStack(drops, 2)); } - - @Override - public ToolType getHarvestTool(BlockState state) { - return ToolType.PICKAXE; - } - - @Override - public int getHarvestLevel(BlockState state) { - return toolHardnessLevel; - } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java index a7ccfc3d8..5f8bb9c5b 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java @@ -5,43 +5,46 @@ import java.util.Random; import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.init.TileEntities; import zone.moddev.mc.mineralogy.tileentity.TileEntityRockFurnace; -import net.minecraft.block.Block; -import net.minecraft.block.ContainerBlock; -import net.minecraft.block.HorizontalBlock; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.particles.ParticleTypes; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.BaseEntityBlock; +import net.minecraft.world.level.block.HorizontalDirectionalBlock; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.particles.ParticleTypes; import net.minecraft.stats.Stats; -import net.minecraft.util.SoundEvents; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.item.ItemStack; -import net.minecraft.state.StateContainer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.block.BlockRenderType; -import net.minecraft.util.Direction; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.Mirror; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Rotation; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.World; -import net.minecraft.loot.LootContext.Builder; -import net.minecraftforge.common.ToolType; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.Containers; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.RenderShape; +import net.minecraft.world.InteractionResult; +import net.minecraft.core.Direction; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.level.block.Mirror; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Rotation; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.storage.loot.LootContext.Builder; import net.minecraftforge.registries.ForgeRegistries; -public class RockFurnace extends ContainerBlock { - public static final net.minecraft.state.DirectionProperty FACING = HorizontalBlock.HORIZONTAL_FACING; +public class RockFurnace extends BaseEntityBlock { + public static final net.minecraft.world.level.block.state.properties.DirectionProperty FACING = HorizontalDirectionalBlock.FACING; private static boolean keepInventory; private final boolean burning; @@ -50,13 +53,13 @@ public class RockFurnace extends ContainerBlock { public RockFurnace(float hardness, float blastResistance, int toolHardnessLevel, boolean burning, float burnModifier, String name) { - super(Block.Properties.create(Material.ROCK).hardnessAndResistance(hardness, blastResistance) - .sound(SoundType.STONE).setLightLevel(state -> burning ? 14 : 0)); + super(BlockBehaviour.Properties.of(Material.STONE).strength(hardness, blastResistance) + .sound(SoundType.STONE).lightLevel(state -> burning ? 14 : 0).requiresCorrectToolForDrops()); this.burning = burning; this.burnModifier = burnModifier; this.toolHardnessLevel = toolHardnessLevel; this.setRegistryName(name); - this.setDefaultState(this.getStateContainer().getBaseState().with(FACING, Direction.NORTH)); + this.registerDefaultState(this.getStateDefinition().any().setValue(FACING, Direction.NORTH)); } protected boolean canSilkHarvest() { @@ -64,38 +67,38 @@ protected boolean canSilkHarvest() { } @Override - public BlockState getStateForPlacement(BlockItemUseContext context) { - return getDefaultState().with(FACING, context.getPlacementHorizontalFacing().getOpposite()); + public BlockState getStateForPlacement(BlockPlaceContext context) { + return defaultBlockState().setValue(FACING, context.getHorizontalDirection().getOpposite()); } @Override - public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity placer, + public void setPlacedBy(Level world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) { - if (stack.hasDisplayName()) { - TileEntity tileEntity = world.getTileEntity(pos); + if (stack.hasCustomHoverName()) { + BlockEntity tileEntity = world.getBlockEntity(pos); if (tileEntity instanceof TileEntityRockFurnace) { - ((TileEntityRockFurnace) tileEntity).setCustomInventoryName(stack.getDisplayName()); + ((TileEntityRockFurnace) tileEntity).setCustomInventoryName(stack.getHoverName()); } } } @Override - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, - Hand hand, BlockRayTraceResult hit) { - if (world.isRemote) { - return ActionResultType.SUCCESS; + public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, + InteractionHand hand, BlockHitResult hit) { + if (world.isClientSide) { + return InteractionResult.SUCCESS; } - TileEntity tileEntity = world.getTileEntity(pos); + BlockEntity tileEntity = world.getBlockEntity(pos); if (tileEntity instanceof TileEntityRockFurnace) { - player.openContainer((TileEntityRockFurnace) tileEntity); - player.addStat(Stats.INTERACT_WITH_FURNACE); + player.openMenu((TileEntityRockFurnace) tileEntity); + player.awardStat(Stats.INTERACT_WITH_FURNACE); } - return ActionResultType.SUCCESS; + return InteractionResult.SUCCESS; } - public static void setState(boolean active, World world, BlockPos pos) { + public static void setState(boolean active, Level world, BlockPos pos) { BlockState oldState = world.getBlockState(pos); Block oldBlock = oldState.getBlock(); Block newBlock = getStateBlock(oldBlock, active); @@ -104,20 +107,27 @@ public static void setState(boolean active, World world, BlockPos pos) { return; } - TileEntity tileEntity = world.getTileEntity(pos); + BlockEntity tileEntity = world.getBlockEntity(pos); keepInventory = true; - world.setBlockState(pos, newBlock.getDefaultState().with(FACING, oldState.get(FACING)), 3); + world.setBlock(pos, newBlock.defaultBlockState().setValue(FACING, oldState.getValue(FACING)), 3); keepInventory = false; if (tileEntity != null) { - tileEntity.validate(); - world.setTileEntity(pos, tileEntity); + tileEntity.clearRemoved(); + world.setBlockEntity(tileEntity); } } @Override - public TileEntity createNewTileEntity(IBlockReader world) { - return new TileEntityRockFurnace(burnModifier); + public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new TileEntityRockFurnace(pos, state, burnModifier); + } + + @Override + public BlockEntityTicker getTicker(Level world, BlockState state, + BlockEntityType blockEntityType) { + return world.isClientSide ? null + : createTickerHelper(blockEntityType, TileEntities.rock_furnace, TileEntityRockFurnace::serverTick); } @Override @@ -126,56 +136,56 @@ public List getDrops(BlockState state, Builder builder) { } @Override - public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) { + public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean isMoving) { if (state.getBlock() != newState.getBlock()) { if (!keepInventory) { - TileEntity tileEntity = world.getTileEntity(pos); + BlockEntity tileEntity = world.getBlockEntity(pos); if (tileEntity instanceof TileEntityRockFurnace) { - InventoryHelper.dropInventoryItems(world, pos, (TileEntityRockFurnace) tileEntity); - world.updateComparatorOutputLevel(pos, this); + Containers.dropContents(world, pos, (TileEntityRockFurnace) tileEntity); + world.updateNeighbourForOutputSignal(pos, this); } } - super.onReplaced(state, world, pos, newState, isMoving); + super.onRemove(state, world, pos, newState, isMoving); } } @Override - public boolean hasComparatorInputOverride(BlockState state) { + public boolean hasAnalogOutputSignal(BlockState state) { return true; } @Override - public int getComparatorInputOverride(BlockState blockState, World world, BlockPos pos) { - return Container.calcRedstone(world.getTileEntity(pos)); + public int getAnalogOutputSignal(BlockState blockState, Level world, BlockPos pos) { + return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(world.getBlockEntity(pos)); } @Override - public ItemStack getItem(IBlockReader world, BlockPos pos, BlockState state) { + public ItemStack getCloneItemStack(BlockGetter world, BlockPos pos, BlockState state) { return new ItemStack(getUnlitBlock(state.getBlock())); } @Override - public void animateTick(BlockState state, World world, BlockPos pos, Random random) { + public void animateTick(BlockState state, Level world, BlockPos pos, Random random) { if (!burning) { return; } - Direction facing = state.get(FACING); + Direction facing = state.getValue(FACING); double x = (double) pos.getX() + 0.5D; double y = (double) pos.getY(); double z = (double) pos.getZ() + 0.5D; if (random.nextDouble() < 0.1D) { - world.playSound(x, y, z, SoundEvents.BLOCK_FURNACE_FIRE_CRACKLE, SoundCategory.BLOCKS, 1.0F, 1.0F, + world.playLocalSound(x, y, z, SoundEvents.FURNACE_FIRE_CRACKLE, SoundSource.BLOCKS, 1.0F, 1.0F, false); } double offset = 0.52D; double randomOffset = random.nextDouble() * 0.6D - 0.3D; Direction.Axis axis = facing.getAxis(); - double xOffset = axis == Direction.Axis.X ? (double) facing.getXOffset() * offset : randomOffset; - double zOffset = axis == Direction.Axis.Z ? (double) facing.getZOffset() * offset : randomOffset; + double xOffset = axis == Direction.Axis.X ? (double) facing.getStepX() * offset : randomOffset; + double zOffset = axis == Direction.Axis.Z ? (double) facing.getStepZ() * offset : randomOffset; world.addParticle(ParticleTypes.SMOKE, x + xOffset, y + random.nextDouble() * 6.0D / 16.0D, z + zOffset, 0.0D, 0.0D, 0.0D); @@ -184,32 +194,22 @@ public void animateTick(BlockState state, World world, BlockPos pos, Random rand } @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; + public RenderShape getRenderShape(BlockState state) { + return RenderShape.MODEL; } @Override public BlockState rotate(BlockState state, Rotation rotation) { - return state.with(FACING, rotation.rotate(state.get(FACING))); + return state.setValue(FACING, rotation.rotate(state.getValue(FACING))); } @Override public BlockState mirror(BlockState state, Mirror mirror) { - return state.rotate(mirror.toRotation(state.get(FACING))); - } - - @Override - public ToolType getHarvestTool(BlockState state) { - return ToolType.PICKAXE; - } - - @Override - public int getHarvestLevel(BlockState state) { - return toolHardnessLevel; + return state.rotate(mirror.getRotation(state.getValue(FACING))); } @Override - protected void fillStateContainer(StateContainer.Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING); } diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java index 4cb01f20c..778b8970b 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java @@ -1,46 +1,47 @@ package zone.moddev.mc.mineralogy.blocks; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.state.DirectionProperty; -import net.minecraft.state.StateContainer; -import net.minecraft.util.Direction; -import net.minecraft.util.Mirror; -import net.minecraft.util.Rotation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.IWorldReader; -import net.minecraft.world.World; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.material.Material; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.block.state.properties.DirectionProperty; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.Mirror; +import net.minecraft.world.level.block.Rotation; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.Level; import java.util.Random; public class RockSaltLamp extends Block { public static final DirectionProperty FACING = DirectionProperty.create("facing", Direction.values()); - private static final VoxelShape STANDING_SHAPE = Block.makeCuboidShape(6.4D, 0.0D, 6.4D, 9.6D, 9.6D, 9.6D); - private static final VoxelShape NORTH_SHAPE = Block.makeCuboidShape(5.6D, 3.2D, 11.2D, 10.4D, 12.8D, 16.0D); - private static final VoxelShape SOUTH_SHAPE = Block.makeCuboidShape(5.6D, 3.2D, 0.0D, 10.4D, 12.8D, 4.8D); - private static final VoxelShape WEST_SHAPE = Block.makeCuboidShape(11.2D, 3.2D, 5.6D, 16.0D, 12.8D, 10.4D); - private static final VoxelShape EAST_SHAPE = Block.makeCuboidShape(0.0D, 3.2D, 5.6D, 4.8D, 12.8D, 10.4D); + private static final VoxelShape STANDING_SHAPE = Block.box(6.4D, 0.0D, 6.4D, 9.6D, 9.6D, 9.6D); + private static final VoxelShape NORTH_SHAPE = Block.box(5.6D, 3.2D, 11.2D, 10.4D, 12.8D, 16.0D); + private static final VoxelShape SOUTH_SHAPE = Block.box(5.6D, 3.2D, 0.0D, 10.4D, 12.8D, 4.8D); + private static final VoxelShape WEST_SHAPE = Block.box(11.2D, 3.2D, 5.6D, 16.0D, 12.8D, 10.4D); + private static final VoxelShape EAST_SHAPE = Block.box(0.0D, 3.2D, 5.6D, 4.8D, 12.8D, 10.4D); public RockSaltLamp() { - super(Block.Properties.create(Material.ROCK).hardnessAndResistance(0.25F) - .setLightLevel(state -> 15).sound(SoundType.STONE)); + super(BlockBehaviour.Properties.of(Material.STONE).strength(0.25F) + .lightLevel(state -> 15).sound(SoundType.STONE)); this.setRegistryName("rocksaltlamp"); - this.setDefaultState(this.getStateContainer().getBaseState().with(FACING, Direction.UP)); + this.registerDefaultState(this.getStateDefinition().any().setValue(FACING, Direction.UP)); } @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext context) { - switch (state.get(FACING)) { + public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { + switch (state.getValue(FACING)) { case EAST: return EAST_SHAPE; case WEST: @@ -55,22 +56,22 @@ public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, I } @Override - public VoxelShape getCollisionShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext context) { - return net.minecraft.util.math.shapes.VoxelShapes.empty(); + public VoxelShape getCollisionShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { + return net.minecraft.world.phys.shapes.Shapes.empty(); } - public boolean isNormalCube(BlockState state, IBlockReader world, BlockPos pos) { + public boolean isCollisionShapeFullBlock(BlockState state, BlockGetter world, BlockPos pos) { return false; } @Override - public BlockState getStateForPlacement(BlockItemUseContext context) { - World world = context.getWorld(); - BlockPos pos = context.getPos(); + public BlockState getStateForPlacement(BlockPlaceContext context) { + Level world = context.getLevel(); + BlockPos pos = context.getClickedPos(); for (Direction facing : context.getNearestLookingDirections()) { - BlockState state = this.getDefaultState().with(FACING, facing); - if (state.isValidPosition(world, pos)) { + BlockState state = this.defaultBlockState().setValue(FACING, facing); + if (state.canSurvive(world, pos)) { return state; } } @@ -79,31 +80,31 @@ public BlockState getStateForPlacement(BlockItemUseContext context) { } @Override - public BlockState updatePostPlacement(BlockState state, Direction facing, BlockState facingState, - IWorld world, BlockPos currentPos, BlockPos facingPos) { - return facing.getOpposite() == state.get(FACING) && !state.isValidPosition(world, currentPos) - ? Blocks.AIR.getDefaultState() + public BlockState updateShape(BlockState state, Direction facing, BlockState facingState, + LevelAccessor world, BlockPos currentPos, BlockPos facingPos) { + return facing.getOpposite() == state.getValue(FACING) && !state.canSurvive(world, currentPos) + ? Blocks.AIR.defaultBlockState() : state; } @Override - public boolean isValidPosition(BlockState state, IWorldReader world, BlockPos pos) { - Direction facing = state.get(FACING); - BlockPos supportPos = pos.offset(facing.getOpposite()); + public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) { + Direction facing = state.getValue(FACING); + BlockPos supportPos = pos.relative(facing.getOpposite()); BlockState support = world.getBlockState(supportPos); if (facing.getAxis().isVertical()) { // Match vanilla standing-torch support, including fences. The legacy // lamp accepted canPlaceTorchOnTop blocks in both vertical orientations. - return Block.hasEnoughSolidSide(world, supportPos, facing); + return Block.canSupportCenter(world, supportPos, facing); } - return support.isSolidSide(world, supportPos, facing); + return support.isFaceSturdy(world, supportPos, facing); } @Override - public void animateTick(BlockState state, World world, BlockPos pos, Random random) { - Direction facing = state.get(FACING); + public void animateTick(BlockState state, Level world, BlockPos pos, Random random) { + Direction facing = state.getValue(FACING); double x = (double) pos.getX() + 0.5D; double y = (double) pos.getY() + 0.7D; double z = (double) pos.getZ() + 0.5D; @@ -111,9 +112,9 @@ public void animateTick(BlockState state, World world, BlockPos pos, Random rand if (facing.getAxis().isHorizontal()) { Direction opposite = facing.getOpposite(); world.addParticle(ParticleTypes.SMOKE, - x + 0.27D * (double) opposite.getXOffset(), + x + 0.27D * (double) opposite.getStepX(), y + 0.22D, - z + 0.27D * (double) opposite.getZOffset(), + z + 0.27D * (double) opposite.getStepZ(), 0.0D, 0.0D, 0.0D); } else { world.addParticle(ParticleTypes.SMOKE, x, y, z, 0.0D, 0.0D, 0.0D); @@ -122,16 +123,16 @@ public void animateTick(BlockState state, World world, BlockPos pos, Random rand @Override public BlockState rotate(BlockState state, Rotation rotation) { - return state.with(FACING, rotation.rotate(state.get(FACING))); + return state.setValue(FACING, rotation.rotate(state.getValue(FACING))); } @Override public BlockState mirror(BlockState state, Mirror mirror) { - return state.rotate(mirror.toRotation(state.get(FACING))); + return state.rotate(mirror.getRotation(state.getValue(FACING))); } @Override - protected void fillStateContainer(StateContainer.Builder builder) { + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING); } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSlab.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSlab.java index 99014afb8..63960b62a 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSlab.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSlab.java @@ -2,27 +2,27 @@ import zone.moddev.mc.mineralogy.Mineralogy; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.state.DirectionProperty; -import net.minecraft.state.StateContainer; -import net.minecraft.util.Direction; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorldReader; -import net.minecraft.world.World; -import net.minecraftforge.common.ToolType; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.state.properties.DirectionProperty; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.InteractionResult; +import net.minecraft.core.Direction; +import net.minecraft.world.InteractionHand; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; +import net.minecraft.world.phys.Vec3; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.Level; import net.minecraftforge.registries.ForgeRegistries; public class RockSlab extends Block { @@ -31,12 +31,12 @@ public class RockSlab extends Block { private static final VoxelShape[] SHAPES = new VoxelShape[Direction.values().length]; static { - SHAPES[Direction.DOWN.ordinal()] = Block.makeCuboidShape(0.0D, THICKNESS, 0.0D, 16.0D, 16.0D, 16.0D); - SHAPES[Direction.UP.ordinal()] = Block.makeCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, THICKNESS, 16.0D); - SHAPES[Direction.NORTH.ordinal()] = Block.makeCuboidShape(0.0D, 0.0D, THICKNESS, 16.0D, 16.0D, 16.0D); - SHAPES[Direction.SOUTH.ordinal()] = Block.makeCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 16.0D, THICKNESS); - SHAPES[Direction.WEST.ordinal()] = Block.makeCuboidShape(THICKNESS, 0.0D, 0.0D, 16.0D, 16.0D, 16.0D); - SHAPES[Direction.EAST.ordinal()] = Block.makeCuboidShape(0.0D, 0.0D, 0.0D, THICKNESS, 16.0D, 16.0D); + SHAPES[Direction.DOWN.ordinal()] = Block.box(0.0D, THICKNESS, 0.0D, 16.0D, 16.0D, 16.0D); + SHAPES[Direction.UP.ordinal()] = Block.box(0.0D, 0.0D, 0.0D, 16.0D, THICKNESS, 16.0D); + SHAPES[Direction.NORTH.ordinal()] = Block.box(0.0D, 0.0D, THICKNESS, 16.0D, 16.0D, 16.0D); + SHAPES[Direction.SOUTH.ordinal()] = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 16.0D, THICKNESS); + SHAPES[Direction.WEST.ordinal()] = Block.box(THICKNESS, 0.0D, 0.0D, 16.0D, 16.0D, 16.0D); + SHAPES[Direction.EAST.ordinal()] = Block.box(0.0D, 0.0D, 0.0D, THICKNESS, 16.0D, 16.0D); } private final String doubleSlabName; @@ -52,10 +52,11 @@ public RockSlab(float hardness, float blastResistance, int toolHardnessLevel, So public RockSlab(float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, String name, String doubleSlabName) { - super(Block.Properties.create(Material.ROCK).hardnessAndResistance(hardness, blastResistance).sound(sound)); + super(BlockBehaviour.Properties.of(Material.STONE).strength(hardness, blastResistance).sound(sound) + .requiresCorrectToolForDrops()); this.toolHardnessLevel = toolHardnessLevel; this.doubleSlabName = doubleSlabName; - this.setDefaultState(this.getStateContainer().getBaseState().with(FACING, Direction.UP)); + this.registerDefaultState(this.getStateDefinition().any().setValue(FACING, Direction.UP)); if (name != null) { this.setRegistryName(name); @@ -63,86 +64,75 @@ public RockSlab(float hardness, float blastResistance, int toolHardnessLevel, So } @Override - public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext context) { - return SHAPES[state.get(FACING).ordinal()]; + public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { + return SHAPES[state.getValue(FACING).ordinal()]; } @Override - public VoxelShape getCollisionShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext context) { + public VoxelShape getCollisionShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { return getShape(state, world, pos, context); } - public boolean isNormalCube(BlockState state, IBlockReader world, BlockPos pos) { + public boolean isCollisionShapeFullBlock(BlockState state, BlockGetter world, BlockPos pos) { return false; } @Override - public boolean propagatesSkylightDown(BlockState state, IBlockReader world, BlockPos pos) { + public boolean propagatesSkylightDown(BlockState state, BlockGetter world, BlockPos pos) { return false; } @Override - public BlockState getStateForPlacement(net.minecraft.item.BlockItemUseContext context) { - BlockState state = this.getDefaultState().with(FACING, getPlacementFacing(context)); - return state.isValidPosition(context.getWorld(), context.getPos()) ? state : null; + public BlockState getStateForPlacement(net.minecraft.world.item.context.BlockPlaceContext context) { + BlockState state = this.defaultBlockState().setValue(FACING, getPlacementFacing(context)); + return state.canSurvive(context.getLevel(), context.getClickedPos()) ? state : null; } @Override - public boolean isValidPosition(BlockState state, IWorldReader world, BlockPos pos) { + public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) { return canPlaceAtAnyFace(world, pos); } @Override - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, - Hand hand, BlockRayTraceResult hit) { - Direction facing = hit.getFace(); - if (this.doubleSlabName == null || this.doubleSlabName.isEmpty() || facing != state.get(FACING)) { - return super.onBlockActivated(state, world, pos, player, hand, hit); + public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, + InteractionHand hand, BlockHitResult hit) { + Direction facing = hit.getDirection(); + if (this.doubleSlabName == null || this.doubleSlabName.isEmpty() || facing != state.getValue(FACING)) { + return super.use(state, world, pos, player, hand, hit); } - ItemStack held = player.getHeldItem(hand); + ItemStack held = player.getItemInHand(hand); ResourceLocation slabItemName = held.isEmpty() ? null : held.getItem().getRegistryName(); if (!this.getRegistryName().equals(slabItemName)) { - return super.onBlockActivated(state, world, pos, player, hand, hit); + return super.use(state, world, pos, player, hand, hit); } Block doubleSlab = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Mineralogy.MODID, this.doubleSlabName)); if (!(doubleSlab instanceof DoubleSlab)) { - return super.onBlockActivated(state, world, pos, player, hand, hit); + return super.use(state, world, pos, player, hand, hit); } - world.setBlockState(pos, doubleSlab.getDefaultState()); + world.setBlock(pos, doubleSlab.defaultBlockState(), 3); if (!player.isCreative()) { held.shrink(1); } - return ActionResultType.SUCCESS; + return InteractionResult.SUCCESS; } - - @Override - public ToolType getHarvestTool(BlockState state) { - return ToolType.PICKAXE; - } - - @Override - public int getHarvestLevel(BlockState state) { - return toolHardnessLevel; - } - - @Override - protected void fillStateContainer(StateContainer.Builder builder) { +@Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING); } - private static boolean canPlaceAt(IBlockReader world, BlockPos pos, Direction facing) { - BlockPos supportPos = pos.offset(facing.getOpposite()); + private static boolean canPlaceAt(BlockGetter world, BlockPos pos, Direction facing) { + BlockPos supportPos = pos.relative(facing.getOpposite()); BlockState support = world.getBlockState(supportPos); - return support.isSolidSide(world, supportPos, facing); + return support.isFaceSturdy(world, supportPos, facing); } - private static boolean canPlaceAtAnyFace(IBlockReader world, BlockPos pos) { - for (Direction facing : FACING.getAllowedValues()) { + private static boolean canPlaceAtAnyFace(BlockGetter world, BlockPos pos) { + for (Direction facing : FACING.getPossibleValues()) { if (canPlaceAt(world, pos, facing)) { return true; } @@ -151,10 +141,10 @@ private static boolean canPlaceAtAnyFace(IBlockReader world, BlockPos pos) { return false; } - private static Direction getPlacementFacing(net.minecraft.item.BlockItemUseContext context) { - Direction face = context.getFace(); - Vector3d hitVec = context.getHitVec(); - BlockPos pos = context.getPos(); + private static Direction getPlacementFacing(net.minecraft.world.item.context.BlockPlaceContext context) { + Direction face = context.getClickedFace(); + Vec3 hitVec = context.getClickLocation(); + BlockPos pos = context.getClickedPos(); float hitX = (float) (hitVec.x - (double) pos.getX()); float hitY = (float) (hitVec.y - (double) pos.getY()); float hitZ = (float) (hitVec.z - (double) pos.getZ()); @@ -231,7 +221,7 @@ private static Direction rotateAround(Direction face, Direction.Axis axis) { if (face == Direction.UP || face == Direction.DOWN) { return face; } - return face.rotateY(); + return face.getClockWise(); case Z: if (face == Direction.NORTH || face == Direction.SOUTH) { return face; diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java index 1345258ec..8901d6a2a 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java @@ -1,32 +1,21 @@ package zone.moddev.mc.mineralogy.blocks; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.StairsBlock; -import net.minecraft.block.material.Material; -import net.minecraft.block.BlockState; -import net.minecraftforge.common.ToolType; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.StairBlock; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.block.state.BlockState; -public class RockStairs extends StairsBlock { +public class RockStairs extends StairBlock { public RockStairs(Block materialBlock, float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, String name) { - super(materialBlock.getDefaultState(), Block.Properties.create(Material.ROCK) - .hardnessAndResistance(hardness, blastResistance).sound(sound)); - + super(materialBlock.defaultBlockState(), BlockBehaviour.Properties.of(Material.STONE) + .strength(hardness, blastResistance).sound(sound).requiresCorrectToolForDrops()); this.setRegistryName(name); this.toolHardnessLevel = toolHardnessLevel; } private final int toolHardnessLevel; - - @Override - public ToolType getHarvestTool(BlockState state) { - return ToolType.PICKAXE; - } - - @Override - public int getHarvestLevel(BlockState state) { - return toolHardnessLevel; - } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java index 352134202..e31b52d50 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java @@ -1,11 +1,11 @@ package zone.moddev.mc.mineralogy.blocks; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.WallBlock; -import net.minecraft.block.material.Material; -import net.minecraft.block.BlockState; -import net.minecraftforge.common.ToolType; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.WallBlock; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.block.state.BlockState; /** * @@ -15,21 +15,11 @@ public class RockWall extends WallBlock { public RockWall(Block materialBlock, float hardness, float blastResistance, int toolHardnessLevel, SoundType sound, String name) { - super(Block.Properties.create(Material.ROCK).hardnessAndResistance(hardness, blastResistance).sound(sound)); - + super(BlockBehaviour.Properties.of(Material.STONE).strength(hardness, blastResistance).sound(sound) + .requiresCorrectToolForDrops()); this.setRegistryName(name); this.toolHardnessLevel = toolHardnessLevel; } private final int toolHardnessLevel; - - @Override - public ToolType getHarvestTool(BlockState state) { - return ToolType.PICKAXE; - } - - @Override - public int getHarvestLevel(BlockState state) { - return toolHardnessLevel; - } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java b/src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java index bd79d940a..a11382899 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java +++ b/src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java @@ -6,9 +6,9 @@ import zone.moddev.mc.mineralogy.blocks.RockSaltStreetLamp; import zone.moddev.mc.mineralogy.fluids.MineralogyFluids; -import net.minecraft.block.Block; +import net.minecraft.world.level.block.Block; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.RenderTypeLookup; +import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -22,13 +22,13 @@ private ClientSetup() { @SubscribeEvent public static void clientSetup(FMLClientSetupEvent event) { - RenderType cutout = RenderType.getCutout(); + RenderType cutout = RenderType.cutout(); for (Block block : ForgeRegistries.BLOCKS.getValues()) { if (block instanceof DryWall || block instanceof RockSaltLamp || block instanceof RockSaltStreetLamp) { - RenderTypeLookup.setRenderLayer(block, cutout); + ItemBlockRenderTypes.setRenderLayer(block, cutout); } } - RenderTypeLookup.setRenderLayer(MineralogyFluids.CRUDE_OIL, RenderType.getTranslucent()); - RenderTypeLookup.setRenderLayer(MineralogyFluids.FLOWING_CRUDE_OIL, RenderType.getTranslucent()); + ItemBlockRenderTypes.setRenderLayer(MineralogyFluids.CRUDE_OIL, RenderType.translucent()); + ItemBlockRenderTypes.setRenderLayer(MineralogyFluids.FLOWING_CRUDE_OIL, RenderType.translucent()); } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java b/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java index 92ea3ccff..f8abf164e 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java +++ b/src/main/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicy.java @@ -1,21 +1,19 @@ package zone.moddev.mc.mineralogy.compat; import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.util.LinkedHashSet; -import java.util.List; import java.util.Set; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.tags.ITag; -import net.minecraft.tags.ITagCollection; -import net.minecraft.tags.ITagCollectionSupplier; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.SetTag; import net.minecraft.tags.Tag; -import net.minecraft.util.ResourceLocation; +import net.minecraft.tags.TagCollection; +import net.minecraft.tags.TagContainer; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.block.Block; import net.minecraftforge.event.TagsUpdatedEvent; import net.minecraftforge.registries.ForgeRegistries; @@ -40,9 +38,9 @@ public static void onTagsUpdated(TagsUpdatedEvent event) { apply(event.getTagManager()); } - static void apply(ITagCollectionSupplier manager) { - ITagCollection blockTags = manager.getBlockTags(); - ITagCollection itemTags = manager.getItemTags(); + static void apply(TagContainer manager) { + TagCollection blockTags = manager.getOrEmpty(Registry.BLOCK_REGISTRY); + TagCollection itemTags = manager.getOrEmpty(Registry.ITEM_REGISTRY); Set configuredBlocks = rawRockBlocks(blockTags); Set configuredItems = rawRockItems(itemTags); @@ -68,29 +66,29 @@ static void apply(ITagCollectionSupplier manager) { updateDerivedItemTag(itemTags, STONE_CRAFTING_MATERIALS, configuredItems, enabled); updateDerivedItemTag(itemTags, STONE_TOOL_MATERIALS, configuredItems, enabled); - Mineralogy.LOGGER.debug("Applied Forge 36 cobblestone policy: enabled={}, rocks={}, " + Mineralogy.LOGGER.debug("Applied Forge 37 cobblestone policy: enabled={}, rocks={}, " + "forgeItems={}, craftingItems={}, toolItems={}", enabled, configuredItems.size(), - required(itemTags, COBBLESTONE).getAllElements().size(), - required(itemTags, STONE_CRAFTING_MATERIALS).getAllElements().size(), - required(itemTags, STONE_TOOL_MATERIALS).getAllElements().size()); + required(itemTags, COBBLESTONE).getValues().size(), + required(itemTags, STONE_CRAFTING_MATERIALS).getValues().size(), + required(itemTags, STONE_TOOL_MATERIALS).getValues().size()); // Ingredients cache their expanded matching stacks independently of the // retained tag object, so invalidate them after every initial load/reload. Ingredient.invalidateAll(); } - private static Set rawRockBlocks(ITagCollection tags) { + private static Set rawRockBlocks(TagCollection tags) { Set blocks = new LinkedHashSet<>(); for (Material material : MaterialData.allIncludingRockSalt()) { - blocks.addAll(required(tags, familyTag(material)).getAllElements()); + blocks.addAll(required(tags, familyTag(material)).getValues()); } return blocks; } - private static Set rawRockItems(ITagCollection tags) { + private static Set rawRockItems(TagCollection tags) { Set items = new LinkedHashSet<>(); for (Material material : MaterialData.allIncludingRockSalt()) { - items.addAll(required(tags, familyTag(material)).getAllElements()); + items.addAll(required(tags, familyTag(material)).getValues()); } return items; } @@ -99,12 +97,12 @@ private static ResourceLocation familyTag(Material material) { return new ResourceLocation(Mineralogy.MODID, "stones/" + material.id()); } - private static Set existing(ITagCollection collection, ResourceLocation id) { - ITag tag = collection.get(id); - return tag == null ? new LinkedHashSet<>() : new LinkedHashSet<>(tag.getAllElements()); + private static Set existing(TagCollection collection, ResourceLocation id) { + Tag tag = collection.getTag(id); + return tag == null ? new LinkedHashSet<>() : new LinkedHashSet<>(tag.getValues()); } - private static void updateDerivedItemTag(ITagCollection tags, ResourceLocation id, + private static void updateDerivedItemTag(TagCollection tags, ResourceLocation id, Set configuredItems, boolean enabled) { Set values = existing(tags, id); values.removeAll(configuredItems); @@ -114,8 +112,8 @@ private static void updateDerivedItemTag(ITagCollection tags, ResourceLoca replaceElementsInPlace(required(tags, id), values); } - private static ITag required(ITagCollection collection, ResourceLocation id) { - ITag tag = collection.get(id); + private static Tag required(TagCollection collection, ResourceLocation id) { + Tag tag = collection.getTag(id); if (tag == null) { throw new IllegalStateException("Missing required tag " + id); } @@ -123,50 +121,28 @@ private static ITag required(ITagCollection collection, ResourceLocati } /** - * Forge 36 recipes retain the concrete tag instance resolved while their + * Forge 37 recipes retain the concrete tag instance resolved while their * ingredients are parsed. Replacing the surrounding collection therefore * leaves recipes pointing at stale immutable contents. Update both fields * on that exact instance so membership tests and expanded stack lists agree. */ @SuppressWarnings("unchecked") - static void replaceElementsInPlace(ITag tag, Set values) { - if (!(tag instanceof Tag)) { - throw new IllegalStateException("Unsupported Forge 36 tag implementation " + static void replaceElementsInPlace(Tag tag, Set values) { + if (!(tag instanceof SetTag)) { + throw new IllegalStateException("Unsupported Forge 37 tag implementation " + tag.getClass().getName()); } - Tag retained = (Tag) tag; - setRetainedField(retained, "field_241282_b_", List.class, ImmutableList.copyOf(values)); - setRetainedField(retained, "field_241283_c_", Set.class, ImmutableSet.copyOf(values)); - } - - private static void setRetainedField(Tag retained, String mappedName, - Class fieldType, Object value) { - Field selected = null; - try { - selected = Tag.class.getDeclaredField(mappedName); - } catch (NoSuchFieldException ignored) { - // The production jar uses obfuscated field names. Their distinct - // List/Set types are stable on Forge 36 and identify them safely. - for (Field field : Tag.class.getDeclaredFields()) { - if (fieldType.isAssignableFrom(field.getType())) { - if (selected != null) { - throw new IllegalStateException("Ambiguous Forge 36 tag " - + fieldType.getSimpleName() + " field"); - } - selected = field; - } + SetTag replacement = SetTag.create(values); + for (Field field : SetTag.class.getDeclaredFields()) { + if (Modifier.isStatic(field.getModifiers())) continue; + try { + field.setAccessible(true); + field.set(tag, field.get(replacement)); + } catch (IllegalAccessException ex) { + throw new IllegalStateException("Could not update retained Forge 37 tag field " + + field.getName(), ex); } } - if (selected == null) { - throw new IllegalStateException("Missing Forge 36 tag " - + fieldType.getSimpleName() + " field"); - } - try { - selected.setAccessible(true); - selected.set(retained, value); - } catch (IllegalAccessException ex) { - throw new IllegalStateException("Could not update retained Forge 36 tag", ex); - } } private static void addBlock(Set blocks, String name) { diff --git a/src/main/java/zone/moddev/mc/mineralogy/data/Material.java b/src/main/java/zone/moddev/mc/mineralogy/data/Material.java index 06b43f2d2..c74559532 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/data/Material.java +++ b/src/main/java/zone/moddev/mc/mineralogy/data/Material.java @@ -6,10 +6,9 @@ import zone.moddev.mc.mineralogy.blocks.RockWall; import zone.moddev.mc.mineralogy.init.MineralogyItemGroups; -import net.minecraft.block.SoundType; -import net.minecraft.item.Item; -import net.minecraft.item.BlockItem; -import net.minecraft.util.ResourceLocation; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.BlockItem; public class Material { public String materialName; @@ -98,7 +97,7 @@ public RockStairs toRockStairs(boolean isSmooth, boolean isBrick) { public BlockItem getBlockItem(Rock blockHandle) { BlockItem blockItem = new BlockItem(blockHandle, - new Item.Properties().group(MineralogyItemGroups.forBlock(blockHandle))); + new Item.Properties().tab(MineralogyItemGroups.forBlock(blockHandle))); blockItem.setRegistryName(Mineralogy.MODID, blockHandle.getRegistryName().getPath()); @@ -107,7 +106,7 @@ public BlockItem getBlockItem(Rock blockHandle) { public BlockItem getBlockItem(RockStairs blockHandle) { BlockItem blockItem = new BlockItem(blockHandle, - new Item.Properties().group(MineralogyItemGroups.forBlock(blockHandle))); + new Item.Properties().tab(MineralogyItemGroups.forBlock(blockHandle))); blockItem.setRegistryName(Mineralogy.MODID, blockHandle.getRegistryName().getPath()); @@ -116,7 +115,7 @@ public BlockItem getBlockItem(RockStairs blockHandle) { public BlockItem getBlockItem(RockWall blockHandle) { BlockItem blockItem = new BlockItem(blockHandle, - new Item.Properties().group(MineralogyItemGroups.forBlock(blockHandle))); + new Item.Properties().tab(MineralogyItemGroups.forBlock(blockHandle))); blockItem.setRegistryName(Mineralogy.MODID, blockHandle.getRegistryName().getPath()); diff --git a/src/main/java/zone/moddev/mc/mineralogy/fluids/MineralogyFluids.java b/src/main/java/zone/moddev/mc/mineralogy/fluids/MineralogyFluids.java index 55fc148c8..22168741e 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/fluids/MineralogyFluids.java +++ b/src/main/java/zone/moddev/mc/mineralogy/fluids/MineralogyFluids.java @@ -1,13 +1,14 @@ package zone.moddev.mc.mineralogy.fluids; -import net.minecraft.block.Block; -import net.minecraft.block.FlowingFluidBlock; -import net.minecraft.block.material.Material; -import net.minecraft.fluid.Fluid; -import net.minecraft.item.BucketItem; -import net.minecraft.item.Item; -import net.minecraft.item.Items; -import net.minecraft.util.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.LiquidBlock; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.material.Fluid; +import net.minecraft.world.item.BucketItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fluids.FluidAttributes; @@ -18,7 +19,7 @@ import zone.moddev.mc.mineralogy.MineralogyConfig; import zone.moddev.mc.mineralogy.init.MineralogyItemGroups; -/** Forge 36-native source, flowing block and bucket for Mineralogy crude oil. */ +/** Forge 37-native source, flowing block and bucket for Mineralogy crude oil. */ @Mod.EventBusSubscriber(modid = Mineralogy.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class MineralogyFluids { private static final ResourceLocation STILL_TEXTURE = @@ -28,7 +29,7 @@ public final class MineralogyFluids { public static ForgeFlowingFluid.Source CRUDE_OIL; public static ForgeFlowingFluid.Flowing FLOWING_CRUDE_OIL; - public static FlowingFluidBlock CRUDE_OIL_BLOCK; + public static LiquidBlock CRUDE_OIL_BLOCK; public static Item CRUDE_OIL_BUCKET; private static final ForgeFlowingFluid.Properties PROPERTIES = @@ -58,18 +59,18 @@ public static void registerFluids(RegistryEvent.Register event) { @SubscribeEvent public static void registerBlock(RegistryEvent.Register event) { - CRUDE_OIL_BLOCK = (FlowingFluidBlock) new FlowingFluidBlock(() -> CRUDE_OIL, - Block.Properties.create(Material.WATER).doesNotBlockMovement() - .hardnessAndResistance(100.0F).variableOpacity()) + CRUDE_OIL_BLOCK = (LiquidBlock) new LiquidBlock(() -> CRUDE_OIL, + BlockBehaviour.Properties.of(Material.WATER).noCollission() + .strength(100.0F).noDrops()) .setRegistryName(Mineralogy.MODID, "crude_oil"); event.getRegistry().register(CRUDE_OIL_BLOCK); } @SubscribeEvent public static void registerBucket(RegistryEvent.Register event) { - Item.Properties properties = new Item.Properties().maxStackSize(1).containerItem(Items.BUCKET); + Item.Properties properties = new Item.Properties().stacksTo(1).craftRemainder(Items.BUCKET); if (MineralogyConfig.isCreativeVisible("crude_oil_bucket")) { - properties.group(MineralogyItemGroups.forItem()); + properties.tab(MineralogyItemGroups.forItem()); } CRUDE_OIL_BUCKET = new BucketItem(() -> CRUDE_OIL, properties) .setRegistryName(Mineralogy.MODID, "crude_oil_bucket"); diff --git a/src/main/java/zone/moddev/mc/mineralogy/init/Blocks.java b/src/main/java/zone/moddev/mc/mineralogy/init/Blocks.java index 9027d3881..434671e05 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/init/Blocks.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/Blocks.java @@ -19,8 +19,8 @@ import zone.moddev.mc.mineralogy.blocks.RockWall; import zone.moddev.mc.mineralogy.data.MaterialData; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/zone/moddev/mc/mineralogy/init/Items.java b/src/main/java/zone/moddev/mc/mineralogy/init/Items.java index 63fc0d76b..58ad701a9 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/init/Items.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/Items.java @@ -17,10 +17,10 @@ import zone.moddev.mc.mineralogy.blocks.RockWall; import zone.moddev.mc.mineralogy.items.MineralFertilizer; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.BlockItem; -import net.minecraft.util.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.BlockItem; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -85,12 +85,12 @@ private static BlockItem createBlockItem(Block block) { ResourceLocation name = block.getRegistryName(); Item.Properties properties = new Item.Properties(); if (name != null && MineralogyConfig.isCreativeVisible(name.getPath())) { - properties.group(MineralogyItemGroups.forBlock(block)); + properties.tab(MineralogyItemGroups.forBlock(block)); } if (block instanceof RockFurnace) { - properties.maxStackSize(1); + properties.stacksTo(1); } else if (block instanceof RockSaltStreetLamp) { - properties.maxStackSize(16); + properties.stacksTo(16); } BlockItem item = new BlockItem(block, properties); @@ -107,7 +107,7 @@ private static boolean isUnlitRockFurnace(Block block) { private static Item createItem(String name) { Item.Properties properties = new Item.Properties(); - if (MineralogyConfig.isCreativeVisible(name)) properties.group(MineralogyItemGroups.forItem()); + if (MineralogyConfig.isCreativeVisible(name)) properties.tab(MineralogyItemGroups.forItem()); Item item = new Item(properties); item.setRegistryName(Mineralogy.MODID, name); return item; diff --git a/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java index f73027910..bbae53d3d 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java @@ -3,11 +3,11 @@ import zone.moddev.mc.mineralogy.Mineralogy; import zone.moddev.mc.mineralogy.MineralogyConfig; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ForgeRegistries; @@ -17,7 +17,7 @@ private MineralogyItemGroups() { throw new IllegalAccessError("Not an instantiable class"); } - public static ItemGroup forBlock(Block block) { + public static CreativeModeTab forBlock(Block block) { if (!MineralogyConfig.groupCreativeTabItemsByType()) { return MainGroup.MINERALOGY; } @@ -27,50 +27,57 @@ public static ItemGroup forBlock(Block block) { case STAIR: return StairGroup.STAIR; case SLAB: return SlabGroup.SLAB; case WALL: return WallGroup.WALL; - default: return ItemGroups.ITEM; + default: return CreativeModeTabs.ITEM; } } - public static ItemGroup forItem() { - return MineralogyConfig.groupCreativeTabItemsByType() ? ItemGroups.ITEM : MainGroup.MINERALOGY; + public static CreativeModeTab forItem() { + return MineralogyConfig.groupCreativeTabItemsByType() ? CreativeModeTabs.ITEM : MainGroup.MINERALOGY; } - public static ItemGroup forFertilizer() { - return MineralogyConfig.groupCreativeTabItemsByType() ? ItemGroups.ITEM : ItemGroup.MATERIALS; + public static CreativeModeTab forFertilizer() { + return MineralogyConfig.groupCreativeTabItemsByType() + ? CreativeModeTabs.ITEM : CreativeModeTab.TAB_MATERIALS; } - private static ItemGroup create(String name, String iconItemName) { - return new ItemGroup(Mineralogy.MODID + "." + name) { + private static CreativeModeTab create(String name, String iconItemName) { + return new CreativeModeTab(Mineralogy.MODID + "." + name) { @Override @OnlyIn(Dist.CLIENT) - public ItemStack createIcon() { + public ItemStack makeIcon() { Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Mineralogy.MODID, iconItemName)); - return item != null ? new ItemStack(item) : new ItemStack(net.minecraft.item.Items.IRON_PICKAXE); + return item != null ? new ItemStack(item) : new ItemStack(net.minecraft.world.item.Items.IRON_PICKAXE); } - }; + + @Override + public boolean hasSearchBar() { + return true; + } + }.setBackgroundImage(new ResourceLocation("minecraft", + "textures/gui/container/creative_inventory/tab_item_search.png")); } private static final class MainGroup { - private static final ItemGroup MINERALOGY = create("mineralogy", "basalt"); + private static final CreativeModeTab MINERALOGY = create("mineralogy", "basalt"); } private static final class RockGroup { - private static final ItemGroup ROCK = create("rock", "basalt"); + private static final CreativeModeTab ROCK = create("rock", "basalt"); } private static final class StairGroup { - private static final ItemGroup STAIR = create("stair", "basalt_stairs"); + private static final CreativeModeTab STAIR = create("stair", "basalt_stairs"); } private static final class SlabGroup { - private static final ItemGroup SLAB = create("slab", "basalt_slab"); + private static final CreativeModeTab SLAB = create("slab", "basalt_slab"); } private static final class WallGroup { - private static final ItemGroup WALL = create("wall", "basalt_wall"); + private static final CreativeModeTab WALL = create("wall", "basalt_wall"); } - private static final class ItemGroups { - private static final ItemGroup ITEM = create("item", "sulfur_dust"); + private static final class CreativeModeTabs { + private static final CreativeModeTab ITEM = create("item", "sulfur_dust"); } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyRegistry.java b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyRegistry.java index 4b30a71ee..eaaf06b6a 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyRegistry.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyRegistry.java @@ -5,7 +5,7 @@ import zone.moddev.mc.mineralogy.util.BlockItemPair; -import net.minecraft.item.Item; +import net.minecraft.world.item.Item; public class MineralogyRegistry { public static final Map MineralogyBlockRegistry = new HashMap<>(); // all blocks used in this mod (blockID, BlockItemPair) diff --git a/src/main/java/zone/moddev/mc/mineralogy/lib/data/MaterialStats.java b/src/main/java/zone/moddev/mc/mineralogy/lib/data/MaterialStats.java index a3502afd3..254360a8c 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/lib/data/MaterialStats.java +++ b/src/main/java/zone/moddev/mc/mineralogy/lib/data/MaterialStats.java @@ -6,9 +6,9 @@ import com.google.common.collect.Maps; -import net.minecraft.util.IStringSerializable; - -public enum MaterialStats implements IStringSerializable { +import net.minecraft.util.StringRepresentable; + +public enum MaterialStats implements StringRepresentable { /** * hardness on a scale from 0 to 10 (or more), where 0 is non-solid and * diamond is 10. For reference, wood is 3, stone is 5, iron is 8, diamond @@ -44,7 +44,7 @@ public enum MaterialStats implements IStringSerializable { } @Override - public String getString() { + public String getSerializedName() { return name().toLowerCase(); } @@ -57,6 +57,6 @@ public static MaterialStats getType(@Nonnull int ordinal) { @Override public String toString() { - return getString(); + return getSerializedName(); } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/lib/data/Names.java b/src/main/java/zone/moddev/mc/mineralogy/lib/data/Names.java index dee35587c..f53135cea 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/lib/data/Names.java +++ b/src/main/java/zone/moddev/mc/mineralogy/lib/data/Names.java @@ -7,9 +7,9 @@ import com.google.common.collect.Maps; -import net.minecraft.util.IStringSerializable; - -public enum Names implements IStringSerializable { +import net.minecraft.util.StringRepresentable; + +public enum Names implements StringRepresentable { // Items ARROW, AXE, BLEND, BOOTS, BOLT, BOW, CHESTPLATE, CRACKHAMMER, CROSSBOW, FISHING_ROD, GEAR, HELMET, HOE, HORSE_ARMOR, INGOT, LEGGINGS, NUGGET, PICKAXE, POWDER, ROD, SHEARS, SHIELD, SHOVEL, SMALLBLEND, SMALLPOWDER, SWORD, GEM, @@ -37,7 +37,7 @@ public enum Names implements IStringSerializable { } @Override - public String getString() { + public String getSerializedName() { return this.name(); } @@ -50,6 +50,6 @@ public static Names getType(@Nonnull int ordinal) { @Override public String toString() { - return this.getString().toLowerCase(Locale.ROOT); + return this.getSerializedName().toLowerCase(Locale.ROOT); } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java b/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java index 1b6204dcd..ed4276dba 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java +++ b/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java @@ -1,25 +1,30 @@ -package com.mcmoddev.mineralogy.patching; +package zone.moddev.mc.mineralogy.patching; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.lang.reflect.Method; +import java.lang.reflect.Field; import java.nio.file.AtomicMoveNotSupportedException; import java.nio.file.Files; import java.nio.file.StandardCopyOption; +import java.util.Arrays; import java.util.BitSet; import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import com.mcmoddev.mineralogy.Mineralogy; -import com.mcmoddev.mineralogy.blocks.RockFurnace; -import com.mcmoddev.mineralogy.blocks.RockSaltLamp; -import com.mcmoddev.mineralogy.blocks.RockSaltStreetLamp; -import com.mcmoddev.mineralogy.blocks.RockSlab; +import com.mojang.serialization.Dynamic; + +import sun.misc.Unsafe; + +import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.blocks.RockFurnace; +import zone.moddev.mc.mineralogy.blocks.RockSaltLamp; +import zone.moddev.mc.mineralogy.blocks.RockSaltStreetLamp; +import zone.moddev.mc.mineralogy.blocks.RockSlab; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -286,7 +291,7 @@ private static int installLegacyBlockStates(CompoundTag blockSnapshot) { mineralogyIds.put(id, numericId); highestStateId = Math.max(highestStateId, (numericId << 4) | 15); } - Method addEntry = findStateRegistrationMethod(); + Dynamic[] legacyStates = expandFlatteningTable(highestStateId + 1); int mapped = 0; for (Map.Entry entry : mineralogyIds.entrySet()) { ResourceLocation oldId = entry.getKey(); @@ -297,17 +302,56 @@ private static int installLegacyBlockStates(CompoundTag blockSnapshot) { } for (int meta = 0; meta < 16; ++meta) { String stateNbt = NbtUtils.writeBlockState(legacyState(block, meta)).toString(); - try { - addEntry.invoke(null, (entry.getValue() << 4) | meta, stateNbt, new String[0]); - } catch (ReflectiveOperationException e) { - throw new IllegalStateException("Could not register legacy block state " + oldId + ":" + meta, e); - } + int stateId = (entry.getValue() << 4) | meta; + // The private vanilla register method may retain a JIT-compiled reference to + // its original final 4,096-entry array. Write the expanded array directly; + // Mineralogy has no legacy aliases that need its auxiliary name maps. + legacyStates[stateId] = BlockStateData.parse(stateNbt); ++mapped; } } return mapped; } + /** + * Minecraft 1.17 still fixes the pre-flattening state table at 4,096 entries, + * while Forge 1.12 worlds commonly assign mod blocks higher numeric IDs. + * Replace that exact static-final array before writing any recovered states. + */ + private static Dynamic[] expandFlatteningTable(int requiredLength) { + try { + Unsafe unsafe = unsafe(); + for (Field field : BlockStateData.class.getDeclaredFields()) { + Class type = field.getType(); + if (!java.lang.reflect.Modifier.isStatic(field.getModifiers()) || !type.isArray() + || type.getComponentType() != Dynamic.class) { + continue; + } + Object base = unsafe.staticFieldBase(field); + long offset = unsafe.staticFieldOffset(field); + Dynamic[] current = (Dynamic[]) unsafe.getObject(base, offset); + if (current == null || current.length < 4096) { + continue; + } + if (current.length >= requiredLength) { + return current; + } + Dynamic[] expanded = Arrays.copyOf(current, requiredLength); + unsafe.putObjectVolatile(base, offset, expanded); + return expanded; + } + } catch (ReflectiveOperationException e) { + throw new IllegalStateException("Could not access Minecraft's legacy block-state flattening table", e); + } + throw new IllegalStateException("Could not locate Minecraft's legacy block-state flattening table"); + } + + private static Unsafe unsafe() throws ReflectiveOperationException { + Field field = Unsafe.class.getDeclaredField("theUnsafe"); + field.setAccessible(true); + return (Unsafe) field.get(null); + } + private static boolean containsLegacyMineralogyBlock(CompoundTag level) { ListTag sections = level.getList("Sections", 10); for (int sectionIndex = 0; sectionIndex < sections.size(); ++sectionIndex) { @@ -422,14 +466,4 @@ private static Direction legacyLampFacing(int meta) { } } - private static Method findStateRegistrationMethod() { - for (Method method : BlockStateData.class.getDeclaredMethods()) { - Class[] parameters = method.getParameterTypes(); - if (parameters.length == 3 && parameters[0] == int.class - && parameters[1] == String.class && parameters[2] == String[].class) { - return method; - } - } - throw new IllegalStateException("Could not find Minecraft's legacy block-state registration method"); - } } diff --git a/src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java b/src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java index ebaad8d17..3108747a1 100644 --- a/src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java +++ b/src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java @@ -5,6 +5,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.item.Item; +import net.minecraft.sounds.SoundEvent; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -15,7 +16,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@Mod.EventBusSubscriber(modid = Mineralogy.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +@Mod.EventBusSubscriber(modid = Mineralogy.MODID, bus = Mod.EventBusSubscriber.Bus.FORGE) public final class PatchHandler { private static final Logger LOGGER = LogManager.getLogger(); @@ -23,6 +24,10 @@ public final class PatchHandler { private static final ResourceLocation PUMMICE = mineralogyId("pummice"); private static final ResourceLocation LIMESTONE = mineralogyId("limestone"); private static final ResourceLocation PUMICE = mineralogyId("pumice"); + private static final ResourceLocation GRASS_PATH = minecraftId("grass_path"); + private static final ResourceLocation DIRT_PATH = minecraftId("dirt_path"); + private static final ResourceLocation SWEET_BERRIES_PICK = minecraftId("item.sweet_berries.pick_from_bush"); + private static final ResourceLocation SWEET_BERRY_BUSH_PICK = minecraftId("block.sweet_berry_bush.pick_berries"); private PatchHandler() { throw new IllegalAccessError("Not an instantiable class"); @@ -36,6 +41,7 @@ public static void remapMissingBlocks(RegistryEvent.MissingMappings event remapMissing(event, SAPROLITE, ForgeRegistries.BLOCKS.getValue(LIMESTONE)); remapMissing(event, PUMMICE, ForgeRegistries.BLOCKS.getValue(PUMICE)); + remapMissing(event, GRASS_PATH, ForgeRegistries.BLOCKS.getValue(DIRT_PATH)); } @SubscribeEvent @@ -46,21 +52,31 @@ public static void remapMissingItems(RegistryEvent.MissingMappings event) remapMissing(event, SAPROLITE, ForgeRegistries.ITEMS.getValue(LIMESTONE)); remapMissing(event, PUMMICE, ForgeRegistries.ITEMS.getValue(PUMICE)); + remapMissing(event, GRASS_PATH, ForgeRegistries.ITEMS.getValue(DIRT_PATH)); + } + + @SubscribeEvent + public static void remapMissingSounds(RegistryEvent.MissingMappings event) { + if (!MineralogyConfig.patchUpdate()) { + return; + } + + remapMissing(event, SWEET_BERRIES_PICK, ForgeRegistries.SOUND_EVENTS.getValue(SWEET_BERRY_BUSH_PICK)); } private static > void remapMissing(RegistryEvent.MissingMappings event, ResourceLocation oldId, T replacement) { - for (RegistryEvent.MissingMappings.Mapping mapping : event.getMappings()) { + for (RegistryEvent.MissingMappings.Mapping mapping : event.getAllMappings()) { if (!oldId.equals(mapping.key)) { continue; } if (replacement != null) { mapping.remap(replacement); - LOGGER.info("Remapped legacy Mineralogy id '{}' to '{}'", oldId, replacement.getRegistryName()); + LOGGER.info("Remapped legacy registry id '{}' to '{}'", oldId, replacement.getRegistryName()); } else { mapping.warn(); - LOGGER.warn("Could not remap legacy Mineralogy id '{}' because the replacement is not registered", oldId); + LOGGER.warn("Could not remap legacy registry id '{}' because the replacement is not registered", oldId); } } } @@ -68,4 +84,8 @@ private static > void remapMissing(RegistryEven private static ResourceLocation mineralogyId(String path) { return new ResourceLocation(Mineralogy.MODID, path); } + + private static ResourceLocation minecraftId(String path) { + return new ResourceLocation("minecraft", path); + } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index b30fba37d..5bb239326 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[36,)" +loaderVersion="[37,)" license="LGPL-2.1" issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/issues" displayURL="https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy" @@ -18,7 +18,7 @@ Fills the world with real-world rocks. [[dependencies.mineralogy]] modId="forge" mandatory=true - versionRange="[36.2.34,37)" + versionRange="[37.1.1,38)" ordering="NONE" side="BOTH" @@ -32,6 +32,6 @@ Fills the world with real-world rocks. [[dependencies.mineralogy]] modId="minecraft" mandatory=true - versionRange="[1.16.5]" + versionRange="[1.17.1]" ordering="NONE" side="BOTH" diff --git a/src/main/resources/coremods/mineralogy_legacy_world_fix.js b/src/main/resources/coremods/mineralogy_legacy_world_fix.js index bc46d5ff9..76d50be42 100644 --- a/src/main/resources/coremods/mineralogy_legacy_world_fix.js +++ b/src/main/resources/coremods/mineralogy_legacy_world_fix.js @@ -109,7 +109,7 @@ function initializeCoreMod() { prefix.add(new VarInsnNode(Opcodes.ALOAD, 1)); prefix.add(new MethodInsnNode( Opcodes.INVOKESTATIC, - 'com/mcmoddev/mineralogy/patching/LegacyWorldDataHook', + 'zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook', 'shouldBlockWorldgenWrite', '(Lnet/minecraft/core/BlockPos;)Z', false)); diff --git a/src/main/resources/data/minecraft/advancements/recipes/brewing/brewing_stand.json b/src/main/resources/data/minecraft/advancements/recipes/brewing/brewing_stand.json index 98c1be354..d96be668c 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/brewing/brewing_stand.json +++ b/src/main/resources/data/minecraft/advancements/recipes/brewing/brewing_stand.json @@ -1,87 +1,91 @@ { - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:brewing_stand" - ] - }, - "criteria": { - "has_blaze_rod": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:blaze_rod" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:brewing_stand" - } - } - }, - "requirements": [ - [ - "has_blaze_rod", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:brewing_stand" - ] - }, - "criteria": { - "has_blaze_rod": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:blaze_rod" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:brewing_stand" - } - } - }, - "requirements": [ - [ - "has_blaze_rod", - "has_the_recipe" - ] - ] - } - } - ] + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:brewing_stand" + ] + }, + "criteria": { + "has_blaze_rod": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:blaze_rod" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:brewing_stand" + } + } + }, + "requirements": [ + [ + "has_blaze_rod", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:brewing_stand" + ] + }, + "criteria": { + "has_blaze_rod": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:blaze_rod" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:brewing_stand" + } + } + }, + "requirements": [ + [ + "has_blaze_rod", + "has_the_recipe" + ] + ] + } + } + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/andesite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/andesite.json index 4556a77fe..ac6e1a203 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/andesite.json +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/andesite.json @@ -1,87 +1,91 @@ { - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:andesite" - ] - }, - "criteria": { - "has_stone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:diorite" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:andesite" - } - } - }, - "requirements": [ - [ - "has_stone", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:andesite" - ] - }, - "criteria": { - "has_stone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:diorite" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:andesite" - } - } - }, - "requirements": [ - [ - "has_stone", - "has_the_recipe" - ] - ] - } - } - ] + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:andesite" + ] + }, + "criteria": { + "has_stone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:diorite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:andesite" + } + } + }, + "requirements": [ + [ + "has_stone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:andesite" + ] + }, + "criteria": { + "has_stone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:diorite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:andesite" + } + } + }, + "requirements": [ + [ + "has_stone", + "has_the_recipe" + ] + ] + } + } + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/diorite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/diorite.json index 6f430b4a7..b381f095d 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/diorite.json +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/diorite.json @@ -1,87 +1,91 @@ { - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:diorite" - ] - }, - "criteria": { - "has_quartz": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:quartz" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:diorite" - } - } - }, - "requirements": [ - [ - "has_quartz", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:diorite" - ] - }, - "criteria": { - "has_quartz": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:quartz" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:diorite" - } - } - }, - "requirements": [ - [ - "has_quartz", - "has_the_recipe" - ] - ] - } - } - ] + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:diorite" + ] + }, + "criteria": { + "has_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:quartz" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:diorite" + } + } + }, + "requirements": [ + [ + "has_quartz", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:diorite" + ] + }, + "criteria": { + "has_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:quartz" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:diorite" + } + } + }, + "requirements": [ + [ + "has_quartz", + "has_the_recipe" + ] + ] + } + } + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone.json deleted file mode 100644 index 1b13904cf..000000000 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:mossy_cobblestone" - ] - }, - "criteria": { - "has_vine": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:vine" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:mossy_cobblestone" - } - } - }, - "requirements": [ - [ - "has_vine", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:mossy_cobblestone" - ] - }, - "criteria": { - "has_vine": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:vine" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:mossy_cobblestone" - } - } - }, - "requirements": [ - [ - "has_vine", - "has_the_recipe" - ] - ] - } - } - ] -} diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_moss_block.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_moss_block.json new file mode 100644 index 000000000..7dfbc8f07 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_moss_block.json @@ -0,0 +1,91 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:mossy_cobblestone_from_moss_block" + ] + }, + "criteria": { + "has_moss_block": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:moss_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:mossy_cobblestone_from_moss_block" + } + } + }, + "requirements": [ + [ + "has_moss_block", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:mossy_cobblestone_from_moss_block" + ] + }, + "criteria": { + "has_moss_block": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:moss_block" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:mossy_cobblestone_from_moss_block" + } + } + }, + "requirements": [ + [ + "has_moss_block", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_vine.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_vine.json new file mode 100644 index 000000000..999a12461 --- /dev/null +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/mossy_cobblestone_from_vine.json @@ -0,0 +1,91 @@ +{ + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:mossy_cobblestone_from_vine" + ] + }, + "criteria": { + "has_vine": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:vine" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:mossy_cobblestone_from_vine" + } + } + }, + "requirements": [ + [ + "has_vine", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:mossy_cobblestone_from_vine" + ] + }, + "criteria": { + "has_vine": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:vine" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:mossy_cobblestone_from_vine" + } + } + }, + "requirements": [ + [ + "has_vine", + "has_the_recipe" + ] + ] + } + } + ] +} diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_andesite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_andesite.json index e62fc10d5..c201195c4 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_andesite.json +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_andesite.json @@ -1,46 +1,50 @@ { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:polished_andesite" - ] - }, - "criteria": { - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:andesite" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:polished_andesite" - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:polished_andesite" + ] + }, + "criteria": { + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:andesite" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:polished_andesite" + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_basalt.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_basalt.json index c1f16ec96..862f9d9ad 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_basalt.json +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_basalt.json @@ -1,46 +1,50 @@ { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:polished_basalt" - ] - }, - "criteria": { - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:basalt" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:polished_basalt" - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:polished_basalt" + ] + }, + "criteria": { + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:basalt" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:polished_basalt" + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_diorite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_diorite.json index 28c349dba..29b9d349d 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_diorite.json +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_diorite.json @@ -1,46 +1,50 @@ { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:polished_diorite" - ] - }, - "criteria": { - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:diorite" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:polished_diorite" - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:polished_diorite" + ] + }, + "criteria": { + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:diorite" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:polished_diorite" + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_granite.json b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_granite.json index a3362eb7a..5c91f2ae2 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_granite.json +++ b/src/main/resources/data/minecraft/advancements/recipes/building_blocks/polished_granite.json @@ -1,46 +1,50 @@ { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:polished_granite" - ] - }, - "criteria": { - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:granite" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:polished_granite" - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:polished_granite" + ] + }, + "criteria": { + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:granite" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:polished_granite" + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/combat/stone_sword.json b/src/main/resources/data/minecraft/advancements/recipes/combat/stone_sword.json index 51eba1c51..5adba3e59 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/combat/stone_sword.json +++ b/src/main/resources/data/minecraft/advancements/recipes/combat/stone_sword.json @@ -1,87 +1,87 @@ { - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_sword" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_sword" - } - } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_sword" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "minecraft:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_sword" - } - } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ] - } - } - ] + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_sword" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_sword" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_sword" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_sword" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json b/src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json index 5750272a2..8a8f9eece 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json +++ b/src/main/resources/data/minecraft/advancements/recipes/decorations/furnace.json @@ -1,87 +1,87 @@ { - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:furnace" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stone_crafting_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:furnace" - } - } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:furnace" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "minecraft:stone_crafting_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:furnace" - } - } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ] - } - } - ] + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:furnace" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stone_crafting_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:furnace" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:furnace" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:stone_crafting_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:furnace" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json index 8e25800c6..11dcab87e 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/dispenser.json @@ -1,87 +1,91 @@ { - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:dispenser" - ] - }, - "criteria": { - "has_bow": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:bow" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:dispenser" - } - } - }, - "requirements": [ - [ - "has_bow", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:dispenser" - ] - }, - "criteria": { - "has_bow": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:bow" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:dispenser" - } - } - }, - "requirements": [ - [ - "has_bow", - "has_the_recipe" - ] - ] - } - } - ] + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:dispenser" + ] + }, + "criteria": { + "has_bow": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:bow" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:dispenser" + } + } + }, + "requirements": [ + [ + "has_bow", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:dispenser" + ] + }, + "criteria": { + "has_bow": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:bow" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:dispenser" + } + } + }, + "requirements": [ + [ + "has_bow", + "has_the_recipe" + ] + ] + } + } + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json index a27c9088d..4b7a1b567 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/dropper.json @@ -1,87 +1,91 @@ { - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:dropper" - ] - }, - "criteria": { - "has_redstone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:redstone" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:dropper" - } - } - }, - "requirements": [ - [ - "has_redstone", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:dropper" - ] - }, - "criteria": { - "has_redstone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:redstone" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:dropper" - } - } - }, - "requirements": [ - [ - "has_redstone", - "has_the_recipe" - ] - ] - } - } - ] + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:dropper" + ] + }, + "criteria": { + "has_redstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:redstone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:dropper" + } + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:dropper" + ] + }, + "criteria": { + "has_redstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:redstone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:dropper" + } + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ] + } + } + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json index d1125b7eb..705902e68 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/lever.json @@ -1,87 +1,87 @@ { - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:lever" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:cobblestone_equivalents" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:lever" - } - } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:lever" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "forge:cobblestone" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:lever" - } - } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ] - } - } - ] + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:lever" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:cobblestone_equivalents" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:lever" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:lever" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:cobblestone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:lever" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json index d08e171f3..4a6eb8715 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/observer.json @@ -1,87 +1,91 @@ { - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:observer" - ] - }, - "criteria": { - "has_quartz": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:quartz" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:observer" - } - } - }, - "requirements": [ - [ - "has_quartz", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:observer" - ] - }, - "criteria": { - "has_quartz": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:quartz" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:observer" - } - } - }, - "requirements": [ - [ - "has_quartz", - "has_the_recipe" - ] - ] - } - } - ] + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:observer" + ] + }, + "criteria": { + "has_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:quartz" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:observer" + } + } + }, + "requirements": [ + [ + "has_quartz", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:observer" + ] + }, + "criteria": { + "has_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:quartz" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:observer" + } + } + }, + "requirements": [ + [ + "has_quartz", + "has_the_recipe" + ] + ] + } + } + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json b/src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json index 1ccf74a44..5360f2d6e 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json +++ b/src/main/resources/data/minecraft/advancements/recipes/redstone/piston.json @@ -1,87 +1,91 @@ { - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:piston" - ] - }, - "criteria": { - "has_redstone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:redstone" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:piston" - } - } - }, - "requirements": [ - [ - "has_redstone", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:piston" - ] - }, - "criteria": { - "has_redstone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:redstone" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:piston" - } - } - }, - "requirements": [ - [ - "has_redstone", - "has_the_recipe" - ] - ] - } - } - ] + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:piston" + ] + }, + "criteria": { + "has_redstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:redstone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:piston" + } + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:piston" + ] + }, + "criteria": { + "has_redstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:redstone" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:piston" + } + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ] + } + } + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_axe.json b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_axe.json index 8209c1959..0ae57241d 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_axe.json +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_axe.json @@ -1,87 +1,87 @@ { - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_axe" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_axe" - } - } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_axe" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "minecraft:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_axe" - } - } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ] - } - } - ] + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_axe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_axe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_axe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_axe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_hoe.json b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_hoe.json index e9a8ef862..435cbdf03 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_hoe.json +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_hoe.json @@ -1,87 +1,87 @@ { - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_hoe" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_hoe" - } - } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_hoe" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "minecraft:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_hoe" - } - } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ] - } - } - ] + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_hoe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_hoe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_hoe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_hoe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_pickaxe.json b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_pickaxe.json index cdad385e6..d4febc9f7 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_pickaxe.json +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_pickaxe.json @@ -1,87 +1,87 @@ { - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_pickaxe" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_pickaxe" - } - } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_pickaxe" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "minecraft:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_pickaxe" - } - } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ] - } - } - ] + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_pickaxe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_pickaxe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_pickaxe" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_pickaxe" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] } diff --git a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_shovel.json b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_shovel.json index 86e10b3a8..54d8ec221 100644 --- a/src/main/resources/data/minecraft/advancements/recipes/tools/stone_shovel.json +++ b/src/main/resources/data/minecraft/advancements/recipes/tools/stone_shovel.json @@ -1,87 +1,87 @@ { - "advancements": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_shovel" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_shovel" - } - } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ] - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "minecraft:stone_shovel" - ] - }, - "criteria": { - "has_cobblestone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "minecraft:stone_tool_materials" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "minecraft:stone_shovel" - } - } - }, - "requirements": [ - [ - "has_cobblestone", - "has_the_recipe" - ] - ] - } - } - ] + "advancements": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_shovel" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_shovel" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "minecraft:stone_shovel" + ] + }, + "criteria": { + "has_cobblestone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:stone_tool_materials" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:stone_shovel" + } + } + }, + "requirements": [ + [ + "has_cobblestone", + "has_the_recipe" + ] + ] + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/andesite.json b/src/main/resources/data/minecraft/recipes/andesite.json index b0136b9b3..e51cdd8cb 100644 --- a/src/main/resources/data/minecraft/recipes/andesite.json +++ b/src/main/resources/data/minecraft/recipes/andesite.json @@ -1,54 +1,54 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:diorite" - }, - { - "tag": "mineralogy:cobblestone_equivalents" - } - ], - "result": { - "item": "minecraft:andesite", - "count": 2 - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:diorite" - }, - { - "tag": "forge:cobblestone" - } - ], - "result": { - "item": "minecraft:andesite", - "count": 2 - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:diorite" + }, + { + "tag": "mineralogy:cobblestone_equivalents" + } + ], + "result": { + "item": "minecraft:andesite", + "count": 2 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:diorite" + }, + { + "tag": "forge:cobblestone" + } + ], + "result": { + "item": "minecraft:andesite", + "count": 2 + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/andesite_slab.json b/src/main/resources/data/minecraft/recipes/andesite_slab.json index 310f24434..83c96a134 100644 --- a/src/main/resources/data/minecraft/recipes/andesite_slab.json +++ b/src/main/resources/data/minecraft/recipes/andesite_slab.json @@ -1,54 +1,54 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "minecraft:andesite" - } - }, - "result": { - "item": "mineralogy:andesite_slab", - "count": 6 - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "minecraft:andesite" - } - }, - "result": { - "item": "minecraft:andesite_slab", - "count": 6 - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:andesite" + } + }, + "result": { + "item": "mineralogy:andesite_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:andesite" + } + }, + "result": { + "item": "minecraft:andesite_slab", + "count": 6 + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/andesite_slab_from_andesite_stonecutting.json b/src/main/resources/data/minecraft/recipes/andesite_slab_from_andesite_stonecutting.json index eb00f473a..31a74d211 100644 --- a/src/main/resources/data/minecraft/recipes/andesite_slab_from_andesite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/andesite_slab_from_andesite_stonecutting.json @@ -1,40 +1,40 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:andesite" - }, - "result": "mineralogy:andesite_slab", - "count": 2 - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - } - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:andesite" - }, - "result": "minecraft:andesite_slab", - "count": 2 - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:andesite" + }, + "result": "mineralogy:andesite_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:andesite" + }, + "result": "minecraft:andesite_slab", + "count": 2 + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/brewing_stand.json b/src/main/resources/data/minecraft/recipes/brewing_stand.json index ed9cd34ab..492aaaad8 100644 --- a/src/main/resources/data/minecraft/recipes/brewing_stand.json +++ b/src/main/resources/data/minecraft/recipes/brewing_stand.json @@ -1,60 +1,60 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " B ", - "###" - ], - "key": { - "B": { - "item": "minecraft:blaze_rod" - }, - "#": { - "tag": "mineralogy:stone_crafting_materials" - } - }, - "result": { - "item": "minecraft:brewing_stand" - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " B ", - "###" - ], - "key": { - "B": { - "item": "minecraft:blaze_rod" - }, - "#": { - "tag": "minecraft:stone_crafting_materials" - } - }, - "result": { - "item": "minecraft:brewing_stand" - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " B ", + "###" + ], + "key": { + "B": { + "item": "minecraft:blaze_rod" + }, + "#": { + "tag": "mineralogy:stone_crafting_materials" + } + }, + "result": { + "item": "minecraft:brewing_stand" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " B ", + "###" + ], + "key": { + "B": { + "item": "minecraft:blaze_rod" + }, + "#": { + "tag": "minecraft:stone_crafting_materials" + } + }, + "result": { + "item": "minecraft:brewing_stand" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/diorite.json b/src/main/resources/data/minecraft/recipes/diorite.json index 483970b92..36069945d 100644 --- a/src/main/resources/data/minecraft/recipes/diorite.json +++ b/src/main/resources/data/minecraft/recipes/diorite.json @@ -1,62 +1,62 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "CQ", - "QC" - ], - "key": { - "Q": { - "item": "minecraft:quartz" - }, - "C": { - "tag": "mineralogy:cobblestone_equivalents" - } - }, - "result": { - "item": "minecraft:diorite", - "count": 2 - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "CQ", - "QC" - ], - "key": { - "Q": { - "item": "minecraft:quartz" - }, - "C": { - "tag": "forge:cobblestone" - } - }, - "result": { - "item": "minecraft:diorite", - "count": 2 - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "CQ", + "QC" + ], + "key": { + "Q": { + "item": "minecraft:quartz" + }, + "C": { + "tag": "mineralogy:cobblestone_equivalents" + } + }, + "result": { + "item": "minecraft:diorite", + "count": 2 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "CQ", + "QC" + ], + "key": { + "Q": { + "item": "minecraft:quartz" + }, + "C": { + "tag": "forge:cobblestone" + } + }, + "result": { + "item": "minecraft:diorite", + "count": 2 + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/diorite_slab.json b/src/main/resources/data/minecraft/recipes/diorite_slab.json index cbb5384a6..d82220d8a 100644 --- a/src/main/resources/data/minecraft/recipes/diorite_slab.json +++ b/src/main/resources/data/minecraft/recipes/diorite_slab.json @@ -1,54 +1,54 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "minecraft:diorite" - } - }, - "result": { - "item": "mineralogy:diorite_slab", - "count": 6 - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "minecraft:diorite" - } - }, - "result": { - "item": "minecraft:diorite_slab", - "count": 6 - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:diorite" + } + }, + "result": { + "item": "mineralogy:diorite_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:diorite" + } + }, + "result": { + "item": "minecraft:diorite_slab", + "count": 6 + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/diorite_slab_from_diorite_stonecutting.json b/src/main/resources/data/minecraft/recipes/diorite_slab_from_diorite_stonecutting.json index 873148bed..7718a7213 100644 --- a/src/main/resources/data/minecraft/recipes/diorite_slab_from_diorite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/diorite_slab_from_diorite_stonecutting.json @@ -1,40 +1,40 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:diorite" - }, - "result": "mineralogy:diorite_slab", - "count": 2 - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - } - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:diorite" - }, - "result": "minecraft:diorite_slab", - "count": 2 - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:diorite" + }, + "result": "mineralogy:diorite_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:diorite" + }, + "result": "minecraft:diorite_slab", + "count": 2 + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/dispenser.json b/src/main/resources/data/minecraft/recipes/dispenser.json index 3bfe18a6f..456aa9adb 100644 --- a/src/main/resources/data/minecraft/recipes/dispenser.json +++ b/src/main/resources/data/minecraft/recipes/dispenser.json @@ -1,68 +1,68 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#X#", - "#R#" - ], - "key": { - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "mineralogy:cobblestone_equivalents" - }, - "X": { - "item": "minecraft:bow" - } - }, - "result": { - "item": "minecraft:dispenser" - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#X#", - "#R#" - ], - "key": { - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "forge:cobblestone" - }, - "X": { - "item": "minecraft:bow" - } - }, - "result": { - "item": "minecraft:dispenser" - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#X#", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "mineralogy:cobblestone_equivalents" + }, + "X": { + "item": "minecraft:bow" + } + }, + "result": { + "item": "minecraft:dispenser" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#X#", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "forge:cobblestone" + }, + "X": { + "item": "minecraft:bow" + } + }, + "result": { + "item": "minecraft:dispenser" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/dropper.json b/src/main/resources/data/minecraft/recipes/dropper.json index 0cdcea945..2d027e2d9 100644 --- a/src/main/resources/data/minecraft/recipes/dropper.json +++ b/src/main/resources/data/minecraft/recipes/dropper.json @@ -1,62 +1,62 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "# #", - "#R#" - ], - "key": { - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "mineralogy:cobblestone_equivalents" - } - }, - "result": { - "item": "minecraft:dropper" - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "# #", - "#R#" - ], - "key": { - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "forge:cobblestone" - } - }, - "result": { - "item": "minecraft:dropper" - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "# #", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "mineralogy:cobblestone_equivalents" + } + }, + "result": { + "item": "minecraft:dropper" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "# #", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "forge:cobblestone" + } + }, + "result": { + "item": "minecraft:dropper" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/furnace.json b/src/main/resources/data/minecraft/recipes/furnace.json index 2470b0800..6815bb49c 100644 --- a/src/main/resources/data/minecraft/recipes/furnace.json +++ b/src/main/resources/data/minecraft/recipes/furnace.json @@ -1,56 +1,56 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "# #", - "###" - ], - "key": { - "#": { - "tag": "mineralogy:stone_crafting_materials" - } - }, - "result": { - "item": "minecraft:furnace" - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "# #", - "###" - ], - "key": { - "#": { - "tag": "minecraft:stone_crafting_materials" - } - }, - "result": { - "item": "minecraft:furnace" - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "# #", + "###" + ], + "key": { + "#": { + "tag": "mineralogy:stone_crafting_materials" + } + }, + "result": { + "item": "minecraft:furnace" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "# #", + "###" + ], + "key": { + "#": { + "tag": "minecraft:stone_crafting_materials" + } + }, + "result": { + "item": "minecraft:furnace" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/granite_slab.json b/src/main/resources/data/minecraft/recipes/granite_slab.json index d82478d8b..398cc2df4 100644 --- a/src/main/resources/data/minecraft/recipes/granite_slab.json +++ b/src/main/resources/data/minecraft/recipes/granite_slab.json @@ -1,54 +1,54 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "minecraft:granite" - } - }, - "result": { - "item": "mineralogy:granite_slab", - "count": 6 - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "minecraft:granite" - } - }, - "result": { - "item": "minecraft:granite_slab", - "count": 6 - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:granite" + } + }, + "result": { + "item": "mineralogy:granite_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:granite" + } + }, + "result": { + "item": "minecraft:granite_slab", + "count": 6 + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/granite_slab_from_granite_stonecutting.json b/src/main/resources/data/minecraft/recipes/granite_slab_from_granite_stonecutting.json index 953648af7..318e4db08 100644 --- a/src/main/resources/data/minecraft/recipes/granite_slab_from_granite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/granite_slab_from_granite_stonecutting.json @@ -1,40 +1,40 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:granite" - }, - "result": "mineralogy:granite_slab", - "count": 2 - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - } - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:granite" - }, - "result": "minecraft:granite_slab", - "count": 2 - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:granite" + }, + "result": "mineralogy:granite_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:granite" + }, + "result": "minecraft:granite_slab", + "count": 2 + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/lever.json b/src/main/resources/data/minecraft/recipes/lever.json index f11de4848..3cb1ea872 100644 --- a/src/main/resources/data/minecraft/recipes/lever.json +++ b/src/main/resources/data/minecraft/recipes/lever.json @@ -1,60 +1,60 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "#" - ], - "key": { - "#": { - "tag": "mineralogy:cobblestone_equivalents" - }, - "X": { - "item": "minecraft:stick" - } - }, - "result": { - "item": "minecraft:lever" - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "#" - ], - "key": { - "#": { - "tag": "forge:cobblestone" - }, - "X": { - "item": "minecraft:stick" - } - }, - "result": { - "item": "minecraft:lever" - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "#" + ], + "key": { + "#": { + "tag": "mineralogy:cobblestone_equivalents" + }, + "X": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "minecraft:lever" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "#" + ], + "key": { + "#": { + "tag": "forge:cobblestone" + }, + "X": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "minecraft:lever" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/mossy_cobblestone.json b/src/main/resources/data/minecraft/recipes/mossy_cobblestone.json deleted file mode 100644 index c589f8f22..000000000 --- a/src/main/resources/data/minecraft/recipes/mossy_cobblestone.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:cobblestone_equivalents" - }, - { - "item": "minecraft:vine" - } - ], - "result": { - "item": "minecraft:mossy_cobblestone" - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:cobblestone" - }, - { - "item": "minecraft:vine" - } - ], - "result": { - "item": "minecraft:mossy_cobblestone" - } - } - } - ] -} diff --git a/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json b/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json index 209c9a281..7749dbfa8 100644 --- a/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json +++ b/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json @@ -1,15 +1,54 @@ { - "type": "minecraft:crafting_shapeless", - "group": "mossy_cobblestone", - "ingredients": [ - { - "tag": "forge:cobblestone" - }, - { - "item": "minecraft:moss_block" - } - ], - "result": { - "item": "minecraft:mossy_cobblestone" - } + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "group": "mossy_cobblestone", + "ingredients": [ + { + "tag": "mineralogy:cobblestone_equivalents" + }, + { + "item": "minecraft:moss_block" + } + ], + "result": { + "item": "minecraft:mossy_cobblestone" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "group": "mossy_cobblestone", + "ingredients": [ + { + "tag": "forge:cobblestone" + }, + { + "item": "minecraft:moss_block" + } + ], + "result": { + "item": "minecraft:mossy_cobblestone" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json b/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json new file mode 100644 index 000000000..d99d8314c --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json @@ -0,0 +1,54 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "group": "mossy_cobblestone", + "ingredients": [ + { + "tag": "mineralogy:cobblestone_equivalents" + }, + { + "item": "minecraft:vine" + } + ], + "result": { + "item": "minecraft:mossy_cobblestone" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shapeless", + "group": "mossy_cobblestone", + "ingredients": [ + { + "tag": "forge:cobblestone" + }, + { + "item": "minecraft:vine" + } + ], + "result": { + "item": "minecraft:mossy_cobblestone" + } + } + } + ] +} diff --git a/src/main/resources/data/minecraft/recipes/observer.json b/src/main/resources/data/minecraft/recipes/observer.json index 255a0eb6d..cf5dee25e 100644 --- a/src/main/resources/data/minecraft/recipes/observer.json +++ b/src/main/resources/data/minecraft/recipes/observer.json @@ -1,68 +1,68 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "RRQ", - "###" - ], - "key": { - "Q": { - "item": "minecraft:quartz" - }, - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "mineralogy:cobblestone_equivalents" - } - }, - "result": { - "item": "minecraft:observer" - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "RRQ", - "###" - ], - "key": { - "Q": { - "item": "minecraft:quartz" - }, - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "forge:cobblestone" - } - }, - "result": { - "item": "minecraft:observer" - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "RRQ", + "###" + ], + "key": { + "Q": { + "item": "minecraft:quartz" + }, + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "mineralogy:cobblestone_equivalents" + } + }, + "result": { + "item": "minecraft:observer" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "RRQ", + "###" + ], + "key": { + "Q": { + "item": "minecraft:quartz" + }, + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "forge:cobblestone" + } + }, + "result": { + "item": "minecraft:observer" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/piston.json b/src/main/resources/data/minecraft/recipes/piston.json index ce04e3121..7ff6271de 100644 --- a/src/main/resources/data/minecraft/recipes/piston.json +++ b/src/main/resources/data/minecraft/recipes/piston.json @@ -1,74 +1,74 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "TTT", - "#X#", - "#R#" - ], - "key": { - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "mineralogy:cobblestone_equivalents" - }, - "T": { - "tag": "minecraft:planks" - }, - "X": { - "item": "minecraft:iron_ingot" - } - }, - "result": { - "item": "minecraft:piston" - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "TTT", - "#X#", - "#R#" - ], - "key": { - "R": { - "item": "minecraft:redstone" - }, - "#": { - "tag": "forge:cobblestone" - }, - "T": { - "tag": "minecraft:planks" - }, - "X": { - "item": "minecraft:iron_ingot" - } - }, - "result": { - "item": "minecraft:piston" - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "TTT", + "#X#", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "mineralogy:cobblestone_equivalents" + }, + "T": { + "tag": "minecraft:planks" + }, + "X": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "item": "minecraft:piston" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "TTT", + "#X#", + "#R#" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "#": { + "tag": "forge:cobblestone" + }, + "T": { + "tag": "minecraft:planks" + }, + "X": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "item": "minecraft:piston" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/polished_andesite.json b/src/main/resources/data/minecraft/recipes/polished_andesite.json index e712c2ae9..362310f4a 100644 --- a/src/main/resources/data/minecraft/recipes/polished_andesite.json +++ b/src/main/resources/data/minecraft/recipes/polished_andesite.json @@ -1,15 +1,15 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:andesite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "minecraft:polished_andesite", - "count": 1 - } + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:andesite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "minecraft:polished_andesite", + "count": 1 + } } diff --git a/src/main/resources/data/minecraft/recipes/polished_andesite_slab.json b/src/main/resources/data/minecraft/recipes/polished_andesite_slab.json index b5821e0cc..47dd4edf6 100644 --- a/src/main/resources/data/minecraft/recipes/polished_andesite_slab.json +++ b/src/main/resources/data/minecraft/recipes/polished_andesite_slab.json @@ -1,54 +1,54 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "minecraft:polished_andesite" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_slab", - "count": 6 - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "minecraft:polished_andesite" - } - }, - "result": { - "item": "minecraft:polished_andesite_slab", - "count": 6 - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_andesite" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_andesite" + } + }, + "result": { + "item": "minecraft:polished_andesite_slab", + "count": 6 + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_andesite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_andesite_stonecutting.json index 542e1d3ad..154525a4e 100644 --- a/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_andesite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_andesite_stonecutting.json @@ -1,40 +1,40 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:andesite" - }, - "result": "mineralogy:andesite_smooth_slab", - "count": 2 - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:andesite" - }, - "result": "minecraft:polished_andesite_slab", - "count": 2 - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:andesite" + }, + "result": "mineralogy:andesite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:andesite" + }, + "result": "minecraft:polished_andesite_slab", + "count": 2 + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_polished_andesite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_polished_andesite_stonecutting.json index 80520d45e..694788bb6 100644 --- a/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_polished_andesite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/polished_andesite_slab_from_polished_andesite_stonecutting.json @@ -1,40 +1,40 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:polished_andesite" - }, - "result": "mineralogy:andesite_smooth_slab", - "count": 2 - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:polished_andesite" - }, - "result": "minecraft:polished_andesite_slab", - "count": 2 - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_andesite" + }, + "result": "mineralogy:andesite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_andesite" + }, + "result": "minecraft:polished_andesite_slab", + "count": 2 + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/polished_basalt.json b/src/main/resources/data/minecraft/recipes/polished_basalt.json index 458afd4ae..5d4f6ee5e 100644 --- a/src/main/resources/data/minecraft/recipes/polished_basalt.json +++ b/src/main/resources/data/minecraft/recipes/polished_basalt.json @@ -1,15 +1,15 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:basalt" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "minecraft:polished_basalt", - "count": 1 - } + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:basalt" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "minecraft:polished_basalt", + "count": 1 + } } diff --git a/src/main/resources/data/minecraft/recipes/polished_diorite.json b/src/main/resources/data/minecraft/recipes/polished_diorite.json index a85d79608..cec14689a 100644 --- a/src/main/resources/data/minecraft/recipes/polished_diorite.json +++ b/src/main/resources/data/minecraft/recipes/polished_diorite.json @@ -1,15 +1,15 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:diorite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "minecraft:polished_diorite", - "count": 1 - } + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:diorite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "minecraft:polished_diorite", + "count": 1 + } } diff --git a/src/main/resources/data/minecraft/recipes/polished_diorite_slab.json b/src/main/resources/data/minecraft/recipes/polished_diorite_slab.json index c1b482c10..41f6487f8 100644 --- a/src/main/resources/data/minecraft/recipes/polished_diorite_slab.json +++ b/src/main/resources/data/minecraft/recipes/polished_diorite_slab.json @@ -1,54 +1,54 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "minecraft:polished_diorite" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_slab", - "count": 6 - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "minecraft:polished_diorite" - } - }, - "result": { - "item": "minecraft:polished_diorite_slab", - "count": 6 - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_diorite" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_diorite" + } + }, + "result": { + "item": "minecraft:polished_diorite_slab", + "count": 6 + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_diorite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_diorite_stonecutting.json index 9a99b5856..2dc3ffbc8 100644 --- a/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_diorite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_diorite_stonecutting.json @@ -1,40 +1,40 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:diorite" - }, - "result": "mineralogy:diorite_smooth_slab", - "count": 2 - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:diorite" - }, - "result": "minecraft:polished_diorite_slab", - "count": 2 - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:diorite" + }, + "result": "mineralogy:diorite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:diorite" + }, + "result": "minecraft:polished_diorite_slab", + "count": 2 + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_polished_diorite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_polished_diorite_stonecutting.json index 8b59ba1dd..d96c5fa9d 100644 --- a/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_polished_diorite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/polished_diorite_slab_from_polished_diorite_stonecutting.json @@ -1,40 +1,40 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:polished_diorite" - }, - "result": "mineralogy:diorite_smooth_slab", - "count": 2 - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:polished_diorite" - }, - "result": "minecraft:polished_diorite_slab", - "count": 2 - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_diorite" + }, + "result": "mineralogy:diorite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_diorite" + }, + "result": "minecraft:polished_diorite_slab", + "count": 2 + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/polished_granite.json b/src/main/resources/data/minecraft/recipes/polished_granite.json index c714cfad2..5edeb5a84 100644 --- a/src/main/resources/data/minecraft/recipes/polished_granite.json +++ b/src/main/resources/data/minecraft/recipes/polished_granite.json @@ -1,15 +1,15 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:granite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "minecraft:polished_granite", - "count": 1 - } + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:granite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "minecraft:polished_granite", + "count": 1 + } } diff --git a/src/main/resources/data/minecraft/recipes/polished_granite_slab.json b/src/main/resources/data/minecraft/recipes/polished_granite_slab.json index 42266605b..56beae068 100644 --- a/src/main/resources/data/minecraft/recipes/polished_granite_slab.json +++ b/src/main/resources/data/minecraft/recipes/polished_granite_slab.json @@ -1,54 +1,54 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "minecraft:polished_granite" - } - }, - "result": { - "item": "mineralogy:granite_smooth_slab", - "count": 6 - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "minecraft:polished_granite" - } - }, - "result": { - "item": "minecraft:polished_granite_slab", - "count": 6 - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_granite" + } + }, + "result": { + "item": "mineralogy:granite_smooth_slab", + "count": 6 + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "minecraft:polished_granite" + } + }, + "result": { + "item": "minecraft:polished_granite_slab", + "count": 6 + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_granite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_granite_stonecutting.json index 592945540..bf8e93316 100644 --- a/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_granite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_granite_stonecutting.json @@ -1,40 +1,40 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:granite" - }, - "result": "mineralogy:granite_smooth_slab", - "count": 2 - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:granite" - }, - "result": "minecraft:polished_granite_slab", - "count": 2 - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:granite" + }, + "result": "mineralogy:granite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:granite" + }, + "result": "minecraft:polished_granite_slab", + "count": 2 + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_polished_granite_stonecutting.json b/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_polished_granite_stonecutting.json index 8aea0521d..c3fe951d0 100644 --- a/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_polished_granite_stonecutting.json +++ b/src/main/resources/data/minecraft/recipes/polished_granite_slab_from_polished_granite_stonecutting.json @@ -1,40 +1,40 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:polished_granite" - }, - "result": "mineralogy:granite_smooth_slab", - "count": 2 - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "minecraft:polished_granite" - }, - "result": "minecraft:polished_granite_slab", - "count": 2 - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_granite" + }, + "result": "mineralogy:granite_smooth_slab", + "count": 2 + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_granite" + }, + "result": "minecraft:polished_granite_slab", + "count": 2 + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/stone_axe.json b/src/main/resources/data/minecraft/recipes/stone_axe.json index 469ad5e31..d56421e42 100644 --- a/src/main/resources/data/minecraft/recipes/stone_axe.json +++ b/src/main/resources/data/minecraft/recipes/stone_axe.json @@ -1,62 +1,62 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "X#", - " #" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "X": { - "tag": "mineralogy:stone_tool_materials" - } - }, - "result": { - "item": "minecraft:stone_axe" - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "X#", - " #" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "X": { - "tag": "minecraft:stone_tool_materials" - } - }, - "result": { - "item": "minecraft:stone_axe" - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "X#", + " #" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_axe" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "X#", + " #" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_axe" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/stone_hoe.json b/src/main/resources/data/minecraft/recipes/stone_hoe.json index 6a589ec18..d42d22cb4 100644 --- a/src/main/resources/data/minecraft/recipes/stone_hoe.json +++ b/src/main/resources/data/minecraft/recipes/stone_hoe.json @@ -1,62 +1,62 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " #", - " #" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "X": { - "tag": "mineralogy:stone_tool_materials" - } - }, - "result": { - "item": "minecraft:stone_hoe" - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " #", - " #" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "X": { - "tag": "minecraft:stone_tool_materials" - } - }, - "result": { - "item": "minecraft:stone_hoe" - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " #", + " #" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_hoe" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " #", + " #" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_hoe" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/stone_pickaxe.json b/src/main/resources/data/minecraft/recipes/stone_pickaxe.json index 5e4e4306e..9ceee3d7b 100644 --- a/src/main/resources/data/minecraft/recipes/stone_pickaxe.json +++ b/src/main/resources/data/minecraft/recipes/stone_pickaxe.json @@ -1,62 +1,62 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " # ", - " # " - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "X": { - "tag": "mineralogy:stone_tool_materials" - } - }, - "result": { - "item": "minecraft:stone_pickaxe" - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " # ", - " # " - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "X": { - "tag": "minecraft:stone_tool_materials" - } - }, - "result": { - "item": "minecraft:stone_pickaxe" - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " # ", + " # " + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_pickaxe" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " # ", + " # " + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_pickaxe" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/stone_shovel.json b/src/main/resources/data/minecraft/recipes/stone_shovel.json index ebe9b31f5..21d1d2c1b 100644 --- a/src/main/resources/data/minecraft/recipes/stone_shovel.json +++ b/src/main/resources/data/minecraft/recipes/stone_shovel.json @@ -1,62 +1,62 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "#", - "#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "X": { - "tag": "mineralogy:stone_tool_materials" - } - }, - "result": { - "item": "minecraft:stone_shovel" - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "#", - "#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "X": { - "tag": "minecraft:stone_tool_materials" - } - }, - "result": { - "item": "minecraft:stone_shovel" - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "#", + "#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_shovel" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "#", + "#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_shovel" + } + } + } + ] } diff --git a/src/main/resources/data/minecraft/recipes/stone_sword.json b/src/main/resources/data/minecraft/recipes/stone_sword.json index 5dfe10216..19d45c5d6 100644 --- a/src/main/resources/data/minecraft/recipes/stone_sword.json +++ b/src/main/resources/data/minecraft/recipes/stone_sword.json @@ -1,62 +1,62 @@ { - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "X": { - "tag": "mineralogy:stone_tool_materials" - } - }, - "result": { - "item": "minecraft:stone_sword" - } - } - }, - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "mineralogy:config", - "flag": "COBBLESTONE_EQUIVILENT" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "X": { - "tag": "minecraft:stone_tool_materials" - } - }, - "result": { - "item": "minecraft:stone_sword" - } - } - } - ] + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "mineralogy:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_sword" + } + } + }, + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "mineralogy:config", + "flag": "COBBLESTONE_EQUIVILENT" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "result": { + "item": "minecraft:stone_sword" + } + } + } + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json index 761920bd4..e334b0b91 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/amphibolite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_block_polishing.json index 87f8e4105..799daa8f0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json index c4888bf7d..27173e80e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/amphibolite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/amphibolite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab.json index 84efde99e..666bfb8e5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_polishing.json index 92cbad4eb..d35bda430 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_recombination.json index 23a2d2ab8..509a125c2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json index b1f233bd6..c59d0c4d4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/amphibolite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs_polishing.json index 3cd6e4cd2..67dc69180 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json index 73f3b0a6e..e5e2e85d0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/amphibolite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall_polishing.json index 321d91277..9b832b0a4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json index 862485ea9..47d16830d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/amphibolite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json index 274546f5b..4a7002a77 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/amphibolite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/amphibolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_brick_slab_recombination.json index 7c8892582..717770ff3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slab_recombination.json index 3a72d8df1..aa68f4a42 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slabs_to_brick.json index 1b0d83fc1..ce5e04a79 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_stairs_to_brick.json index 40f71fb52..e3d85e98f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_walls_to_brick.json index 37c0b8563..ed59a87f1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_polishing.json index 877a75c5a..c7b5e8b0f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_recombination.json index dc26d5dd8..4c0778f5b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slabs_to_brick.json index 842a4722e..41c5823d4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_polishing.json index 828993833..375cf06ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_to_brick.json index 0069aa19d..f4f56e5cc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_wall_polishing.json index 14b8436f4..b639d0fc7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_walls_to_brick.json index 5c468f626..90ec3265f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_axe.json index 5067c94e0..edb719955 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_blank.json index e8a914569..dbef3226c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_cross.json index e6d5e9066..39f11b1bd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hammer.json index 33d4e9773..9129b338a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hoe.json index df6ddf675..64c5827b6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_horizontal.json index 366c28607..b4638df74 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_i.json index ca5e555af..8b93cd5e0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_left.json index c782338bf..734c1a415 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_pickaxe.json index 3777a75b5..a30d4e8b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_plus.json index 3aecb465f..46ece6543 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_right.json index fd7f9b09c..c70ddd243 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_sword.json index 904b9718d..372d21ca9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_vertical.json index 6d3ed93e6..0be3d1a51 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_slab.json index 1932499d4..71b210815 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:amphibolite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json index 7d539c0fb..ba4f39b6e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/amphibolite" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json index 4a97581d0..3920eddd2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/amphibolite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json index 889d1ef75..75995a083 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/amphibolite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/amphibolite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_slab.json index b50184c56..330c79152 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json index 165058463..c211d85bd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/amphibolite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json index 76cc49e94..a7514ea1f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/amphibolite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json index a032a67ef..7a059acd7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/amphibolite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/amphibolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_slab.json index 30148e7e0..89385854c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json index 28cf3bd75..d475e202c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/amphibolite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json index 4b33cdf33..e1c0c5f75 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/amphibolite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json index 18e859e38..a92a06447 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/amphibolite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_to_stone.json index c42d37152..873844aa5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:amphibolite_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:amphibolite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:amphibolite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:amphibolite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json index 303f2b278..4e23db22c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/amphibolite_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:amphibolite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:amphibolite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/amphibolite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:amphibolite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:amphibolite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/amphibolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json index 4e18d1a62..d6c8754bb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/andesite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_block_polishing.json index f26e7481b..af8db5c2c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json index b989151a7..2a05ff509 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/andesite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/andesite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab.json index f4dffb46e..6f635fc61 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_polishing.json index 3bb833e12..ce0d0a87c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_recombination.json index 0b457994c..831da7933 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json index 00e347e83..f41e3ea25 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/andesite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs_polishing.json index 9188c0655..c19c53fd1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json index 1ca49dca0..c644b8210 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/andesite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall_polishing.json index 03a1fb15a..fe7172659 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json index 20341397f..89b36f284 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:andesite_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/andesite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json index 097ccc6e7..243f26814 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/andesite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/andesite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_brick_slab_recombination.json index 6529081d9..7f1cc49e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slab_recombination.json index 1743c81f5..fbca5eba0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slabs_to_brick.json index 54ff75d9a..56c6467e7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_stairs_to_brick.json index 6616bfdcd..8769b4326 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_walls_to_brick.json index efeae447e..321cc0b6c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_polishing.json index ddc7536af..d464b8e53 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_recombination.json index ca6fe0a24..f7d7a2841 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slabs_to_brick.json index 27ced5dbc..2b1c606ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_polishing.json index 3abbd19d4..3f5bbcd7b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_to_brick.json index e20dd9bbf..83bd65279 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_wall_polishing.json index e7d0466b7..0195b869a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_walls_to_brick.json index 7b9645965..90a41bae4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_axe.json index 466a2a77e..2cdf222ce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json index d97ae1239..d3d1a1f81 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_blank.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/andesite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_cross.json index 2ef51c77d..6a1074b4f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hammer.json index df2fecf41..c8a7d3290 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hoe.json index 6f6646e6b..739fd67b8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_horizontal.json index 859c57b2d..858f1e700 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_i.json index 5e128bfa5..df27aa16d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_left.json index 3a891c4e6..90b2200f9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_pickaxe.json index abf33761d..444b2bc6d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_plus.json index 231f0c54b..17c3d1e3d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_right.json index 8d835eb21..8c73f4eb7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_sword.json index 1fc256647..a485aea95 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_vertical.json index 8258451f3..ac9b7ea28 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab.json index 2c409801d..d33e54aea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:andesite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_from_vanilla.json index 9e67eb1ca..9d693c9b4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_from_vanilla.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:andesite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_slab_from_vanilla" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_slab_from_vanilla" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:andesite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:andesite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_to_vanilla.json index 9753e2017..494014316 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_slab_to_vanilla.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:andesite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_slab_to_vanilla" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_slab_to_vanilla" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth.json index 22daa0960..46d78463a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth.json @@ -1,51 +1,55 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/andesite" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json index 8e770b798..cc90f96bb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/andesite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json index 331d01027..b94fe2ae4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/andesite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/andesite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_slab.json index ff8705cda..7edf12360 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json index 79afc7369..f4f70b7c8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/andesite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json index 94d456028..4acd60a59 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/andesite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json index 62bc78958..1ae828cc7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/andesite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/andesite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab.json index c0a26e442..8ca880d5f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_from_vanilla.json index 304945bf7..86eb6fdc2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_from_vanilla.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_andesite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_slab_from_vanilla" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_slab_from_vanilla" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:polished_andesite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_andesite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:polished_andesite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_to_vanilla.json index 4c0245694..15eba1603 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_slab_to_vanilla.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_andesite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_slab_to_vanilla" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_slab_to_vanilla" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_andesite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_stairs.json index 99a8b2c3b..f5286e5b0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_stairs.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json index 1845e9105..b92eb9b73 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/andesite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/andesite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_stairs.json index 532e9aa23..7bc6cd011 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_stairs.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:andesite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_to_stone.json index c73e2d651..8979aa47a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:andesite_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:andesite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:andesite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/andesite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/andesite_wall.json index e6f85bb46..e69afdf71 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/andesite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/andesite_wall.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:andesite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:andesite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:andesite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:andesite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:andesite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:andesite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json index e474731e6..0cf45f217 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basalt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_block_polishing.json index 51c95df57..bf7333669 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json index d0e44e667..292e085be 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/basalt/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basalt/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab.json index dd60c508d..524076659 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_polishing.json index 89be8cf51..3c499418b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_recombination.json index bbc43b3a5..d11bae02f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json index e2e0ae8d2..862c1c3b4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basalt/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs_polishing.json index 5641a1236..23e9a466a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json index 38a465623..c5f9fafe1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basalt/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall_polishing.json index 8fbd587b5..eb530a869 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json index 751e4b621..246f456a3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:basalt_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basalt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json index 5f2bcbac8..75937e579 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/basalt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basalt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_brick_slab_recombination.json index 19fcc951d..d2b5d1dbb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slab_recombination.json index 8d62c08f6..7dc4626fc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slabs_to_brick.json index ff293ad66..6930f8371 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_stairs_to_brick.json index 7fedb5116..b6288b53d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_walls_to_brick.json index 2ceb39669..ec0fa0853 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_polishing.json index ae09d7ce2..d1215cf76 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_recombination.json index 7616e4ad7..5ad5507d2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slabs_to_brick.json index 247164e81..b13fcae2d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_polishing.json index ffaf8968e..ff2060f7c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_to_brick.json index 17b41634b..b25a3b5e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_wall_polishing.json index b0ef38112..2d9d0b1f7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_walls_to_brick.json index 440ff2a71..0d9e63023 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_axe.json index 1bf9a7773..f2b1ecbaf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json index 4c11e557a..68da9a9a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_blank.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basalt/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_cross.json index 7e965112a..a0f660f0e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hammer.json index 8c9fb9112..3fc99847a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hoe.json index b3da2dca4..afb006861 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_horizontal.json index c551ae4ad..5a7c94034 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_i.json index 58c652393..2e9e67f61 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_left.json index 440af66b6..93ce1b31c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_pickaxe.json index 534f15b6b..3fe245eaa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_plus.json index 5a6899d08..00beeff1a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_right.json index 231fc3a1e..b410e0d9d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_sword.json index 4a9594dec..bf15eb288 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_vertical.json index 4ffd824d6..76a1f0445 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json index 0b0bfd323..d3b14a55b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_slab.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basalt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth.json index 63930f7cb..0a1999ddb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth.json @@ -1,51 +1,55 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/basalt" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json index 68783984d..ee1b61c92 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basalt/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json index 92dc76139..c99b2c79c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/basalt/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basalt/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_slab.json index 22cea8773..721699f83 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json index 966e96821..cdc5fb115 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basalt/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json index 53ee64524..e411c5664 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basalt/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json index 657af34d6..ff71e1011 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/basalt/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basalt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json index 95793bf15..18282319c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_slab.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basalt/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json index 3f0b47c9c..c3d3e44f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basalt/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json index f44f84a63..90b120d0f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basalt/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json index 3bc918bff..27e4de6c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basalt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_to_stone.json index c10bf4c34..179a30eed 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:basalt_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basalt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:basalt_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basalt" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json index 3aeaa6441..24eaa7553 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basalt_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basalt_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basalt_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basalt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basalt_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basalt_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basalt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json index 296b5ff03..780b17fd3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basaltic_glass" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_block_polishing.json index aad208da8..5ae863fb8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json index 49b8f56e7..fda3096ea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/basaltic_glass/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basaltic_glass/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab.json index d64fab656..d562f7022 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_polishing.json index ad5290a13..5ef5fb950 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_recombination.json index fc9656a7c..812087a4f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json index 61f06cc5f..349f965df 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basaltic_glass/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs_polishing.json index 25d19596a..ac639e88b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json index 93798d054..2a8289b1b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basaltic_glass/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall_polishing.json index 20834b33b..28db5a95c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json index a9d08d00a..d12c6492c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basaltic_glass" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json index 088d1736e..eaf4e224f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/basaltic_glass" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basaltic_glass" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_brick_slab_recombination.json index af58fb62d..4f1864a46 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slab_recombination.json index a9d0d3d6c..2976bcc2b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slabs_to_brick.json index ff632a327..9a2ca3203 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_stairs_to_brick.json index 2e94a5040..86f620075 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_walls_to_brick.json index 6fa0ccf31..90c1f43b6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_polishing.json index 62315f680..31cd01bf7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_recombination.json index b01108356..cc740a026 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slabs_to_brick.json index 35d06c3f0..95324085f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_polishing.json index 79e01b73f..46e3365b2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_to_brick.json index 374e2330f..28c7fb4e4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_wall_polishing.json index 70c40dfb9..ca0bd18fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_walls_to_brick.json index ba92f63b3..f29ea4e47 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_axe.json index da7f26e3f..9d69141c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_blank.json index 8e97dda6c..5d4f581ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_cross.json index 411a6c2c6..6af2838e9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hammer.json index c5807c15b..e4df266f7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hoe.json index 5fc28cc32..bf38e3b3f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_horizontal.json index 71eba8222..8d9eabbb5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_i.json index aa2dd821c..737c52e38 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_left.json index bee659da1..fcc8e188e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_pickaxe.json index a66e5ba57..ef715c39d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_plus.json index 7bcd776cd..065928510 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_right.json index 7b19f57dc..738a169b3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_sword.json index 61eb0eb62..ab2908e03 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_vertical.json index be849dc8a..9fc7c1cfc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_slab.json index 2b72a71be..6f6f1d2e3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:basaltic_glass" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json index 45327091a..b01310221 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basaltic_glass" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json index 4d61fd49d..6260ef1ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basaltic_glass/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json index a17b91b3f..9c7b90f05 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/basaltic_glass/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basaltic_glass/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_slab.json index 868c0831f..00a32d15a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json index 8ba48d70b..1135e2fc8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basaltic_glass/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json index 6dc9f7288..1e5094798 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basaltic_glass/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json index 5d4d31b9e..3ed38d897 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/basaltic_glass/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/basaltic_glass/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_slab.json index d9314ec36..73704445d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json index e7725d79a..848c91460 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basaltic_glass/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json index e59af9813..48191f72c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basaltic_glass/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json index a278715c9..52c506052 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basaltic_glass" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_to_stone.json index 078fac403..8149e515b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:basaltic_glass" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:basaltic_glass" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json index 70d4d8c6a..dde7d2c5a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/basaltic_glass_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:basaltic_glass_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:basaltic_glass_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/basaltic_glass" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:basaltic_glass_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:basaltic_glass_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/basaltic_glass" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/chalk.json b/src/main/resources/data/mineralogy/advancements/recipes/chalk.json index 7557370ae..82cb3a5da 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/chalk.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/chalk.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:chalk" - } - ], - "rewards": { - "recipes": [ - "mineralogy:chalk" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:chalk" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:chalk_dust" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:chalk" + } + ], + "rewards": { + "recipes": [ + "mineralogy:chalk" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:chalk" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:chalk_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json index 9b2a54977..dd7ec4b54 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/chalk_dust.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:chalk_dust" - } - ], - "rewards": { - "recipes": [ - "mineralogy:chalk_dust" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:chalk_dust" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:chalk" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:chalk_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:chalk_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:chalk_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:chalk" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json index 7b88bb8f8..661a34206 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/cobblestone.json @@ -1,32 +1,36 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:stone" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:stone" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json index c714680bd..557cb3073 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/conglomerate" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_block_polishing.json index b2acec48b..bbc48c974 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json index cee1926f0..f3dc4b135 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/conglomerate/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/conglomerate/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab.json index c7649584b..1e6c908ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_polishing.json index d5c38f5ff..1491db5b3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_recombination.json index e23eca089..c31adbb2c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json index 1dc413c86..2c516e81e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/conglomerate/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs_polishing.json index d64d75c4d..0f7a7c2b7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json index e65d9196e..6c1530992 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/conglomerate/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall_polishing.json index 6a8ce486c..07c1a1eef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json index b5a2c7c63..15367510d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/conglomerate" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json index f6349b431..9967001f9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/conglomerate" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/conglomerate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_brick_slab_recombination.json index 0f16514da..034b134a8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slab_recombination.json index 316166068..c1e81d8aa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slabs_to_brick.json index fe263f40d..b740a5f5b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_stairs_to_brick.json index 6c9cc8d37..fcf4afcad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_walls_to_brick.json index c3053b7d2..470f6460a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_polishing.json index 5f9c43260..e58eee2fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_recombination.json index 3afd26c81..733eeee2b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slabs_to_brick.json index 649b98233..8d9453823 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_polishing.json index 97c70cbdb..690dcdcaf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_to_brick.json index 40707b0dc..9dda6c981 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_wall_polishing.json index 61de10dc4..5d1e9f9ff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_walls_to_brick.json index 228c230cd..45d15c9cc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_axe.json index 619fb1c52..e21a800ce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_blank.json index 0a616329a..5481a176b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_cross.json index 615eddddc..58a06f8b4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hammer.json index 7a975357c..43ce2705e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hoe.json index 32fd1b0ba..d6a57bb2c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_horizontal.json index b7dc52501..bb7b997eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_i.json index 2bd48b45d..748299029 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_left.json index 7af16a384..729297ac4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_pickaxe.json index 63866ef3f..03cf0e044 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_plus.json index 619b30b0e..574ae1052 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_right.json index 9aac059c4..3cd261fa9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_sword.json index 55a7e05ec..60354604b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_vertical.json index 3e91706db..a3b70e03f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_slab.json index 23d7bc638..68dd161ff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:conglomerate" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json index 8e094ba96..323ace332 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/conglomerate" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json index c53fc370d..4b7c87668 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/conglomerate/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json index 3f1e92ce7..0282b3ec4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/conglomerate/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/conglomerate/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_slab.json index 61c49841a..d39a0a741 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json index 67134dff3..a80ed8ffc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/conglomerate/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json index b5121caea..d0f8ddcee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/conglomerate/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json index 4a4b06994..a4a6893b9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/conglomerate/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/conglomerate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_slab.json index 9dc689a90..d28d90041 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json index 5e06028c9..0d5d87743 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/conglomerate/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json index 298171939..7932df62a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/conglomerate/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json index d5c46979a..8c38b6600 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/conglomerate" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_to_stone.json index b7476cc37..f6669aec1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:conglomerate_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:conglomerate" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:conglomerate_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:conglomerate" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json index 7d7e14edb..be860e102 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/conglomerate_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:conglomerate_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:conglomerate_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/conglomerate" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:conglomerate_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:conglomerate_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/conglomerate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json index 20b52d435..45db18c85 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diabase" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_block_polishing.json index 2905f599c..bfd93b30a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json index caa6c4247..a023abaa1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/diabase/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diabase/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab.json index ae7653a0d..569a95235 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_polishing.json index 0dc53e002..f21130d98 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_recombination.json index ae0c86c43..270f3b9c8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json index 3d240bdba..1e0f44a18 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diabase/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs_polishing.json index bfc3443cc..6ee40d3cf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json index 27d0117e9..8b6fdb844 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diabase/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall_polishing.json index 45f18be79..f2798b0ee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json index 60272f1b0..10674be47 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:diabase_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diabase" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json index b404286d4..b069ca1ff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/diabase" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diabase" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_brick_slab_recombination.json index 5a592dfda..b9a448937 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slab_recombination.json index 97dc6d581..1acb95e1a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slabs_to_brick.json index d99f55ac4..9d7138d37 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_stairs_to_brick.json index 94cf37cb6..db7ebb829 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_walls_to_brick.json index 3080c5575..aeea163a7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_polishing.json index e0e27f842..40f8af8de 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_recombination.json index b46991970..f66087c86 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slabs_to_brick.json index 8477d7782..ecb844aa0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_polishing.json index 103b54e7e..6167654fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_to_brick.json index 312045ced..d730f5d82 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_wall_polishing.json index e4647f357..43de03c43 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_walls_to_brick.json index 13a75b0ea..559424279 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_axe.json index 70f4b46c4..b577e2f7c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_blank.json index f4cf0f039..54f843646 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_cross.json index 57f95e9b0..738fb5526 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hammer.json index dabd92f14..165f35dad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hoe.json index ae66c6fa7..03bbb8c43 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_horizontal.json index 7e49f5395..87fa3b9e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_i.json index 49f6b21c3..7d556019b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_left.json index 3548af06b..acc777458 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_pickaxe.json index 924fd581c..cb60d6a90 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_plus.json index a71e42159..7e87a1f2a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_right.json index a71acce28..eaa73da3e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_sword.json index 559b2d9ab..a018dc5bc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_vertical.json index fc30b5659..0f9d58bae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_slab.json index a2fc88828..4e2bd9ec9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:diabase" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json index cffebea0b..30264e6fb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diabase" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json index db68df839..b6896c5cb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diabase/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json index d46955bd0..8a4a7e403 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/diabase/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diabase/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_slab.json index 44bf288ee..06d36ef8e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json index ca9d4a99b..3c71d1bab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diabase/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json index 7009b8992..35428590e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diabase/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json index 821c199e5..d16a4e86c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/diabase/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diabase/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_slab.json index 06ea805c1..e8b52d7b0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json index 72a3c3107..8d0a44b80 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diabase/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json index 39adbbcbe..afb37f795 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diabase/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json index d75a54909..0f912f525 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diabase" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_to_stone.json index 5b0b71ff2..511003942 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:diabase_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diabase" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:diabase_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diabase" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json index 7e2c67a32..81429a97d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diabase_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diabase_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diabase_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diabase" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diabase_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diabase_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diabase" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json index 2fc1fd4d5..942b260d0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diorite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_block_polishing.json index 6a1716775..8d2b0a480 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json index e9c88f68c..55b0dd6f9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/diorite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diorite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab.json index 9f7297db5..2fa5ca687 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_polishing.json index 96b49fd53..e0d12026d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_recombination.json index ee99a5ac2..e2088c77c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json index a1743db7f..a9039fb1b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diorite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs_polishing.json index bff8bc1b7..032060270 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json index 26466301d..b0152339c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diorite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall_polishing.json index 4d1e50aee..e25f8b415 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json index 90e08957f..ac71661ea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:diorite_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diorite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json index 6c9befbd2..1de614ab6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/diorite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diorite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_brick_slab_recombination.json index bf60d5b1c..65f88bb59 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slab_recombination.json index 5a78fa6bc..0f3c7675c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slabs_to_brick.json index 96b9275b5..344bf40c5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_stairs_to_brick.json index b8d29fc1b..bbeb6c4eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_walls_to_brick.json index de75862af..53f7ede73 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_polishing.json index 9b71fbaf6..e07e2b068 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_recombination.json index a9298b8bf..2ef28f07e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slabs_to_brick.json index cee254ee7..045f485ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_polishing.json index a6810bdf6..202a2f231 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_to_brick.json index e40a6cdff..3d3892b48 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_wall_polishing.json index 37e48ce44..dda07b128 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_walls_to_brick.json index 13dbfa81b..ce05762f3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_axe.json index 34a40ecd2..6f362d0cc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json index 260201a8f..122e56dd3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_blank.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diorite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_cross.json index f0117ded1..0d659dfff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hammer.json index edb7880a1..8869a160b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hoe.json index a99a3c284..07d163567 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_horizontal.json index 234be745d..f85a14c13 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_i.json index 303ea7f07..fefaf1e51 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_left.json index 118153a63..1788fb4f2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_pickaxe.json index 69a07301d..2a37689ff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_plus.json index 15ce4b897..a9115774a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_right.json index 6974baf44..f31b26375 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_sword.json index 43db06dc5..a34396ed0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_vertical.json index 40f3884ba..db1bc62e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab.json index ff86c1062..bb2ded017 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:diorite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_from_vanilla.json index 7fe145be2..3c36f2d39 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_from_vanilla.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:diorite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_slab_from_vanilla" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_slab_from_vanilla" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:diorite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:diorite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_to_vanilla.json index 213dff2ac..1ac22aa64 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_slab_to_vanilla.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:diorite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_slab_to_vanilla" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_slab_to_vanilla" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth.json index 8cdd07c17..b7c9d037b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth.json @@ -1,51 +1,55 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/diorite" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json index 259e83d7c..78615b863 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diorite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json index a344da9a9..c51a15a73 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/diorite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diorite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_slab.json index 4cf44f932..d2839007b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json index 38d4eca0f..e94fd425b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diorite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json index ed1f4828f..0846b9e4e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diorite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json index be3aeb85f..5b13e5e72 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/diorite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/diorite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab.json index ce993e35d..a0d86b476 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_from_vanilla.json index 8a165f90b..74245ee06 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_from_vanilla.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_diorite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_slab_from_vanilla" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_slab_from_vanilla" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:polished_diorite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_diorite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:polished_diorite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_to_vanilla.json index 0f870d35d..166f2b72d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_slab_to_vanilla.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_diorite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_slab_to_vanilla" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_slab_to_vanilla" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_diorite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_stairs.json index 85de00798..d357fbc26 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_stairs.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json index 11c9fcddf..547c8720a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/diorite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/diorite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_stairs.json index 6f2b32d25..2c2b106e9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_stairs.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:diorite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_to_stone.json index e40a0e09c..929c6a8fe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:diorite_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:diorite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:diorite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/diorite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/diorite_wall.json index 65c76fa57..132753c99 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/diorite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/diorite_wall.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:diorite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:diorite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:diorite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:diorite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:diorite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:diorite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json index 475f6490d..d8732d83b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/dolomite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_block_polishing.json index 31aa867ff..b8e513a0a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json index d2a6832bb..fa4daa286 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/dolomite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/dolomite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab.json index 14e044760..58111b867 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_polishing.json index 62ec21794..e81d004fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_recombination.json index 94f734c8e..a95a6575e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json index 92a76761c..5e0126c42 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/dolomite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs_polishing.json index 30ee23acd..a197470e1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json index 3caeeb233..0b74760be 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/dolomite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall_polishing.json index e3bfcdc56..135126763 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json index e00a211b4..1c5351fdc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:dolomite_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/dolomite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json index 314458f39..e32873cfd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/dolomite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/dolomite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_brick_slab_recombination.json index 113d07668..cedab83e9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slab_recombination.json index 992eb8d87..df321e810 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slabs_to_brick.json index f64be5a3e..332538add 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_stairs_to_brick.json index cfef33679..c748454b6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_walls_to_brick.json index 27f5a1c87..6a88fb963 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_polishing.json index 862183c5e..af6da161e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_recombination.json index 33dbe86c7..7aed24f28 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slabs_to_brick.json index e1598d722..597906629 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_polishing.json index 4df14b22e..282c0e18b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_to_brick.json index fd6d84f30..7abde9274 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_wall_polishing.json index 03cb2ef80..4dbd96265 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_walls_to_brick.json index 9083d8a2f..60d45768b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_axe.json index a8a895c48..ccf98e0f8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_blank.json index af18deb2a..fe8040f88 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_cross.json index d51b2ef59..266bd63a8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hammer.json index 61d9cfc90..b8b56c248 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hoe.json index 98e1885bf..878349d05 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_horizontal.json index c4fd4a419..dd53c6690 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_i.json index 93285b297..8e1d774b4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_left.json index 14dd4b8e5..6f92ccc23 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_pickaxe.json index f8c7b1a00..5db490d9f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_plus.json index 6251d62a1..1fc4a064a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_right.json index b1155f220..1f4acdbcc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_sword.json index 01c281329..27373fb5d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_vertical.json index 3e8de8487..89f8ef82b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_slab.json index 1bebaedc6..b7322cb62 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:dolomite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json index 5c197d489..571e0b918 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/dolomite" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json index b8125d4bc..f4f0f9884 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/dolomite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json index 2bc9dda3f..d641877bf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/dolomite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/dolomite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_slab.json index 95fcb0a1f..0523296a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json index f47cfef76..2287663e3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/dolomite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json index 8d3007357..ae55b18d8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/dolomite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json index 17d009b69..b20e9c2a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/dolomite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/dolomite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_slab.json index 414097713..8b168d5d9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json index df38164af..003df93ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/dolomite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json index 20c27b25f..939ab1b52 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/dolomite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json index 75033717f..0c5cb888e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/dolomite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_to_stone.json index 98a93984c..c9352ace5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:dolomite_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:dolomite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:dolomite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:dolomite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json index a4809de93..bdaefc444 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/dolomite_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:dolomite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:dolomite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/dolomite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:dolomite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:dolomite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/dolomite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall.json index 3e66ad5d4..5ff2a4054 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_white" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gypsum_dust" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gypsum_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json index b8bf94571..348fc7bc6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_black.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_black" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_black" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_black" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_black" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_black" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_black" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json index 5404518dc..ab74cddb7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_blue.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_blue" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_blue" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_blue" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_blue" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_blue" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_blue" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json index 85c27bd49..5a9c32255 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_brown.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_brown" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_brown" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_brown" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_brown" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_brown" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_brown" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json index 1f5a21353..b0093152d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_cyan.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_cyan" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_cyan" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_cyan" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_cyan" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_cyan" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_cyan" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json index 134a6c196..1ab6e1a9f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_gray.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_gray" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_gray" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_gray" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_gray" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_gray" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_gray" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json index 77765b765..24023c0e1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_green.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_green" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_green" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_green" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_green" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_green" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_green" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_light_blue.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_light_blue.json index 845261908..6c524e771 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_light_blue.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_light_blue.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_light_blue" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_light_blue" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_light_blue" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_light_blue" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_light_blue" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_light_blue" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json index 93b61802c..fc192f108 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_lime.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_lime" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_lime" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_lime" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_lime" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_lime" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_lime" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json index 27aa4db53..56fe631e1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_magenta.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_magenta" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_magenta" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_magenta" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_magenta" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_magenta" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_magenta" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json index 96c8363b5..58899cfcf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_orange.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_orange" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_orange" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_orange" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_orange" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_orange" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_orange" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json index cc1466cea..c6cbbc948 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_pink.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_pink" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_pink" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_pink" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_pink" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_pink" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_pink" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json index 927200387..d6782b4f8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_purple.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_purple" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_purple" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_purple" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_purple" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_purple" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_purple" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json index 6d6b8f22b..ffdb88b45 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_red.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_red" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_red" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_red" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_red" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_red" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_red" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json index 0e37241be..46ad8d88d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_silver.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_silver" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_silver" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_silver" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_silver" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_silver" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_silver" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json index 9fddd8d2d..4892ec47a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_white.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_white" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_white" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_white" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_white" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_white" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json b/src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json index 259cc6ab9..b369d2030 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/drywall_yellow.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_yellow" - } - ], - "rewards": { - "recipes": [ - "mineralogy:drywall_yellow" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:drywall_yellow" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:drywall_white" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_yellow" + } + ], + "rewards": { + "recipes": [ + "mineralogy:drywall_yellow" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:drywall_yellow" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:drywall_white" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json index 6c230c30d..eb7137eb9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gabbro" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_block_polishing.json index 4d8b9e21d..b0b2ac0de 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json index feefa5903..21b48cd9d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/gabbro/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gabbro/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab.json index 2863738db..775f25e7c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_polishing.json index 06890eee0..43907694f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_recombination.json index 191bbc2cc..347d31fc0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json index de9f2ca98..29c44d73d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gabbro/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs_polishing.json index 333c67380..1d2642535 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json index b935dfd58..d60ecd2ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gabbro/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall_polishing.json index 7a4710f28..1bda37c81 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json index 211832c54..03fe276f2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:gabbro_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gabbro" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json index b3ff21ecd..b9376c7d3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/gabbro" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gabbro" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_brick_slab_recombination.json index fab6377d3..2936e3532 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slab_recombination.json index ecb4df710..65f0ba93d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slabs_to_brick.json index 3b057cb4d..0ae4bdd1e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_stairs_to_brick.json index 296bc4cee..974388c61 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_walls_to_brick.json index 402b134ca..b25aeacb7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_polishing.json index bfe7474a6..cb74810c2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_recombination.json index 0f5c5f89c..d6bf037a4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slabs_to_brick.json index d4e5c3a62..d23ca1ddc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_polishing.json index 861abc370..03884bb0d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_to_brick.json index d590a247d..0ed984e92 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_wall_polishing.json index 4936c5c83..6d4ff6e3d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_walls_to_brick.json index f95331045..e3889361b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_axe.json index c323d976b..8b69c72ef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_blank.json index 91dc040e3..3d32b1951 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_cross.json index 84b824317..bb631ebe0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hammer.json index f5696162d..1398d2e60 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hoe.json index 19e62fdff..d0f3eafcd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_horizontal.json index 52992fc3d..07846c97c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_i.json index df3454352..690e715ce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_left.json index 9174417ce..37ae2d45d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_pickaxe.json index 7ef8e86b9..3074b30d5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_plus.json index 0280071eb..31cf8a6c1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_right.json index 0207d96fd..b0c45ec1d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_sword.json index c77640ce0..d2bb9bf87 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_vertical.json index cc02aafa7..ca368b224 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_slab.json index a4e76b50e..d51fcb96a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:gabbro" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json index 570029f94..66c90e54b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gabbro" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json index a84c64338..3e5c38d69 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gabbro/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json index d8c38b61b..3caf84cc0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/gabbro/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gabbro/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_slab.json index 20cf30990..d00b2012f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json index 3228014c8..439ef1d5f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gabbro/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json index 4b22fe23b..19d99c43a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gabbro/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json index 5089ef29b..1dbe79377 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/gabbro/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gabbro/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_slab.json index 0cfee4357..2eaace389 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json index 39aaaeb1b..5b5a35dde 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gabbro/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json index b0208bbaa..bd8aab61a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gabbro/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json index 189a730ee..5d03c7e68 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gabbro" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_to_stone.json index 1ee023339..6584801bd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:gabbro_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gabbro" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:gabbro_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gabbro" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json index 68c01c826..c355b4b7d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gabbro_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gabbro_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gabbro_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gabbro" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gabbro_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gabbro_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gabbro" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json index 6326a971a..c8084aa59 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gneiss" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_block_polishing.json index 8ee805f3e..beaa7429e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json index d7449be5e..0a48c7af3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/gneiss/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gneiss/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab.json index 67c6110e9..26236d114 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_polishing.json index 02467afaf..8c27c95d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_recombination.json index 15c13418e..5bbba36c7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json index ac8fd13bc..66f4f0766 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gneiss/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs_polishing.json index a5d926efa..5f0454691 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json index 6ba8c6528..40a3963a7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gneiss/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall_polishing.json index 16d5f8d42..d4f7ae827 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json index 4ea76f359..a0ecbbd98 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:gneiss_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gneiss" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json index 6cfd0e44a..f2eaef8ee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/gneiss" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gneiss" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_brick_slab_recombination.json index 89816830c..186d22cc4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slab_recombination.json index 23e3680c4..d4e581aab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slabs_to_brick.json index 59be57d37..ba00322e1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_stairs_to_brick.json index f732c5686..1f9ae1998 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_walls_to_brick.json index 8f90d7154..4e949e4ed 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_polishing.json index df7a3f02a..530df5323 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_recombination.json index 77e577e29..a86899069 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slabs_to_brick.json index 5485a2645..59ec06b83 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_polishing.json index a4012951e..b67051c78 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_to_brick.json index f80108958..5a62f72d3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_wall_polishing.json index 2c1bd2ef3..3ee687f62 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_walls_to_brick.json index 8afcf7bbd..bae07d14b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_axe.json index e09855c87..44ae24bfc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_blank.json index d7625dc4e..7f5080110 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_cross.json index f26eb3cd5..40eedea04 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hammer.json index 93cb22956..0e1654237 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hoe.json index e67663d76..c8a5c2b69 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_horizontal.json index 6ba391ef6..93770dddc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_i.json index 605256272..e71a4b4a3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_left.json index 2263559c5..ca0d0afb9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_pickaxe.json index ce9869d48..621881484 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_plus.json index 6b4ba4411..7ab4a12eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_right.json index ffb201267..1246c7d82 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_sword.json index 9bc4e81a3..1f496758e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_vertical.json index e81b8b662..abe8ee569 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_slab.json index d1aa539fa..f1b1d2355 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:gneiss" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json index 1e69ff816..6ea57290a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gneiss" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json index b1fe4a6eb..45d109de2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gneiss/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json index d4631574f..4bcacf841 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/gneiss/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gneiss/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_slab.json index d9dcbaf57..e92ac0f51 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json index d6173da56..8107e7d4d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gneiss/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json index 64c1b95a2..0a3c1130a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gneiss/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json index 64ba7f6f4..740fea3c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/gneiss/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/gneiss/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_slab.json index fbf9c08fe..ade53dc14 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json index dc69ebba4..af1064b44 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gneiss/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json index eebe8e032..e7bf93cc4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gneiss/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json index 9fc6592b1..2b565bab5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gneiss" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_to_stone.json index ac9b1beff..df2b361aa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:gneiss_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gneiss" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:gneiss_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gneiss" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json index e69c7c1b1..0030a1805 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gneiss_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gneiss_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gneiss_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/gneiss" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gneiss_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gneiss_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/gneiss" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json index 4165cc0e8..f5a9dfeb7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/granite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_block_polishing.json index 94dc5c263..bd6c311d7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json index 8ace248fe..fb1925794 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/granite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/granite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab.json index 0ffb91a25..c5f751274 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_polishing.json index ab3388eb1..5e09960c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_recombination.json index 549487790..1aa3e6b56 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json index 8960aae73..d2102a824 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/granite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs_polishing.json index 08cf8f2f4..2d512b92a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json index cae5a4999..2ad9a3758 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/granite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall_polishing.json index 8649442bb..b14b8bb06 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json index f14469c08..a55da8c27 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:granite_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/granite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:granite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json index 0e33510cd..209940113 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/granite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/granite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_brick_slab_recombination.json index d9fb56919..a39ca7fca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slab_recombination.json index 06702f3f1..2065717f2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slabs_to_brick.json index ded37a0b5..0680cc736 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_stairs_to_brick.json index 09cbaebab..bfcd985d5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_walls_to_brick.json index 142bf829c..9b808cea6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_polishing.json index 2060f2a3f..8bf87cbcc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_recombination.json index 9e257eaca..c8ff81f09 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slabs_to_brick.json index 2c189b81a..83d7f2713 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_polishing.json index cd5b7d8e7..5fff62fc2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_to_brick.json index ba0703ff3..b9269e6af 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_wall_polishing.json index 57183f3b8..92ae8d4e8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_walls_to_brick.json index af25409ab..6362ef29a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_axe.json index c16a2a49b..91f570664 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json index 18875e638..dec766c89 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_blank.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/granite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_cross.json index 351111c28..0c0ac6b84 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hammer.json index c609c73b9..caaf7294b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hoe.json index beb07923b..83d8b96a1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_horizontal.json index 73a582680..4684e0090 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_i.json index 3f4623d09..073643fd8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_left.json index 09e1973b5..5d73f6210 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_pickaxe.json index f275f9e67..f7fe5adae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_plus.json index 833f6d496..d145d51e8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_right.json index 97ec01ea0..d114a6b58 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_sword.json index ca1ed8c2b..8c4d66766 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_vertical.json index 6845dba7d..722dca051 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab.json index 1de6167c9..8709b48b2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:granite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_from_vanilla.json index bc3a94b46..1437e6230 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_from_vanilla.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:granite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_slab_from_vanilla" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_slab_from_vanilla" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:granite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:granite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_to_vanilla.json index bad86ccf8..78a95cae2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_slab_to_vanilla.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:granite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_slab_to_vanilla" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_slab_to_vanilla" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth.json index 666fcf37e..740009362 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth.json @@ -1,51 +1,55 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/granite" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json index b1daba51c..ffd2aea96 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/granite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json index 6b803a9de..4aca6a1eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/granite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/granite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_slab.json index f5908de3d..d04b13a0f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json index fa83c61b0..928f6ec4b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/granite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json index 5bdad6098..aca062852 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/granite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json index 8af26d403..1a1182ed7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/granite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/granite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab.json index eefb9b999..afa5877fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_from_vanilla.json index 4c6781146..8642eb1c9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_from_vanilla.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_granite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_slab_from_vanilla" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_slab_from_vanilla" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:polished_granite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_granite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_slab_from_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_slab_from_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:polished_granite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_to_vanilla.json index 37ecdd660..7c2482c8e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_slab_to_vanilla.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_granite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_slab_to_vanilla" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_slab_to_vanilla" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_granite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_slab_to_vanilla" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_slab_to_vanilla" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_stairs.json index b0aa90470..bcd2237d5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_stairs.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json index 263359e2c..657126bc0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/granite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/granite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_stairs.json index d8a3aace9..ab9b46109 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_stairs.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:granite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_to_stone.json index 30724de41..c6165b7c2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:granite_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:granite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:granite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/granite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/granite_wall.json index dd008913a..f28a9502e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/granite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/granite_wall.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:granite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:granite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:granite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:granite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:granite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:granite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gravel_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/gravel_to_stone.json index a53dec6b2..4605461e0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gravel_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gravel_to_stone.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "SMELTABLE_GRAVEL" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gravel_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gravel_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:gravel" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "SMELTABLE_GRAVEL" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gravel_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gravel_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:gravel" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_carbon_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_carbon_dust.json index bbaaf8901..20def2aa0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_carbon_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_carbon_dust.json @@ -1,44 +1,46 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:not", - "value": { - "type": "forge:tag_empty", - "tag": "forge:dusts/carbon" - } - } - ], - "rewards": { - "recipes": [ - "mineralogy:gunpowder_from_carbon_dust" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gunpowder_from_carbon_dust" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:nitrate_dust" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/carbon" + } + } + ], + "rewards": { + "recipes": [ + "mineralogy:gunpowder_from_carbon_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gunpowder_from_carbon_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:nitrate_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_charcoal.json b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_charcoal.json index 125507e8f..8469116af 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_charcoal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_charcoal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gunpowder_from_charcoal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gunpowder_from_charcoal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:nitrate_dust" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gunpowder_from_charcoal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gunpowder_from_charcoal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:nitrate_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_coal_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_coal_dust.json index 2568d2f8c..d58f5305a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_coal_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_coal_dust.json @@ -1,44 +1,46 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:not", - "value": { - "type": "forge:tag_empty", - "tag": "forge:dusts/coal" - } - } - ], - "rewards": { - "recipes": [ - "mineralogy:gunpowder_from_coal_dust" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gunpowder_from_coal_dust" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:nitrate_dust" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/coal" + } + } + ], + "rewards": { + "recipes": [ + "mineralogy:gunpowder_from_coal_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gunpowder_from_coal_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:nitrate_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_sugar.json b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_sugar.json index 0df22bfa5..ef9589728 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_sugar.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gunpowder_from_sugar.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gunpowder_from_sugar" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gunpowder_from_sugar" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:nitrate_dust" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gunpowder_from_sugar" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gunpowder_from_sugar" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:nitrate_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gypsum.json b/src/main/resources/data/mineralogy/advancements/recipes/gypsum.json index 91ccfeba0..d7e6bf789 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gypsum.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gypsum.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gypsum" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gypsum" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gypsum" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gypsum_dust" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gypsum" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gypsum" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gypsum" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gypsum_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json index 3632e6878..2e2a314ae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/gypsum_dust.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gypsum_dust" - } - ], - "rewards": { - "recipes": [ - "mineralogy:gypsum_dust" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:gypsum_dust" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:gypsum" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gypsum_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:gypsum_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:gypsum_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:gypsum" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json index 348024b70..9a60ead00 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/hornfels" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_block_polishing.json index 94e48eeef..ac3339dc7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json index 3c3203252..65715cf13 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/hornfels/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/hornfels/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab.json index a3c0a12b6..eecf58746 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_polishing.json index 7393def23..43a17ed71 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_recombination.json index bd4676b29..fb288e72e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json index 9357bf22c..4b2539ff8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/hornfels/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs_polishing.json index 5345195d3..e8e900211 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json index d4ebf499f..59b1f5939 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/hornfels/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall_polishing.json index af52923b7..18c0e226e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json index 1b89c3750..e309b4dc1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:hornfels_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/hornfels" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json index 2f17e7e7c..a86b593bb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/hornfels" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/hornfels" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_brick_slab_recombination.json index 29d2c3f69..dabf6a361 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slab_recombination.json index 9505b3610..46f531e79 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slabs_to_brick.json index 5b937707d..28a8a3f56 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_stairs_to_brick.json index b7a540154..59ae96fc7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_walls_to_brick.json index 950794803..e9b3dc8f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_polishing.json index a2df23068..2f4ddf63f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_recombination.json index 617c25be2..76eb44ab0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slabs_to_brick.json index 04a3152c7..4f7fcbae0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_polishing.json index c1467a8c6..654f103f6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_to_brick.json index bf7e09473..e8bb70498 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_wall_polishing.json index 3d2534d08..f0bb71013 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_walls_to_brick.json index 206083583..0fbd75820 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_axe.json index 8dd24e58c..e7a4e7808 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_blank.json index b4a3b8838..a2a9e52fe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_cross.json index 1228de4e1..93b1abf98 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hammer.json index ef8349974..3aa8fdd3a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hoe.json index 1023b1dae..e223cf1d2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_horizontal.json index 231d8adb3..c89972d06 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_i.json index 7eaddf601..cd4f9bfee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_left.json index 6f85a1eb3..79ad2349e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_pickaxe.json index a3aba0b1a..56ecd51b8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_plus.json index 303e56445..731e9b1c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_right.json index 059043f8c..704698e10 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_sword.json index 14e5f6152..61c39a323 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_vertical.json index 4432e60ef..0d2b7ffe9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_slab.json index ea1a2c16a..65f26966e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:hornfels" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json index 3a6b8d2d1..43b5dd657 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/hornfels" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json index 2cb8ecf82..62917bc5e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/hornfels/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json index 7f4d12697..8ae0d4568 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/hornfels/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/hornfels/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_slab.json index a71961d81..bfd25cbf6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json index 98d5a042f..a6f0262f7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/hornfels/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json index b5d2bf548..770005b48 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/hornfels/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json index c22e33ac5..48bfe1be6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/hornfels/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/hornfels/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_slab.json index 61516d775..955b9401c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json index b4a9ba4b3..9fe48c4da 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/hornfels/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json index 7a0016e0e..4a783962e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/hornfels/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json index a2b9f4c55..1bc079a98 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/hornfels" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_to_stone.json index cadf42149..2fcf14eeb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:hornfels_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:hornfels" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:hornfels_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:hornfels" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json index 3203bc712..a1e7a2064 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/hornfels_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:hornfels_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:hornfels_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/hornfels" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:hornfels_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:hornfels_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/hornfels" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json index 3401eaf63..e08f85da8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/limestone" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_block_polishing.json index c475cadb2..4d91d909c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json index ec13ebc97..f191490dc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/limestone/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/limestone/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab.json index 2f79a8947..4d39ddfc7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_polishing.json index c84f0c334..144d736a8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_recombination.json index ca81f42b3..84a875765 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json index d215cccc5..81e829e02 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/limestone/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs_polishing.json index a1a4b8c5d..eda47d546 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json index e8a31a018..1ab7bd83e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/limestone/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall_polishing.json index cd965d3cb..2f7be8d52 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json index 06558792e..307dbd3cc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:limestone_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/limestone" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json index 90776231f..b68ebf8ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/limestone" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/limestone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_brick_slab_recombination.json index 39f02022f..2cfd3a9a0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slab_recombination.json index a775195ae..65e5bf703 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slabs_to_brick.json index f7f1dc2d4..306a8590d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_stairs_to_brick.json index c341c0ebf..0569f6158 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_walls_to_brick.json index f5009b2b0..9d7af16cf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_polishing.json index db2565d4b..aadcd2827 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_recombination.json index 8735b6cdf..eb700cecd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slabs_to_brick.json index b8180ee8c..e28b2cc11 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_polishing.json index 9a90c12f7..6e48c9885 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_to_brick.json index a7093d816..f35e27a37 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_wall_polishing.json index 33af21646..af700a727 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_walls_to_brick.json index ab594b0af..c3e035507 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_axe.json index bbb92f36b..9b11a5fe7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_blank.json index 83a87f885..e37e8cf9b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_cross.json index 80b7f9634..d88cb0f9f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hammer.json index cbdf1ad1d..ecdfaade9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hoe.json index ba45b64b6..c2105c5a4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_horizontal.json index beee09a2d..f9dbde247 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_i.json index cb6252521..c19c3fec6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_left.json index 87dddb6f6..52014febf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_pickaxe.json index a08201461..e5cf6a16f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_plus.json index f7ae9ee20..c335d21d3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_right.json index abb8240c4..b53222e46 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_sword.json index cb18e322a..bf73a3b6a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_vertical.json index dcee61c85..947183915 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_slab.json index f236e3df8..bcb3254f1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:limestone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json index 3243fcc4a..c315a52fd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/limestone" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json index 91cafb123..50af62ff4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/limestone/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json index 2229c379d..b1e245aaa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/limestone/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/limestone/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_slab.json index 4b60e0210..35670fa63 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json index ac48fbac3..a4974b0dd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/limestone/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json index 60c873bce..271771146 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/limestone/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json index 4acf3f2d3..b24c41c6d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/limestone/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/limestone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_slab.json index 5e4294581..8b07b6f78 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json index e6633ef47..0cc4053af 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/limestone/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json index f17651c29..c5108593c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/limestone/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json index ab3266a85..67c22543a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/limestone" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_to_stone.json index 2558789ff..cc627606a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:limestone_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:limestone" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:limestone_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:limestone" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json index 88f1febba..79f5a2c00 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/limestone_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:limestone_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:limestone_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/limestone" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:limestone_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:limestone_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/limestone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json index dd1d882fe..5368b4db1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/marble" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_block_polishing.json index 54650265c..8077123d5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json index 3911a21e8..edd523446 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/marble/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/marble/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab.json index 82e7b63cc..14a707512 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_polishing.json index 6d54ff00f..6a1938113 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_recombination.json index 7ca2aac85..49dad55f0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json index cefd054d2..691eab5d4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/marble/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs_polishing.json index da6d56efd..01ec352b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json index 4514fb6d7..5098632ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/marble/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall_polishing.json index 98a425cfe..3bd07dd3e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json index b24a2acfe..69b5ebe26 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:marble_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/marble" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:marble_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json index e2ba0ac82..9c2b0d88b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/marble" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/marble" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_brick_slab_recombination.json index f25da8208..5a63292b6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slab_recombination.json index 36cc8b216..d0d4b38c8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slabs_to_brick.json index 052984f13..d754f647a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_stairs_to_brick.json index 64de57e6d..d2e7f49b3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_walls_to_brick.json index 07f2e4dee..9f50e73cc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_polishing.json index eb4b19d20..1cba3ad77 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_recombination.json index 455fe99a0..7d245a8cc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slabs_to_brick.json index 03e4e752f..ca9923077 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_polishing.json index 82777a562..a8a17b928 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_to_brick.json index d05f6b1db..78cefa034 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_wall_polishing.json index 97ec399ce..83b5c21d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_walls_to_brick.json index 796f0d57d..d74e1fc7a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_axe.json index 31917c783..793cb6476 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_blank.json index ef2092bf9..2b37d466a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_cross.json index 60ad5660d..84f2abe66 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hammer.json index b49d1a00f..7a780c7ae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hoe.json index 04370d144..d0292c193 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_horizontal.json index aae701ff7..2c7fb0a95 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_i.json index d729b3300..5ef6954fb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_left.json index cb77e5792..fe4a1b72e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_pickaxe.json index b46fa53a5..74a4cc302 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_plus.json index 490c780bd..140ac92e9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_right.json index 3f5a1cc59..0b3906220 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_sword.json index 66925674b..d0b03c00b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_vertical.json index dcdcc9bbb..68336f272 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_slab.json index 8da0d9b78..4d8c43f0d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:marble" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json index e6f3fb6ec..ae5e51414 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/marble" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json index 1fc70b768..118012f70 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/marble/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json index 7f6cf7171..0d24aec13 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/marble/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/marble/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_slab.json index f1f9d2237..42aeb47d9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json index 764ef0112..cec2a59b8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/marble/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json index 0e483da10..253aa218e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/marble/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json index be48c2cf8..e22778943 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/marble/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/marble/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_slab.json index 0a874713d..8470817fd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json index 400cc361f..6f992f97b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/marble/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json index 7d243c66e..31d5a7449 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/marble/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json index 00342df95..1a1678920 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/marble" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_to_stone.json index 96dfd9a84..d98337e6d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:marble_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:marble" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:marble_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:marble" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json index 3eea83d68..a17a25f71 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/marble_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:marble_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:marble_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/marble" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:marble_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:marble_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/marble" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json b/src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json index 72655fc7b..e8d12eade 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/mineralfertilizer.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_FERTILIZER" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:mineral_fertilizer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:mineralfertilizer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:mineralfertilizer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:nitrate_dust" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_FERTILIZER" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:mineral_fertilizer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:mineralfertilizer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:mineralfertilizer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:nitrate_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json index 00738d0b2..fa766a3a7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_block.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:nitrate_block" - } - ], - "rewards": { - "recipes": [ - "mineralogy:nitrate_block" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:nitrate_block" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:nitrate_dust" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_block" + } + ], + "rewards": { + "recipes": [ + "mineralogy:nitrate_block" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:nitrate_block" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:nitrate_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json index b6ae4c0eb..18432ffc0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/nitrate_dust.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:nitrate_dust" - } - ], - "rewards": { - "recipes": [ - "mineralogy:nitrate_dust" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:nitrate_dust" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:nitrate_block" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:nitrate_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:nitrate_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:nitrate_block" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json index 1ff3ceaa6..9f527c0f6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/novaculite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_block_polishing.json index 5f740bc4e..b3776380c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json index 4f02ae68a..66f27d1e9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/novaculite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/novaculite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab.json index 77eb8ab9c..d5fe9d101 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_polishing.json index 65a580c8f..7bd08b808 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_recombination.json index 61ff39d8a..8a725b9ce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json index 9fb53d0f6..22dfe0ca9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/novaculite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs_polishing.json index 1dc6761db..3dcbd1911 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json index 448a6900c..6afdddcd7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/novaculite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall_polishing.json index 99e2159b7..30f8a247c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json index 2053c2cbe..6c9d1ac26 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:novaculite_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/novaculite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json index a74cc13cc..a34ed4ca4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/novaculite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/novaculite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_brick_slab_recombination.json index 1a18069d7..a8981c701 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slab_recombination.json index 3a626ef1d..babc4a92f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slabs_to_brick.json index 2aa98b3a1..3789436c5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_stairs_to_brick.json index 91ab714da..cd8e3ae5b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_walls_to_brick.json index 643f3f808..2bfaf217c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_polishing.json index 878e2763e..61353898d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_recombination.json index 9374b1ffb..3841b7f29 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slabs_to_brick.json index 0a7d87fa3..524975d17 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_polishing.json index c18699553..e70748850 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_to_brick.json index 4bf1cb76c..3d38c0a89 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_wall_polishing.json index 78d7b0440..d8236fa46 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_walls_to_brick.json index b5eae281b..c494106fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_axe.json index 8d554cae4..8a5f9b1d6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_blank.json index a8c6b208a..3c7dc8e46 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_cross.json index 2642aa3f4..63f2bd68b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hammer.json index cd0f075a7..e7ccfd7cc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hoe.json index 2928a248f..d5dd2c2e0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_horizontal.json index e4560a197..265e53477 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_i.json index d68991f29..cb49a6ada 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_left.json index ab3eb616e..64c771426 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_pickaxe.json index bd6a1da09..41ff7311b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_plus.json index 2f4c7afc4..d0ec3da39 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_right.json index 85dcd78d0..8133b9920 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_sword.json index 57fbc52f8..4af98aca4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_vertical.json index 1a1e72e85..c9b44bf2f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_slab.json index 5341036e2..3ce3d460a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:novaculite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json index 79ddc3710..736f71224 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/novaculite" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json index fcbc54450..64aaf560c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/novaculite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json index fd011ab08..c6ec04c42 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/novaculite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/novaculite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_slab.json index cf7540a25..05b9028da 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json index 572aa6790..9d3f0bd1a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/novaculite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json index bf3eda4c1..a3ea9dd26 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/novaculite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json index 979734fb5..2d98ac73f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/novaculite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/novaculite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_slab.json index 806b3bdb5..792445804 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json index f04a0efba..257632106 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/novaculite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json index efa96a7b1..2da4eb76d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/novaculite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json index 775af22ae..6de023d3f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/novaculite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_to_stone.json index ccabcdad7..ae9e2f5ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:novaculite_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:novaculite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:novaculite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:novaculite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json index 422cd71af..e741432c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/novaculite_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:novaculite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:novaculite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/novaculite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:novaculite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:novaculite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/novaculite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json index 95c87d452..4f06109c9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/pegmatite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_block_polishing.json index 4e903a82a..7c0c6635b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json index 90977fe3d..59c4c016a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/pegmatite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/pegmatite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab.json index 44f2f3122..c646a5aac 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_polishing.json index f3bc20947..68978ace6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_recombination.json index 16c7a1963..08de09ee2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json index 9878f429d..af9711a24 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/pegmatite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs_polishing.json index 7ea8726e0..b1f1c042f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json index 9feef6a62..8cfc8587a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/pegmatite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall_polishing.json index 016db45a5..5db37d5d3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json index a62926548..3c8c64134 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/pegmatite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json index e282a3f71..31176f902 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/pegmatite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/pegmatite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_brick_slab_recombination.json index ed3e8b85e..f72b67a62 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slab_recombination.json index 23c5f7f41..922e00ec5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slabs_to_brick.json index 42d1e4b5c..ed8e166ec 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_stairs_to_brick.json index 4c370be87..f350571bf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_walls_to_brick.json index bb4732b0b..c23997c05 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_polishing.json index 55976c35a..4db050cea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_recombination.json index 1d93b49be..71ca1ed8a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slabs_to_brick.json index 3c591f35d..f0c46bc6d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_polishing.json index 9cc1fc52c..bed6c556b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_to_brick.json index c7bfae06a..82ef10ebe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_wall_polishing.json index 45c6208ec..db16074c5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_walls_to_brick.json index 710173b32..f153afd86 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_axe.json index d2f5dd5da..b67dea7f5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_blank.json index d28450460..c52553bf9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_cross.json index 126e73e6a..3572ed689 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hammer.json index 00db0ec8a..33c289dc4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hoe.json index c1106665d..11ca07e4a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_horizontal.json index bfe398476..59c3a8297 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_i.json index 4e90178a1..f16475713 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_left.json index 2a476aa42..1e9d24f1b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_pickaxe.json index 6f3bfea76..8b1e0d415 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_plus.json index af37e5d79..abe13101b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_right.json index 14dd115eb..116e0aa9c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_sword.json index e1d7b5dc9..a83e7f19b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_vertical.json index 6747f311f..22d891045 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_slab.json index c5e31e8d0..95cd85004 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:pegmatite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json index 76586bd34..561ca72f9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/pegmatite" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json index 32e7a3fc7..1b28fbd09 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/pegmatite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json index fb6dbfcd6..6f6adde41 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/pegmatite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/pegmatite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_slab.json index 0343b2fc9..4bb4d967a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json index 7180add91..6deab4416 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/pegmatite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json index 2c12f204b..8f8e459c5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/pegmatite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json index ed4578b72..fdcf69d16 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/pegmatite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/pegmatite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_slab.json index f16713f33..795de05b5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json index 7dffab2b2..9834f6360 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/pegmatite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json index e0148726d..2ec38e2b8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/pegmatite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json index be656c820..e6840dfe3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/pegmatite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_to_stone.json index 8e84baa0c..8972478b9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:pegmatite_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:pegmatite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:pegmatite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:pegmatite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json index 8ac76f6a4..207b68d18 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/pegmatite_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:pegmatite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:pegmatite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/pegmatite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:pegmatite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:pegmatite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/pegmatite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json index c0155f2da..8c33efdb9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/peridotite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_block_polishing.json index 1faf69934..e941ba612 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json index 003899d57..b2a3b646b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/peridotite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/peridotite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab.json index e497cbea0..3725ee97d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_polishing.json index da2693fb0..f3117c378 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_recombination.json index 45453befc..6ab231c52 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json index 1001e7060..85b48a638 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/peridotite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs_polishing.json index a8f38b06d..eefd327dd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json index 56800a6c3..4be4c0bc5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/peridotite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall_polishing.json index 82075481d..011c04f8e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json index 93a0d4b93..ca53388ff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:peridotite_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/peridotite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json index 6c00fab9b..f4b065b5d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/peridotite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/peridotite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_brick_slab_recombination.json index 9fa6f723e..5160a313b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slab_recombination.json index 744424379..e0453c6a6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slabs_to_brick.json index fa45765d0..f7a1500e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_stairs_to_brick.json index f5ccd74e8..e8422aafc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_walls_to_brick.json index 777cfb040..799af793d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_polishing.json index fe2781f0e..f211d59ef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_recombination.json index 178538753..af10c3bd1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slabs_to_brick.json index 1cefd1261..1ac871a7d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_polishing.json index 17519091e..90f3cf4f3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_to_brick.json index 2486740d6..12b5c7e5d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_wall_polishing.json index e43c7f88e..8343cb25e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_walls_to_brick.json index ed87bdf81..5025149a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_axe.json index 5e9d8f198..32d53752b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_blank.json index eee95e6d1..aa8d4720b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_cross.json index 3dc29c10e..6bebd90da 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hammer.json index b7ebede43..22d7bdc69 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hoe.json index 604941978..24a622eb3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_horizontal.json index 52c9d94ae..5902d2ac9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_i.json index 66742ab1d..33c5b110f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_left.json index 6b50804f1..630ea02b9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_pickaxe.json index b5c9cef1c..6b576a597 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_plus.json index 108abf8c0..2a76bba9b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_right.json index 932c15e2b..9682b5128 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_sword.json index 2314df32b..0bb0b1f83 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_vertical.json index 843acc42a..ab8dc041d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_slab.json index 7a861bc48..0b9635f77 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:peridotite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json index b18eaecfa..862f10e34 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/peridotite" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json index 96b759d9b..193902dd8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/peridotite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json index 5ffa44122..5be09eee1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/peridotite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/peridotite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_slab.json index 9f3e268c5..7b0eda58d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json index 185e01805..beb26653f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/peridotite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json index 0b129a070..676415697 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/peridotite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json index c06d6ce86..b1081d46b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/peridotite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/peridotite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_slab.json index 1fcc171eb..1c45602b7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json index 9ee001499..b89f981ff 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/peridotite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json index 9aba11d89..be8c4bd56 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/peridotite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json index 26fb82819..dc3dec931 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/peridotite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_to_stone.json index 68e5a2e94..70d98398a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:peridotite_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:peridotite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:peridotite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:peridotite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json index a66f95b60..b7057cfdd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/peridotite_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:peridotite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:peridotite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/peridotite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:peridotite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:peridotite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/peridotite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json index dd566af16..b2b726df5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_block.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phosphorous_block" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phosphorous_block" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phosphorous_block" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phosphorous_dust" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_block" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phosphorous_block" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phosphorous_block" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phosphorous_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json index e2a1a975d..1e8cd3a1f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phosphorous_dust.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phosphorous_dust" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phosphorous_dust" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phosphorous_dust" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phosphorous_block" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phosphorous_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phosphorous_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phosphorous_block" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json index c8bcbf952..97f4cb1f2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/phyllite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_block_polishing.json index 7d7251ac6..9185e5a01 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json index 34c91fa97..2cc6e91a0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/phyllite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/phyllite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab.json index 93c358ed9..8d978e86b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_polishing.json index 7978c14ee..97d409b20 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_recombination.json index 9e4199275..7abb42659 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json index 8abd15ca2..acf14425f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/phyllite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs_polishing.json index 49a3039e9..52b35e196 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json index 2c8d2b56a..9f23e1b85 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/phyllite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall_polishing.json index 379d3f3f4..bbf70d7fb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json index ecdcd15c6..c26f29dc2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:phyllite_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/phyllite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json index df68592e2..8c799b7d2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/phyllite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/phyllite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_brick_slab_recombination.json index 6bfa4a6f1..9932eb9d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slab_recombination.json index 94a667b5d..171a93c29 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slabs_to_brick.json index 35053e666..23d406dc6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_stairs_to_brick.json index 2554e324c..3e4eecd17 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_walls_to_brick.json index 0f29f985c..ca16560eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_polishing.json index 934164b1d..5f620c370 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_recombination.json index b6c9c9e76..0c91b334a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slabs_to_brick.json index 45c923ea4..1994d2313 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_polishing.json index 365251381..7d3b5ad27 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_to_brick.json index 0018e52ac..5d66aa48d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_wall_polishing.json index 27bb97d4f..3fa79b7bf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_walls_to_brick.json index fa12d1c9d..0c853637e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_axe.json index f1122543c..b844ab871 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_blank.json index 67b189366..898b94cb4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_cross.json index 29d5cc50d..f3d0841d0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hammer.json index f97a4dca9..cc70147ec 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hoe.json index c9922c311..e0eb56f15 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_horizontal.json index 49d13f63e..b25c94f64 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_i.json index c6fa350eb..d3578c65c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_left.json index ad32cfb5d..a63e27756 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_pickaxe.json index 86087554d..ae00671e1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_plus.json index 2acb2caf6..875d383ca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_right.json index fdc62a7ad..e0d071e7a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_sword.json index 02b9021a0..6eebc63f6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_vertical.json index 69b9e73d5..332df9b7b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_slab.json index 062848bfb..9f8535726 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:phyllite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json index 02057afdb..cc531ff85 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/phyllite" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json index a3f2ceada..403453008 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/phyllite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json index 338e4a4c4..77c41a9c0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/phyllite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/phyllite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_slab.json index 9916ad485..65245b2b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json index 77aa060c0..5ced82c2b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/phyllite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json index 2fed9a12a..1ca906af4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/phyllite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json index 0d62b5563..d0faa6bcb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/phyllite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/phyllite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_slab.json index 400274ed0..984a05eab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json index db1c9a3f2..3894bc42a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/phyllite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json index a792b1b75..85adaa19a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/phyllite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json index cbd662d46..03249b72b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/phyllite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_to_stone.json index fe9aa765f..94940b1b7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:phyllite_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:phyllite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:phyllite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:phyllite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json index 709a51a53..b0cf269bf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/phyllite_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:phyllite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:phyllite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/phyllite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:phyllite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:phyllite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/phyllite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json index 2c068b113..95dcf7baa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/quartzite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_block_polishing.json index 57518a452..88e7c9320 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json index 32f6d2bc5..880ee0962 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/quartzite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/quartzite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab.json index 0b18be43d..3f65e517b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_polishing.json index febc3b0dc..cd00fdbd1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_recombination.json index 7eaeeb747..f2bd1d16c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json index f1617f6ba..770292d4d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/quartzite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs_polishing.json index a3990d494..286ca343d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json index e535af71a..250465e51 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/quartzite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall_polishing.json index 06008c18b..77f997531 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json index c8d6f85b9..d8db91fe2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:quartzite_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/quartzite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json index 167add218..04fe24f08 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/quartzite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/quartzite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_brick_slab_recombination.json index 48f5a794e..b3448b1a9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slab_recombination.json index e2b5f6eed..6857ae87d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slabs_to_brick.json index 60c199c5b..d43e29554 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_stairs_to_brick.json index 130b87504..9f2836ed1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_walls_to_brick.json index 506226d5b..71d6a26d0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_polishing.json index fd416e996..1e6a51698 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_recombination.json index 58e944c21..658005d16 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slabs_to_brick.json index e8f64a4f9..daabd5c4a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_polishing.json index a30a1d15c..9340419dc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_to_brick.json index 7acaa44b0..b5ee497c2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_wall_polishing.json index ab1fd71f2..6c80e9e7e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_walls_to_brick.json index fcf1afbcb..d75ef45e6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_axe.json index b8092fb56..33f19127a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_blank.json index 9531c3613..3b73d0f1d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_cross.json index ca8758f56..8f0bcbd57 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hammer.json index 72afdf074..fd09123d8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hoe.json index a5bc50b10..2c7463ca8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_horizontal.json index 0172e28ae..71b647639 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_i.json index d14f7958f..820b78589 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_left.json index 0ac996dc7..7ffa3604a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_pickaxe.json index 3752651d4..86b0e9b0a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_plus.json index d9fbfd27e..46542ae28 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_right.json index 5c5057ca7..3b9c81818 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_sword.json index 3aea15deb..22d1516b0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_vertical.json index 315b53c75..e6b8d444a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_slab.json index 7240336f7..0e9f6f2e2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:quartzite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json index 179410daf..331e234b2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/quartzite" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json index 86a9c7611..2594f4780 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/quartzite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json index 21f029d90..dfdf55a1c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/quartzite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/quartzite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_slab.json index 056cc3a85..9f6b76205 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json index 590bc50a8..17b48b1f0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/quartzite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json index 1a8dff665..a21396c63 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/quartzite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json index bf8aea34c..22119b5ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/quartzite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/quartzite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_slab.json index d94b88879..a8cc7f945 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json index 7eae9aefc..2a022eee9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/quartzite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json index 992040b09..a4e3ae385 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/quartzite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json index 879878073..1b6bab133 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/quartzite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_to_stone.json index 1b83f18d6..223260295 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:quartzite_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:quartzite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:quartzite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:quartzite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json index 725f93b7a..fc06308af 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/quartzite_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:quartzite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:quartzite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/quartzite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:quartzite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:quartzite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/quartzite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json index a9f71ea18..ece6d2bd4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rhyolite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_block_polishing.json index 002bb879d..1a6346e1f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json index b021e63f9..f8fc99f17 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/rhyolite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rhyolite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab.json index 401df0bc6..f1c7ccf0a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_polishing.json index b22a0fa63..afb2cb616 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_recombination.json index d991cf7b2..aff64e8a1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json index 64c8a5826..4d8174938 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rhyolite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs_polishing.json index 87ad545f7..dab02b2b5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json index ab3d7a5b5..c0c782ba5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rhyolite/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall_polishing.json index 5aca93620..cbd5a42a3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json index 4071c3a5f..6f40338f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rhyolite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json index 91d779fa2..0b7f442bc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/rhyolite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rhyolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_brick_slab_recombination.json index 8574b64e8..012222b13 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slab_recombination.json index 49cd86407..67050a6b6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slabs_to_brick.json index 9e0c374ff..70f8fc0b4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_stairs_to_brick.json index b057ba7c3..288419b09 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_walls_to_brick.json index 048e368de..449c267f6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_polishing.json index d8e51c1bf..c7a8dd1d1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_recombination.json index 49fc801bd..bdbe95e03 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slabs_to_brick.json index 028dfd394..cae7e25ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_polishing.json index 260b381af..25c701182 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_to_brick.json index 09c33aa6d..ff7e505a5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_wall_polishing.json index 429d15837..ba0c378cd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_walls_to_brick.json index 7d3fe9219..77ce56e18 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_axe.json index ff343c7e5..a00b2c80a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_blank.json index 7324f3dcb..686c893fe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_cross.json index 50a26d732..e69e87282 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hammer.json index 018ff3058..e02f7023e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hoe.json index 16b3966b9..a28ea4eb4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_horizontal.json index fe145d204..05b644652 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_i.json index 525c22f09..b9c6fb532 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_left.json index 6ab182ee0..f7108533d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_pickaxe.json index 8bbdd4243..761efdcfe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_plus.json index 88f52aeea..c98f61076 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_right.json index 0f9855472..ab8b8e111 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_sword.json index 725495ad6..44b3d22b0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_vertical.json index ddc6b879f..a21c06157 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_slab.json index 2fada40a2..f6304e012 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rhyolite" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json index c7a955556..74eb88186 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rhyolite" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json index 48b4b98ba..2f02f6248 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rhyolite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json index 3b3393219..0aaf3805c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/rhyolite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rhyolite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_slab.json index 7d5279e79..e0754f576 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json index 9134511af..d5c382d91 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rhyolite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json index 8e5167394..e00f3deb7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rhyolite/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json index 10a27a57c..d1c19ad11 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/rhyolite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rhyolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_slab.json index 12153ce30..977338bab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json index ecd994388..ba1ea51ef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rhyolite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json index 865949998..6a26e30cb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rhyolite/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json index 5e54fb9c0..e035b8c4a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rhyolite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_to_stone.json index 92f6357c0..e7ae53a73 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:rhyolite_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rhyolite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:rhyolite_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rhyolite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json index 1cdd9827d..3bf071eac 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rhyolite_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rhyolite_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rhyolite_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rhyolite" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rhyolite_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rhyolite_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rhyolite" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json index be39fdb6e..3f40dd869 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_dust" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json index 240b261a7..72f69c2c3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rock_salt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_block_polishing.json index e123d72c3..51f09c36a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json index 1947e2778..3a5e44570 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/rock_salt/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rock_salt/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab.json index 0ed78932e..053c29fe1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_polishing.json index f6268b615..2ec07c1ca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_recombination.json index 9594a7f60..549fda4a3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json index cb8fea282..bd5608b06 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rock_salt/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs_polishing.json index efcf7736e..6aa539606 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json index 1c712e947..49282617a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rock_salt/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall_polishing.json index f25665689..eef66878a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json index b1383a701..109a3bda5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rock_salt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_dust.json index b0d750d6b..18130a4da 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_dust.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_dust" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_dust" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_dust" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json index 1add23870..c38aa94ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/rock_salt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rock_salt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_brick_slab_recombination.json index 436788348..a1398894c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slab_recombination.json index 5dbb2bb22..0e13087b8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slabs_to_brick.json index 31d79e2bf..61065c090 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_stairs_to_brick.json index 2b87a8ae9..ccc6e5157 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_walls_to_brick.json index f4be2e6d7..896458d1e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_polishing.json index 2076da9d1..c436f08c6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_recombination.json index dad818513..fcf4a46ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slabs_to_brick.json index 62eedb5e3..75e51604e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_polishing.json index e6c5b3fe7..e99affff2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_to_brick.json index 2d0335ef3..a926c47c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_wall_polishing.json index e011ca8d4..a633bafd3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_walls_to_brick.json index fd1db5621..eaaca4abc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_axe.json index a1581be52..1c7edd3d8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_blank.json index 08c8f5680..1d295b747 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_cross.json index 1e0334106..8ca2982db 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hammer.json index 5e8bda79e..c7c30fbe9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hoe.json index 2b7aff4e8..e244f79ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_horizontal.json index 674414635..7dca39a0e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_i.json index 113f8bc69..097e285e8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_left.json index 792da0658..4011c6243 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_pickaxe.json index 2d8fc626f..72ebf74ea 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_plus.json index 90de97cb0..b09309229 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_right.json index 564867950..e73dc4224 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_sword.json index c2d2d0acf..6adf187b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_vertical.json index 1bad3a017..30087754a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_slab.json index 17608b4c6..007f4133d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rock_salt" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json index 9d4f8cf6c..1ca000577 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rock_salt" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json index 2c75162b8..850fd8e21 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rock_salt/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json index 77723bdc2..9970f261e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/rock_salt/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rock_salt/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_slab.json index d656cc7e0..d85a6940c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json index 2bd6333f0..bcf540d2f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rock_salt/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json index 7efe2c866..b6ce37f2e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rock_salt/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json index 0ffc344e4..5332b766b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/rock_salt/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/rock_salt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_slab.json index 36fb6a2ca..521b72d25 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json index 2b2b7b3aa..a690ad9fa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rock_salt/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json index cde366c10..d224151d4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rock_salt/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json index 362f6922e..f608fbb83 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rock_salt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_to_stone.json index bbda548f6..d38d6f17c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:rock_salt_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:rock_salt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:rock_salt_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json index 9510ef821..5c94e951d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rock_salt_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rock_salt_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rock_salt_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/rock_salt" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rock_salt_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rock_salt_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/rock_salt" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json index 38e2e9bd8..1e86a41ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json @@ -1,43 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_ROCK_SALT_LAMPS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rocksaltlamp" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rocksaltlamp" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rocksaltlamp" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rock_salt" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltlamp" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rocksaltlamp" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rocksaltlamp" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rock_salt" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json index 1b3cbf024..c778cdbad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json @@ -1,43 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_ROCK_SALT_LAMPS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rocksaltstreetlamp" - } - ], - "rewards": { - "recipes": [ - "mineralogy:rocksaltstreetlamp" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:rocksaltstreetlamp" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:rocksaltlamp" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltstreetlamp" + } + ], + "rewards": { + "recipes": [ + "mineralogy:rocksaltstreetlamp" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:rocksaltstreetlamp" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:rocksaltlamp" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json index a77c2e35b..865875653 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/schist" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_block_polishing.json index 51b6fd6b0..f62748b20 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json index 0102670ae..4e0b621da 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/schist/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/schist/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab.json index a51acfe42..b1dbb6f1e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_polishing.json index 9ed45991a..9d8c60dad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_recombination.json index 60fa2d680..3db7fa80e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json index e1baa5d30..20e047763 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/schist/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs_polishing.json index 40d899fa1..133bc9a78 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json index 71d890dd2..4cb615491 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/schist/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall_polishing.json index 29bbd1fbb..f5eb925ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json index 32244393a..81ff5298c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:schist_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/schist" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:schist_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json index 2b0228c6a..a087ccdcd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/schist" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/schist" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_brick_slab_recombination.json index f85cc9643..2bc50ead9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slab_recombination.json index f0b048dd6..452f9f43f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slabs_to_brick.json index 1c93a8c2f..773dcd0ee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_stairs_to_brick.json index 9de0995b5..266571f5a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_walls_to_brick.json index e36ab4ecb..a9cecf6b0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_polishing.json index a424f8d18..c8b46ae32 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_recombination.json index a42b33aeb..8624965d3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slabs_to_brick.json index ca713f8ab..87bab7e10 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_polishing.json index 0485fcdeb..e2044714b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_to_brick.json index 9d8c27132..baa83cef9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_wall_polishing.json index 58714fd73..b195e8180 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_walls_to_brick.json index 3895611cb..8ec382762 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_axe.json index 51fa2873d..77a1a896d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_blank.json index 4d5bcff5f..547bd2bcc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_cross.json index fe89215e4..5ded27acd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hammer.json index fe7296333..d73b4073f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hoe.json index 875e457cb..cd11fc3bd 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_horizontal.json index 521a83b8b..cdfd09fb4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_i.json index b6b459f4e..eaaf582fc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_left.json index 0c473adce..9ffd053e4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_pickaxe.json index 4e4067572..eb98f042c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_plus.json index 2efcdd874..e8bbda7b0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_right.json index 22bb755bd..2fa7c8562 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_sword.json index 9c30cbf7c..a5f92b7d7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_vertical.json index 68fb3176d..cc46f0ca9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_slab.json index ef1966a05..c55abca06 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:schist" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json index 65b266fb4..fefbf02ca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/schist" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json index e9a56cce2..ce4a4ff11 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/schist/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json index ed9f67a2f..675d6d518 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/schist/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/schist/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_slab.json index 3d117c0c1..c28685b94 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json index f3df59d0a..d3d53e267 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/schist/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json index 39cc21d3d..a0e364b2a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/schist/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json index c37423514..fc587fd0d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/schist/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/schist/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_slab.json index 8842feb86..8e15fbd31 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json index fbfdbfdc9..ad52f9696 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/schist/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json index e1c745051..f9f536af7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/schist/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json index 3662da068..5be1cac9c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/schist" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_to_stone.json index 5048a02be..6464668a8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:schist_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:schist" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:schist_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:schist" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json index 275165a27..d89b7ad42 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/schist_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:schist_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:schist_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/schist" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:schist_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:schist_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/schist" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json index 2dec44e4d..f1de1193e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/scoria" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_block_polishing.json index 80c3093c9..14b2c52e1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json index 9b632143d..e342f82b7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/scoria/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/scoria/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab.json index 0d3eef40d..1ccca1758 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_polishing.json index 967a5e5d1..5449caf26 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_recombination.json index bb582053e..8e5789ebe 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json index cfde9a426..2fd12f4dc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/scoria/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs_polishing.json index e343cf279..0107cfd0b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json index c8824762c..f4f06eab1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/scoria/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall_polishing.json index 7d8f58b77..5f9355056 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json index 1f36055d7..9152dab50 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:scoria_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/scoria" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json index 63f5f94d0..a9482d2f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/scoria" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/scoria" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_brick_slab_recombination.json index beae1a9ce..38b01bc22 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slab_recombination.json index 12afba7b8..c1087bf79 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slabs_to_brick.json index f8078f91a..0a8556d30 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_stairs_to_brick.json index 7426adcac..74b675bf1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_walls_to_brick.json index 37ba142bb..beb9bfd0d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_polishing.json index 8d3f59898..8f6764311 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_recombination.json index ecc4182f0..381645e9a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slabs_to_brick.json index b52735483..8401a0cb0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_polishing.json index 37c0effd9..cb5d3692f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_to_brick.json index e275d790e..dabc74152 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_wall_polishing.json index 1087c522a..98d6afb13 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_walls_to_brick.json index e296923e6..e65e6d97f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_axe.json index eaa2d11ef..2b473fb36 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_blank.json index 58055373b..799c52827 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_cross.json index 9bf35b672..60280e82c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hammer.json index 257954335..082e4ef55 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hoe.json index 3bf378d96..0f97c5b80 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_horizontal.json index df6eac6a9..0f92209b7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_i.json index dc58695a9..0126ed0b9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_left.json index 9dbcdf6cd..998701a7b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_pickaxe.json index 54a13daf5..57ec013d9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_plus.json index ae4c61409..0a3f27181 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_right.json index 6169eba46..907fa458d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_sword.json index 9e71c6556..6ddb473e8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_vertical.json index 89a000da6..f7d356433 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_slab.json index 4e7d0912c..8f0dd4f58 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:scoria" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json index a086ba723..49f4f540f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/scoria" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json index 9770f0f93..da434cc9b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/scoria/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json index f1c6f503c..363d9e783 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/scoria/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/scoria/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_slab.json index 0ced9f040..1ccb175a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json index 1d0e91505..30e5baa2e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/scoria/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json index 460779681..f08453b9f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/scoria/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json index 6475aa899..f66328ee9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/scoria/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/scoria/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_slab.json index 3f0480c3d..84fa5dbd7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json index 0d842d8a9..70c7b914c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/scoria/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json index b1d8f2c77..22bada23a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/scoria/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json index 0dccb0c8e..802d0a47d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/scoria" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_to_stone.json index 4414f3e4a..bae399f83 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:scoria_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:scoria" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:scoria_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:scoria" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json index e8101b680..70080c282 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/scoria_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:scoria_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:scoria_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/scoria" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:scoria_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:scoria_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/scoria" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json index d18e96fed..c08ddf22f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/shale" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_block_polishing.json index 2e60eb085..2671b1e37 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json index ac6fbe2fe..743ae0d0d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/shale/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/shale/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab.json index 9e48f73e8..50fbc4746 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_polishing.json index 06454ef36..bbfd5ea54 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_recombination.json index 05604cf04..bbcf84402 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json index 4a0092db6..e5c30a781 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/shale/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs_polishing.json index f968db796..b42b67eef 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json index b09c0801a..100285025 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/shale/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall_polishing.json index 54281bbd0..ca5ea2371 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json index 10af1ffb9..278d99242 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:shale_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/shale" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:shale_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json index 44946d73e..e9255888e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/shale" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/shale" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_brick_slab_recombination.json index 7639d4366..2b76053f1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slab_recombination.json index 780954af0..ebc2c37b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slabs_to_brick.json index 25ba554b3..61be42aa2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_stairs_to_brick.json index 675eb742f..87a9bbbc9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_walls_to_brick.json index 77ff6aeca..9f91faea4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_polishing.json index 1b15eae25..588a2e293 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_recombination.json index 8475d27e7..f170378ba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slabs_to_brick.json index 5b4bf660f..9bb830a99 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_polishing.json index 92cf7ea85..63a7c7b4e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_to_brick.json index ea86b616f..03d9c64a5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_wall_polishing.json index 3e168c00d..041ce9d88 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_walls_to_brick.json index 20bb901cf..10c01f7fc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_axe.json index 373a9fbf8..1c13c2ebb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_blank.json index 63628f600..d520c3da4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_cross.json index 0d2b6ff62..473b35eb6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hammer.json index e0189c840..a4dee7817 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hoe.json index fcc06860f..62b725125 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_horizontal.json index 17be58e97..c205f580a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_i.json index 5279a3d27..64f1a09da 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_left.json index f38e49bf6..2f148d8c4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_pickaxe.json index 90765b7d1..9bf1c4383 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_plus.json index 73656356d..428f1e5de 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_right.json index 63c50fda2..3cc548f81 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_sword.json index e40e7df08..fd8ae0d8b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_vertical.json index 52505e3da..660e4a124 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_slab.json index f1cc21ed6..57d3c741d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:shale" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json index e966e890c..a2735a0cb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/shale" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json index e67dadbaa..6f8c6f42d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/shale/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json index 4be74a8f2..5593f374e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/shale/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/shale/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_slab.json index 8beadc1bb..db7f99057 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json index 29ddd7b2f..a30f35f8d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/shale/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json index 71c7445b8..c73657f47 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/shale/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json index f94bbfbcb..64c53e764 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/shale/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/shale/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_slab.json index b60cbe6c6..12ef6b515 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json index 6598a70e1..63f752637 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/shale/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json index 08bdc6009..f3f03517a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/shale/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json index 8d81e6931..ae4731826 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/shale" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_to_stone.json index 2878e95da..45e57dc71 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:shale_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:shale" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:shale_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:shale" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json index 6b51b1c3a..80df05d3f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/shale_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:shale_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:shale_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/shale" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:shale_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:shale_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/shale" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json index d123cc6ba..10795fb26 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/siltstone" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_block_polishing.json index be3993c89..eb452a9b1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json index c91bcdd88..04ad34875 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/siltstone/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/siltstone/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab.json index 262d29f71..0296c2e55 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_polishing.json index 7ff946e4a..12688eff6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_recombination.json index 6f597cffd..ae568a5f1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json index c69258fb0..61d7ed873 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/siltstone/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs_polishing.json index 1cfef2b82..cdaf1dee2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json index 2702d8122..a6ca42eaf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/siltstone/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall_polishing.json index 9571b3252..6c3e4990c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json index 4fd46830a..719a5451c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:siltstone_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/siltstone" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json index 5ec7d3454..773bbb97d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/siltstone" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/siltstone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_brick_slab_recombination.json index b84c8c470..f1c5dd03c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slab_recombination.json index 96080cc3d..242a57a72 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slabs_to_brick.json index b480107a0..21ad744da 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_stairs_to_brick.json index ca9bd0ffb..c603c13de 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_walls_to_brick.json index 9a83c1613..4e719e832 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_polishing.json index 0f3864ea0..6e45ba050 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_recombination.json index 9d49d88d7..1102f5083 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slabs_to_brick.json index b8ee6680e..7d61ce558 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_polishing.json index 82ec33408..5d4c26ee9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_to_brick.json index 16a4c1a8c..342e84658 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_wall_polishing.json index adfd5b7b4..4e19898ab 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_walls_to_brick.json index 43fce9948..76aafdb31 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_axe.json index f1389ad21..c2d21b558 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_blank.json index f41b50774..2b05c7ded 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_cross.json index 49515980e..0b674413f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hammer.json index 722badf43..0d168d978 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hoe.json index 06a9fb0b1..a0bfeb255 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_horizontal.json index 78b707d4a..9acd8c7d5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_i.json index 3fbaa6c07..3dd8f3530 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_left.json index 30d5c07cf..ee0c48c7b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_pickaxe.json index 406ca9686..722a6f3d5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_plus.json index cda06dfc5..02c7d0489 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_right.json index bf760229d..982f60eb0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_sword.json index 14fc65fe3..f7c11e5b7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_vertical.json index 73fc46ce3..08bd78e03 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_slab.json index 0d61f7de5..2763a319f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:siltstone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json index 3e052cfca..f118562f4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/siltstone" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json index 1c2cb150e..82953d08c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/siltstone/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json index e9d140fbf..6a639b00b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/siltstone/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/siltstone/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_slab.json index c44fa4e47..30f63293b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json index 56144ec6e..06119d087 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/siltstone/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json index a27cf0439..8dc53758c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/siltstone/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json index 0560bfa0b..2ba6c13eb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/siltstone/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/siltstone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_slab.json index 0c5018a7a..48a6b8b67 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json index ccfc1c6f3..52e656b3b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/siltstone/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json index 0c788931f..8ca8c9c40 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/siltstone/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json index 56d97dea1..8eeb1f23e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/siltstone" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_to_stone.json index 19276846f..ec2fcab18 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:siltstone_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:siltstone" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:siltstone_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:siltstone" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json index 5edd21bc8..dff08bbee 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/siltstone_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:siltstone_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:siltstone_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/siltstone" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:siltstone_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:siltstone_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/siltstone" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json index cb20537c6..56face22c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/slate" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_block_polishing.json index d0023677f..7c29cb057 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json index 455163e70..157119e77 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/slate/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/slate/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab.json index 4aab05080..575576141 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_polishing.json index 5f61c8492..402806507 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_recombination.json index 3dbe2f923..993e4f27a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json index 317d378a5..19b8842ca 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/slate/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs_polishing.json index 237fc90c5..1c447e04b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json index 391213c95..fc197dfc2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/slate/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall_polishing.json index 141e01e15..02bed47a6 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json index 8e20711ea..376b95251 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:slate_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/slate" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:slate_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json index ad23d2a45..71f88c505 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/slate" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/slate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_brick_slab_recombination.json index b5ce2eaf4..020af723e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slab_recombination.json index e17d6a8f9..f213fa7cb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slabs_to_brick.json index 638822025..6b27e904a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_stairs_to_brick.json index 1402d7537..b02a331da 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_walls_to_brick.json index a7c3e5845..310b39197 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_polishing.json index e7bef8f49..6bbbdc113 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_recombination.json index fd4091e46..e44592d15 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slabs_to_brick.json index ed5df22b8..77f198d07 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_polishing.json index a601ebc43..9c8c154f1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_to_brick.json index 3d09ae817..042913e4b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_wall_polishing.json index 523b5fa9a..91a9b7987 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_walls_to_brick.json index 36ba48056..af8954a13 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_axe.json index 85157e6b3..754b237f2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_blank.json index ba2b03586..7bae0e712 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_blank.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_cross.json index c91a4a1c1..e2e900788 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hammer.json index a429cd76b..31d4d69a9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hoe.json index 7746cfe10..b30f0f453 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_horizontal.json index ccc928d66..5dad9b738 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_i.json index 9785e56c1..919351d4e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_left.json index 1f736c3a6..218ae1bd1 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_pickaxe.json index e2ad124f0..db8240e9e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_plus.json index 847777f6e..9e14ca936 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_right.json index 4cc3e8abe..6e7288dcf 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_sword.json index c64106a3f..5e9e71b96 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_vertical.json index a504cba56..32c3ba73d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_slab.json index b9ca457fd..8b11d0149 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_slab.json @@ -1,39 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "mineralogy:slate" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json index 7a444fba6..aff6d6a6e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/slate" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json index e6a6df768..f5f7c9940 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/slate/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json index 02121b817..0e71e584a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/slate/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/slate/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_slab.json index 0c751f28c..2498af630 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json index 7063e2ce2..b3dfeb384 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/slate/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json index 91836a95d..2492fa73a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/slate/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json index 5dec16003..b7071d4aa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/slate/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/slate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_slab.json index 1950c65b1..7ef7238ae 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate_smooth" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json index ed09f3929..e80c9b09e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/slate/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json index bf1bcbc05..2cd09d0a3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/slate/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json index 519858e2b..193be4e26 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/slate" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_to_stone.json index 60b71ad88..f41ca56a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:slate_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:slate" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:slate_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:slate" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json index 7746a04ac..7e008f67f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/slate_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:slate_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:slate_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/slate" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:slate_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:slate_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/slate" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json index 312f9fa31..46ef79a37 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_block.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:sulfur_block" - } - ], - "rewards": { - "recipes": [ - "mineralogy:sulfur_block" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:sulfur_block" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:sulfur_dust" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_block" + } + ], + "rewards": { + "recipes": [ + "mineralogy:sulfur_block" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:sulfur_block" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:sulfur_dust" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json index 6c18daf0b..ea78406d8 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/sulfur_dust.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:sulfur_dust" - } - ], - "rewards": { - "recipes": [ - "mineralogy:sulfur_dust" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:sulfur_dust" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:sulfur_block" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_dust" + } + ], + "rewards": { + "recipes": [ + "mineralogy:sulfur_dust" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:sulfur_dust" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:sulfur_block" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json index 4c6d719d8..ea5c77b39 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/tuff" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_block_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_block_polishing.json index cee166b47..45fd568ce 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_block_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_brick_block_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick_block_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_brick" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_block_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_block_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_brick" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json index d6730dcf4..ba3ba45a9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/tuff/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/tuff/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab.json index 0dc690f18..c69de25bb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_polishing.json index e2f6098c6..0b6c7142e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_brick_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_brick_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_brick_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_recombination.json index bb29159e6..41b63f54c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json index 7ebe363ba..a95107876 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/tuff/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs_polishing.json index de35dae60..dbeeeebfa 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_brick_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_brick_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_brick_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json index 458f0a3cf..68c6f109c 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/tuff/brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall_polishing.json index 64b49820c..7ace17c24 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_brick_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_brick_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_brick_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_brick_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_brick_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_brick_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_brick_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json index 4a809ff69..ee70874a2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_cobblestone.json @@ -1,32 +1,34 @@ { - "conditions": [], - "rewards": { - "recipes": [ - "mineralogy:tuff_cobblestone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_cobblestone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/tuff" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_cobblestone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_cobblestone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json index f2c2d67ab..310786a69 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/tuff" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/tuff" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_brick_slab_recombination.json index 99cda9eb3..f8e104869 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_brick_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_polished_brick_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_polished_brick_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_smooth_brick_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_polished_brick_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_brick_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_smooth_brick_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slab_recombination.json index f06307b1f..d8abf518f 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_polished_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_polished_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_polished_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slabs_to_brick.json index e458f40fa..fe74c85d2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_polished_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_polished_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_smooth_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_polished_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_smooth_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_stairs_to_brick.json index 19c30ab9f..7385b2461 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_polished_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_polished_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_smooth_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_polished_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_smooth_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_walls_to_brick.json index 4ed94cbc2..0ea2d4f4d 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_polished_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_polished_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_polished_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_smooth_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_polished_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_polished_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_smooth_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_polishing.json index 1fefbdd5d..333bb4cf3 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_raw_slab_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_raw_slab_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_slab" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_slab_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_slab_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_slab" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_recombination.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_recombination.json index 5de9a14b1..d844f1980 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slab_recombination.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_raw_slab_recombination" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_raw_slab_recombination" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_slab_recombination" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_slab_recombination" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slabs_to_brick.json index ee13e391b..28275adb0 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_slabs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_raw_slabs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_raw_slabs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_slab" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_slabs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_slabs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_slab" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_polishing.json index 3fc277df7..9877ff0ed 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_raw_stairs_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_raw_stairs_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_stairs" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_stairs_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_stairs_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_stairs" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_to_brick.json index 649a69f7d..cc41945c5 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_stairs_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_raw_stairs_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_raw_stairs_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_stairs" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_stairs_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_stairs_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_stairs" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_wall_polishing.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_wall_polishing.json index 03475e6c8..9b6175aeb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_wall_polishing.json @@ -1,66 +1,72 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_raw_wall_polishing" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_raw_wall_polishing" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_wall" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - }, - "has_red_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:red_sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand", - "has_red_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_wall_polishing" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_wall_polishing" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_wall" + ] + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + }, + "has_red_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand", + "has_red_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_walls_to_brick.json index 6d3a60936..b4a9b8845 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_raw_walls_to_brick.json @@ -1,41 +1,43 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_raw_walls_to_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_raw_walls_to_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_wall" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_raw_walls_to_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_raw_walls_to_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_wall" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_axe.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_axe.json index b2ac6f2ed..6fd7cbfba 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_axe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_axe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_axe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_axe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_axe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_axe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_axe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_axe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_blank.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_blank.json index 8fd9aef21..d2a76e998 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_blank.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_blank.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_blank" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_blank" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_blank" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_blank" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_blank" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_blank" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_cross.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_cross.json index bf64fc126..ce735ab65 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_cross.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_cross.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_cross" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_cross" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_cross" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_cross" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_cross" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_cross" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hammer.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hammer.json index 9cb88dded..159b21252 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hammer.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hammer.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_hammer" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_hammer" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_hammer" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hammer" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_hammer" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_hammer" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hoe.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hoe.json index ee25441b4..8698a7c29 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hoe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_hoe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_hoe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_hoe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_hoe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hoe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_hoe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_hoe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_horizontal.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_horizontal.json index 9eea2f48b..7c170103b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_horizontal.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_horizontal" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_horizontal" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_horizontal" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_horizontal" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_horizontal" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_horizontal" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_i.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_i.json index 3fefdca1a..303ef46d4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_i.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_i.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_i" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_i" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_i" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_i" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_i" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_i" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_left.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_left.json index fbcb0940b..84561d3ad 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_left.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_left.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_left" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_left" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_left" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_left" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_left" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_left" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_pickaxe.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_pickaxe.json index d8802367c..26d24e070 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_pickaxe.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_pickaxe" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_pickaxe" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_pickaxe" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_pickaxe" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_pickaxe" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_pickaxe" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_plus.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_plus.json index a7866eed8..e8f84483e 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_plus.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_plus.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_plus" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_plus" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_plus" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_plus" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_plus" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_plus" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_right.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_right.json index e02cfd0aa..6eda57ac4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_right.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_right.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_right" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_right" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_right" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_relief_left" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_right" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_right" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_right" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_left" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_sword.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_sword.json index c740f99a0..4711947ac 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_sword.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_sword.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_sword" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_sword" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_sword" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_sword" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_sword" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_sword" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_vertical.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_vertical.json index b791172a4..d91708dc4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_vertical.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_relief_vertical.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_vertical" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_relief_vertical" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_relief_vertical" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_relief_blank" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_vertical" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_relief_vertical" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_relief_vertical" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_relief_blank" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_slab.json index 9796c9b8a..94ca821a4 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_slab.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:crafting_materials/tuff" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json index 954865c55..4df07c5c2 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth.json @@ -1,51 +1,53 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/tuff" - } - ] - } - }, - "has_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:sand" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ], - [ - "has_the_recipe", - "has_sand" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff" + } + ] + } + }, + "has_sand": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sand" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ], + [ + "has_the_recipe", + "has_sand" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json index b7fcedbe9..c3950d2d7 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_brick" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_brick" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/tuff/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_brick" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_brick" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json index cfac06ae9..be36b2d53 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_brick_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_brick_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/tuff/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_brick_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_brick_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/tuff/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_slab.json index d94491e16..3bab27067 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_slab.json @@ -1,37 +1,39 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_brick_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_brick_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_brick_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_brick_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff_smooth_brick" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json index 363c58f00..847a67f30 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_brick_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_brick_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/tuff/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_brick_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_brick_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json index 295a1a98a..ea40252dc 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_brick_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_brick_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_brick_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/tuff/smooth_brick" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_brick_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_brick_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/smooth_brick" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json index caa06983c..58e663f51 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_furnace.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_furnace" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_furnace" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_furnace" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:slabs/tuff/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_furnace" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_furnace" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_furnace" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:slabs/tuff/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_slab.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_slab.json index 4f024b487..860138c2a 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_slab.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_slab.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_slab" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_slab" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff_smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_slab" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json index 1d007dc40..1d12f2c59 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/tuff/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json index 8258e06ac..6050e5cfb 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_smooth_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_smooth_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_smooth_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/tuff/smooth" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_smooth_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_smooth_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff/smooth" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json index e7a22836d..73b318866 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_stairs.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_stairs" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_stairs" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_stairs" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/tuff" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_stairs" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_to_stone.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_to_stone.json index 87920f78f..6f4eef5e9 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_to_stone.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_to_stone.json @@ -1,31 +1,33 @@ { - "rewards": { - "recipes": [ - "mineralogy:tuff_to_stone" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_to_stone" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "mineralogy:tuff" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "rewards": { + "recipes": [ + "mineralogy:tuff_to_stone" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_to_stone" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "mineralogy:tuff" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json b/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json index bed622d53..ca375c69b 100644 --- a/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json +++ b/src/main/resources/data/mineralogy/advancements/recipes/tuff_wall.json @@ -1,37 +1,37 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_wall" - } - ], - "rewards": { - "recipes": [ - "mineralogy:tuff_wall" - ] - }, - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "mineralogy:tuff_wall" - } - }, - "has_rock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "mineralogy:stones/tuff" - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_rock" - ] - ] + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + } + ], + "rewards": { + "recipes": [ + "mineralogy:tuff_wall" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "mineralogy:tuff_wall" + } + }, + "has_rock": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "mineralogy:stones/tuff" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rock" + ] + ] } diff --git a/src/main/resources/data/mineralogy/orespawn/provider.json b/src/main/resources/data/mineralogy/orespawn/provider.json index 6d8e33aaf..9db0195bb 100644 --- a/src/main/resources/data/mineralogy/orespawn/provider.json +++ b/src/main/resources/data/mineralogy/orespawn/provider.json @@ -31,7 +31,8 @@ "mineralogy:andesite": "minecraft:andesite", "mineralogy:basalt": "minecraft:basalt", "mineralogy:diorite": "minecraft:diorite", - "mineralogy:granite": "minecraft:granite" + "mineralogy:granite": "minecraft:granite", + "mineralogy:tuff": "minecraft:tuff" }, "cyano": { "geome_size": 100, @@ -44,7 +45,8 @@ "biome_ids": [], "biome_namespaces": [], "host_blocks": [ - "minecraft:stone" + "minecraft:stone", + "minecraft:deepslate" ], "host_tags": [] } @@ -169,7 +171,7 @@ "min_y": 0, "max_y": 255, "ore_replaceable": true, - "block": "mineralogy:tuff" + "block": "minecraft:tuff" }, "mineralogy:rock/mineralogy/pumice": { "family": "igneous_volcanic", @@ -576,7 +578,8 @@ "igneous_volcanic" ], "host_tags": [ - "forge:stone" + "minecraft:stone_ore_replaceables", + "minecraft:deepslate_ore_replaceables" ] } }, @@ -599,7 +602,8 @@ "igneous_volcanic" ], "host_tags": [ - "forge:stone" + "minecraft:stone_ore_replaceables", + "minecraft:deepslate_ore_replaceables" ] } }, @@ -622,7 +626,8 @@ "igneous_volcanic" ], "host_tags": [ - "forge:stone" + "minecraft:stone_ore_replaceables", + "minecraft:deepslate_ore_replaceables" ] } }, diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json index 261ae3de0..5260c5732 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_block_polishing.json index d43fe6c8d..22784fc5f 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:amphibolite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_furnace.json index 53a7cb45f..6f3067120 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/amphibolite/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/amphibolite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab.json index 19b3a9c58..0844f6c69 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_polishing.json index 01e06b925..9acc6d823 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:amphibolite_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_recombination.json index 39412b21a..53ecceedd 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_brick_slab" - }, - { - "item": "mineralogy:amphibolite_brick_slab" - } - ], - "result": { - "item": "mineralogy:amphibolite_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick_slab" + }, + { + "item": "mineralogy:amphibolite_brick_slab" + } + ], + "result": { + "item": "mineralogy:amphibolite_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs.json index d8318982c..169c07cac 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/amphibolite/brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs_polishing.json index 676b1fc22..5e2fd45d2 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:amphibolite_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall.json index 1ec4997cc..3cf543947 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/amphibolite/brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall_polishing.json index 93026431d..d0c2115c1 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:amphibolite_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/amphibolite_cobblestone.json index bbee9e384..edbc9fba4 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/amphibolite" - }, - { - "tag": "mineralogy:stones/amphibolite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/amphibolite" + }, + { + "tag": "mineralogy:stones/amphibolite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json b/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json index 68351b492..dd8fdd3dc 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/amphibolite" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:amphibolite_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/amphibolite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:amphibolite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_brick_slab_recombination.json index cd3eb34fc..561202097 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_smooth_brick_slab" - }, - { - "item": "mineralogy:amphibolite_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:amphibolite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_smooth_brick_slab" + }, + { + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slab_recombination.json index 5368ab8fa..5b2847dec 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_smooth_slab" - }, - { - "item": "mineralogy:amphibolite_smooth_slab" - } - ], - "result": { - "item": "mineralogy:amphibolite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "item": "mineralogy:amphibolite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slabs_to_brick.json index ef8c52b37..921622f22 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth_slab" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_stairs_to_brick.json index b2d21b84d..d760123ff 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_walls_to_brick.json index 44b237185..dd5c5f0a5 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth_wall" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_polishing.json index 5dbcc5c73..5c91b2377 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:amphibolite_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_recombination.json index a956c7d16..9bcf682d8 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_slab" - }, - { - "item": "mineralogy:amphibolite_slab" - } - ], - "result": { - "item": "mineralogy:amphibolite", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_slab" + }, + { + "item": "mineralogy:amphibolite_slab" + } + ], + "result": { + "item": "mineralogy:amphibolite", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slabs_to_brick.json index d6c288398..684890ce9 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_slab" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_slab" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_polishing.json index b9cb6d84f..ad65b8c30 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:amphibolite_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_to_brick.json index 9e37803bb..f1c91a178 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_stairs" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_stairs" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_wall_polishing.json index dcf1c5ab3..8ceabe30f 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:amphibolite_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_walls_to_brick.json index 941c8a05c..e5807bace 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_wall" - } - }, - "result": { - "item": "mineralogy:amphibolite_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_wall" + } + }, + "result": { + "item": "mineralogy:amphibolite_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_axe.json index 6ad12ea63..8430086e1 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:amphibolite_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:amphibolite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_blank.json index 43ca16f7c..09571c10d 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_cross.json index 64788a340..7e23747bf 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hammer.json index 6a5cbf04c..a266ce7be 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hoe.json index 44fafa213..c924d645b 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:amphibolite_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:amphibolite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_horizontal.json index 614be0f46..d21e805f9 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_i.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_i.json index 6e0ec4f98..86825ffc7 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_left.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_left.json index b12dfb1a3..8aaf58447 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_pickaxe.json index 30c933275..d79e21adc 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:amphibolite_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:amphibolite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_plus.json index 913995396..fc3b18a29 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_right.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_right.json index 601a89c4e..0d8e6c057 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_relief_left" - }, - { - "item": "mineralogy:amphibolite_relief_left" - } - ], - "result": { - "item": "mineralogy:amphibolite_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_left" + }, + { + "item": "mineralogy:amphibolite_relief_left" + } + ], + "result": { + "item": "mineralogy:amphibolite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_sword.json index 431f6e59f..3d111ef13 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "mineralogy:amphibolite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:amphibolite_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "mineralogy:amphibolite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:amphibolite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_vertical.json index 64432483e..2bb055305 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:amphibolite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json b/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json index b4f9f5b4a..af6aa6dca 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite" + } + }, + "result": { + "item": "mineralogy:amphibolite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json index 506473bad..eae23bc79 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/amphibolite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:amphibolite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/amphibolite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:amphibolite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick.json index 7a2af45cc..aa3bfbf37 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/amphibolite/smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_furnace.json index f8910747e..aeabf96f2 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/amphibolite/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/amphibolite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_slab.json index 7adabf4ec..bd2e7438b 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_stairs.json index 7013273dc..a48175516 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/amphibolite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_wall.json index 559f46077..96b275299 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/amphibolite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_furnace.json index 8d0ec9a71..923b3a628 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/amphibolite/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/amphibolite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_slab.json index a3e5e8dcb..9872c016c 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:amphibolite_smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_stairs.json index 7d98fda0a..d3762b3ea 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/amphibolite/smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_wall.json index 663734aa4..b36304d06 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/amphibolite/smooth" - } - }, - "result": { - "item": "mineralogy:amphibolite_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite/smooth" + } + }, + "result": { + "item": "mineralogy:amphibolite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json b/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json index 765f21bc0..1e651319f 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite" + } + }, + "result": { + "item": "mineralogy:amphibolite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json b/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json index c6797de98..729a00d6b 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:amphibolite_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/amphibolite" + } + }, + "result": { + "item": "mineralogy:amphibolite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_brick.json index 4dd181564..5740d9c37 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/andesite" - } - }, - "result": { - "item": "mineralogy:andesite_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite" + } + }, + "result": { + "item": "mineralogy:andesite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_block_polishing.json index d85746e8d..0b40f75c1 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:andesite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_furnace.json index edeefe3b5..8f18b2227 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/andesite/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:andesite_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/andesite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:andesite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab.json index 1632cc350..c78f6b288 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_brick" - } - }, - "result": { - "item": "mineralogy:andesite_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_brick" + } + }, + "result": { + "item": "mineralogy:andesite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_polishing.json index e4a8cf66e..d3c47a4f0 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:andesite_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_recombination.json index eb38d6051..596e10490 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_brick_slab" - }, - { - "item": "mineralogy:andesite_brick_slab" - } - ], - "result": { - "item": "mineralogy:andesite_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick_slab" + }, + { + "item": "mineralogy:andesite_brick_slab" + } + ], + "result": { + "item": "mineralogy:andesite_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs.json index 5cb899a61..e50feedbe 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/andesite/brick" - } - }, - "result": { - "item": "mineralogy:andesite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/brick" + } + }, + "result": { + "item": "mineralogy:andesite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs_polishing.json index 7bd553a7d..fc64b61a9 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:andesite_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_wall.json index 1f2df7387..fc0a9e9af 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/andesite/brick" - } - }, - "result": { - "item": "mineralogy:andesite_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/brick" + } + }, + "result": { + "item": "mineralogy:andesite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_brick_wall_polishing.json index b6def452d..b01334fd0 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:andesite_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/andesite_cobblestone.json index 4a0d8161f..90f2e7e7c 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/andesite" - }, - { - "tag": "mineralogy:stones/andesite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/andesite" + }, + { + "tag": "mineralogy:stones/andesite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_furnace.json b/src/main/resources/data/mineralogy/recipes/andesite_furnace.json index b8f6c7d6a..c6f6938ad 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/andesite" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:andesite_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/andesite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:andesite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_brick_slab_recombination.json index f6797ea97..44941b733 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_smooth_brick_slab" - }, - { - "item": "mineralogy:andesite_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:andesite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_smooth_brick_slab" + }, + { + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_slab_recombination.json index e1b0eaef9..c5080bdb9 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_smooth_slab" - }, - { - "item": "mineralogy:andesite_smooth_slab" - } - ], - "result": { - "item": "mineralogy:andesite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_smooth_slab" + }, + { + "item": "mineralogy:andesite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:andesite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_slabs_to_brick.json index 160f20a8e..edbe54bb3 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth_slab" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_stairs_to_brick.json index e140835d4..1061c426a 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_polished_walls_to_brick.json index 240b5eec2..eae25f636 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth_wall" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_polishing.json index aca90a73a..54a355e6d 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:andesite_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_recombination.json index 09b908f9e..58c605f5d 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_slab" - }, - { - "item": "mineralogy:andesite_slab" - } - ], - "result": { - "item": "mineralogy:andesite", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_slab" + }, + { + "item": "mineralogy:andesite_slab" + } + ], + "result": { + "item": "mineralogy:andesite", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_slabs_to_brick.json index 44148b3b7..0e1ba6592 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_slab" - } - }, - "result": { - "item": "mineralogy:andesite_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_slab" + } + }, + "result": { + "item": "mineralogy:andesite_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_polishing.json index c22d3249e..d5335cfac 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:andesite_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_to_brick.json index 1a3e018c0..962cfa533 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_stairs" - } - }, - "result": { - "item": "mineralogy:andesite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_stairs" + } + }, + "result": { + "item": "mineralogy:andesite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_wall_polishing.json index 5bf3a58c5..a6a0d96d8 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:andesite_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_raw_walls_to_brick.json index 7887e321b..14ec700b5 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_wall" - } - }, - "result": { - "item": "mineralogy:andesite_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_wall" + } + }, + "result": { + "item": "mineralogy:andesite_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_axe.json index c4e870261..a3444878f 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:andesite_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:andesite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json index 0a7c4cfbc..de99c73fb 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/andesite/smooth" - } - }, - "result": { - "item": "mineralogy:andesite_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth" + } + }, + "result": { + "item": "mineralogy:andesite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_cross.json index b1f91a1f9..0cae2f918 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_hammer.json index 8caccad41..2c115d488 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_hoe.json index 92ab5e384..9d5b45d59 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:andesite_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:andesite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_horizontal.json index dc8ed5435..ce9f238b9 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_i.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_i.json index c242db482..4d4d2aa9d 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_left.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_left.json index 574fd7ae2..802eed0d5 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_pickaxe.json index be07b4e67..d61f2f0b0 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:andesite_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:andesite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_plus.json index db0ce57fc..e95b092c4 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_right.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_right.json index c58d29389..5a088311c 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_relief_left" - }, - { - "item": "mineralogy:andesite_relief_left" - } - ], - "result": { - "item": "mineralogy:andesite_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_left" + }, + { + "item": "mineralogy:andesite_relief_left" + } + ], + "result": { + "item": "mineralogy:andesite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_sword.json index 2aae0272b..1d98482d9 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "mineralogy:andesite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:andesite_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "mineralogy:andesite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:andesite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/andesite_relief_vertical.json index b6568f884..634f06e71 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_blank" - } - }, - "result": { - "item": "mineralogy:andesite_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:andesite_relief_blank" + } + }, + "result": { + "item": "mineralogy:andesite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_slab.json b/src/main/resources/data/mineralogy/recipes/andesite_slab.json index fe295ce48..84448be70 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite" - } - }, - "result": { - "item": "mineralogy:andesite_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite" + } + }, + "result": { + "item": "mineralogy:andesite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/andesite_slab_from_vanilla.json index c676332a5..e9eb7b104 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_slab_from_vanilla.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:andesite_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:andesite_slab" - } - ], - "result": { - "item": "mineralogy:andesite_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:andesite_slab" + } + ], + "result": { + "item": "mineralogy:andesite_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/andesite_slab_to_vanilla.json index 357f28a6c..6cb241219 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_slab_to_vanilla.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:andesite_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_slab" - } - ], - "result": { - "item": "minecraft:andesite_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:andesite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_slab" + } + ], + "result": { + "item": "minecraft:andesite_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth.json index 3dd79dce9..9a0161586 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:andesite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:andesite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick.json index 8964b5de1..ba669938d 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/andesite/smooth" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_furnace.json index 401cc2283..8d0299092 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/andesite/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/andesite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_slab.json index 4164e7b04..7ec534eb6 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_stairs.json index 162b1d811..a317c793b 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/andesite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_wall.json index 6f5d0623c..0fa95bb26 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/andesite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_furnace.json index 728fd720b..cbb7f8cc0 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/andesite/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/andesite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab.json index 0eece1401..5a3108780 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_from_vanilla.json index 1a82652a5..1acebfab3 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_from_vanilla.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_andesite_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:polished_andesite_slab" - } - ], - "result": { - "item": "mineralogy:andesite_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_andesite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:polished_andesite_slab" + } + ], + "result": { + "item": "mineralogy:andesite_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_to_vanilla.json index 6d793ff4e..f7c3990d7 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_slab_to_vanilla.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_andesite_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:andesite_smooth_slab" - } - ], - "result": { - "item": "minecraft:polished_andesite_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_andesite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_smooth_slab" + } + ], + "result": { + "item": "minecraft:polished_andesite_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json index bc09b440f..e58f87740 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite_smooth" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite_smooth" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth_wall.json index 8de8ca6f4..91824e0a9 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/andesite/smooth" - } - }, - "result": { - "item": "mineralogy:andesite_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/andesite/smooth" + } + }, + "result": { + "item": "mineralogy:andesite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_stairs.json index b935cff1e..7a5e3f930 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite" - } - }, - "result": { - "item": "mineralogy:andesite_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite" + } + }, + "result": { + "item": "mineralogy:andesite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_wall.json index 265f53836..baf0cac41 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:andesite_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite" - } - }, - "result": { - "item": "mineralogy:andesite_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:andesite" + } + }, + "result": { + "item": "mineralogy:andesite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_brick.json index 2ee5e5514..4ed70aa03 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basalt" - } - }, - "result": { - "item": "mineralogy:basalt_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt" + } + }, + "result": { + "item": "mineralogy:basalt_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_block_polishing.json index 832738960..36c893a55 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:basalt_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_furnace.json index e1523700d..1dd19ba48 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/basalt/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basalt_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basalt/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basalt_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab.json index 904592a43..485cb8bf2 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_brick" - } - }, - "result": { - "item": "mineralogy:basalt_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_brick" + } + }, + "result": { + "item": "mineralogy:basalt_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_polishing.json index 46039f079..4b1625477 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:basalt_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_recombination.json index fe247d251..2a849f5be 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_brick_slab" - }, - { - "item": "mineralogy:basalt_brick_slab" - } - ], - "result": { - "item": "mineralogy:basalt_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick_slab" + }, + { + "item": "mineralogy:basalt_brick_slab" + } + ], + "result": { + "item": "mineralogy:basalt_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs.json index e243450cd..5e9d9d7d1 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basalt/brick" - } - }, - "result": { - "item": "mineralogy:basalt_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/brick" + } + }, + "result": { + "item": "mineralogy:basalt_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs_polishing.json index da098fc06..c72a0c9b6 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:basalt_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_wall.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_wall.json index a23e9d98c..4fa4b86a4 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basalt/brick" - } - }, - "result": { - "item": "mineralogy:basalt_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/brick" + } + }, + "result": { + "item": "mineralogy:basalt_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_brick_wall_polishing.json index 03544181d..ac79702c5 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:basalt_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_cobblestone.json b/src/main/resources/data/mineralogy/recipes/basalt_cobblestone.json index 691b6cb88..01164df22 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/basalt" - }, - { - "tag": "mineralogy:stones/basalt" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/basalt" + }, + { + "tag": "mineralogy:stones/basalt" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_furnace.json b/src/main/resources/data/mineralogy/recipes/basalt_furnace.json index 0effcad0a..e1c0e2007 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/basalt" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basalt_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basalt" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basalt_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_brick_slab_recombination.json index 9ea8abe0c..121872a63 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_smooth_brick_slab" - }, - { - "item": "mineralogy:basalt_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:basalt_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_smooth_brick_slab" + }, + { + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_slab_recombination.json index a9dbf7ef6..e1fed3406 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_smooth_slab" - }, - { - "item": "mineralogy:basalt_smooth_slab" - } - ], - "result": { - "item": "mineralogy:basalt_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_smooth_slab" + }, + { + "item": "mineralogy:basalt_smooth_slab" + } + ], + "result": { + "item": "mineralogy:basalt_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_slabs_to_brick.json index 80efdf72a..750e1fe93 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth_slab" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth_slab" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_stairs_to_brick.json index 6d436d551..daa60e917 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_polished_walls_to_brick.json index 047820316..fbb5cdf64 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth_wall" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth_wall" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_polishing.json index bd4fdaa08..0d7a8c27c 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:basalt_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_recombination.json index 27d6b2234..74b1da25a 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_slab" - }, - { - "item": "mineralogy:basalt_slab" - } - ], - "result": { - "item": "mineralogy:basalt", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_slab" + }, + { + "item": "mineralogy:basalt_slab" + } + ], + "result": { + "item": "mineralogy:basalt", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_slabs_to_brick.json index e44f3556c..12c02fb29 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_slab" - } - }, - "result": { - "item": "mineralogy:basalt_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_slab" + } + }, + "result": { + "item": "mineralogy:basalt_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_polishing.json index a65de082d..a23ed08ff 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:basalt_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_to_brick.json index adc0827d9..f7177c4a3 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_stairs" - } - }, - "result": { - "item": "mineralogy:basalt_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_stairs" + } + }, + "result": { + "item": "mineralogy:basalt_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_wall_polishing.json index a63d780d2..4ded39b40 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:basalt_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_raw_walls_to_brick.json index ebf8f5695..aa545527f 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_wall" - } - }, - "result": { - "item": "mineralogy:basalt_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_wall" + } + }, + "result": { + "item": "mineralogy:basalt_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_axe.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_axe.json index 570250144..7257d47c6 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:basalt_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:basalt_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json index 0af78a5f9..30807f462 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basalt/smooth" - } - }, - "result": { - "item": "mineralogy:basalt_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth" + } + }, + "result": { + "item": "mineralogy:basalt_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_cross.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_cross.json index 9b2558080..aa697b50a 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_hammer.json index 89dc25287..e8281e957 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_hoe.json index d6977c01d..c0ddc40e6 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:basalt_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:basalt_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_horizontal.json index ed2190297..7ae389b40 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_i.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_i.json index df51160d1..91039a9bb 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_left.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_left.json index e89bd3765..deb4bcf73 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_pickaxe.json index c370a9e4a..08d5f5a2d 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:basalt_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:basalt_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_plus.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_plus.json index e205af3cb..f8df4bfb9 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_right.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_right.json index f13284bce..cb1d08039 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_relief_left" - }, - { - "item": "mineralogy:basalt_relief_left" - } - ], - "result": { - "item": "mineralogy:basalt_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_left" + }, + { + "item": "mineralogy:basalt_relief_left" + } + ], + "result": { + "item": "mineralogy:basalt_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_sword.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_sword.json index 3ac649dea..b41308380 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "mineralogy:basalt_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:basalt_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "mineralogy:basalt_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:basalt_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/basalt_relief_vertical.json index 776f785bd..1aa8367dd 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_blank" - } - }, - "result": { - "item": "mineralogy:basalt_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:basalt_relief_blank" + } + }, + "result": { + "item": "mineralogy:basalt_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_slab.json index e8e51a7d7..1329a923f 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basalt" - } - }, - "result": { - "item": "mineralogy:basalt_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt" + } + }, + "result": { + "item": "mineralogy:basalt_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth.json index 5a4a0dbf8..3d5753de1 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basalt" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:basalt_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:basalt_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick.json index a2f956861..64f933490 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basalt/smooth" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_furnace.json index 078c1853b..16802e41a 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/basalt/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basalt/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_slab.json index 3904ddaee..1b24852a1 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt_smooth_brick" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basalt_smooth_brick" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_stairs.json index b4370c4ab..995bfa8a8 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basalt/smooth_brick" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth_brick" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_wall.json index cb92d878e..cb3c0083d 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basalt/smooth_brick" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth_brick" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_furnace.json index 8db07d00e..8b27c15ee 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/basalt/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basalt/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json index 5a8bb3725..c30892425 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basalt/smooth" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_stairs.json index 9a6d59e74..787b2b1a4 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basalt/smooth" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth_wall.json index aebaebe9a..a9a024747 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basalt/smooth" - } - }, - "result": { - "item": "mineralogy:basalt_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt/smooth" + } + }, + "result": { + "item": "mineralogy:basalt_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_stairs.json b/src/main/resources/data/mineralogy/recipes/basalt_stairs.json index 0873978b6..2ae5dc62a 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basalt" - } - }, - "result": { - "item": "mineralogy:basalt_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt" + } + }, + "result": { + "item": "mineralogy:basalt_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_wall.json b/src/main/resources/data/mineralogy/recipes/basalt_wall.json index f24c30d9c..ba2df709f 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basalt_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basalt" - } - }, - "result": { - "item": "mineralogy:basalt_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basalt" + } + }, + "result": { + "item": "mineralogy:basalt_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick.json index 303f39757..d7f55a794 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_block_polishing.json index 1f70d30ef..ce378047e 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_furnace.json index f2d32c981..6dae43190 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/basaltic_glass/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basaltic_glass/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab.json index b1741a0a1..5764656cd 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_polishing.json index e1e28152e..f03822674 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_recombination.json index cb05ca44f..f178ab12c 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_brick_slab" - }, - { - "item": "mineralogy:basaltic_glass_brick_slab" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick_slab" + }, + { + "item": "mineralogy:basaltic_glass_brick_slab" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs.json index bd2088a2a..5873c7902 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basaltic_glass/brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs_polishing.json index 3b82bf8d8..0b75de479 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall.json index 349948f1e..c7e64eb5d 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basaltic_glass/brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall_polishing.json index d97011678..0111c354b 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_cobblestone.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_cobblestone.json index 6f1cdbffd..5e20f9d29 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/basaltic_glass" - }, - { - "tag": "mineralogy:stones/basaltic_glass" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/basaltic_glass" + }, + { + "tag": "mineralogy:stones/basaltic_glass" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace.json index 2513211f5..77282e596 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/basaltic_glass" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basaltic_glass" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_brick_slab_recombination.json index 85f986593..41dede8f1 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - }, - { - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + }, + { + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slab_recombination.json index 077fbfa3d..a8e69c102 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_smooth_slab" - }, - { - "item": "mineralogy:basaltic_glass_smooth_slab" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slabs_to_brick.json index 984878919..ad3c2767c 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth_slab" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth_slab" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_stairs_to_brick.json index 8d16e7390..fc626c198 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_walls_to_brick.json index 98c219b9c..d74b2b74c 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth_wall" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth_wall" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_polishing.json index 75e41fe16..60ed864ed 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_recombination.json index 245eee46a..bd6374c96 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_slab" - }, - { - "item": "mineralogy:basaltic_glass_slab" - } - ], - "result": { - "item": "mineralogy:basaltic_glass", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_slab" + }, + { + "item": "mineralogy:basaltic_glass_slab" + } + ], + "result": { + "item": "mineralogy:basaltic_glass", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slabs_to_brick.json index 27db58c2a..b4beb1980 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_slab" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_slab" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_polishing.json index 475d79002..bd3109657 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_to_brick.json index 43cf999a6..b15376a85 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_stairs" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_stairs" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_wall_polishing.json index ce1ae073d..4f26e8dfc 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_walls_to_brick.json index fa562dde6..b2a7236a3 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_wall" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_wall" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_axe.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_axe.json index 28fd8e580..839498834 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_blank.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_blank.json index 3ad5db5c3..4706fd8be 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_cross.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_cross.json index ae88787ec..cac03fdca 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hammer.json index e65a906df..e09e34c27 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hoe.json index ede80601f..2a0cbb51e 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_horizontal.json index 32ef937f1..67d861632 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_i.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_i.json index 4942c4c25..561d4e213 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_left.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_left.json index 569a7849d..526e08dd2 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_pickaxe.json index 3aa1ec288..837a8112b 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_plus.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_plus.json index d6f7164f4..749b0251f 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_right.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_right.json index 96f981bf1..284131221 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_relief_left" - }, - { - "item": "mineralogy:basaltic_glass_relief_left" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_left" + }, + { + "item": "mineralogy:basaltic_glass_relief_left" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_sword.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_sword.json index 4c042a2f5..1616f9bde 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "mineralogy:basaltic_glass_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "mineralogy:basaltic_glass_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_vertical.json index 63b9279d5..31ebc51f3 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_relief_blank" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_relief_blank" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab.json index ec190e359..bd090e3f5 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth.json index e6873839a..d54ab8266 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/basaltic_glass" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:basaltic_glass_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/basaltic_glass" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:basaltic_glass_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick.json index 3c8c40d95..ed487ffcc 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basaltic_glass/smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_furnace.json index af3ba1ce9..6d95f7917 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/basaltic_glass/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basaltic_glass/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_slab.json index e9037e01e..c00445abc 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth_brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_stairs.json index 3712797b2..243a9cc05 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basaltic_glass/smooth_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth_brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_wall.json index 7129280af..7ae80c6df 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basaltic_glass/smooth_brick" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth_brick" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_furnace.json index 23f010fdd..7ed5de699 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/basaltic_glass/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/basaltic_glass/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_slab.json index 007217857..e4be16070 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass_smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:basaltic_glass_smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_stairs.json index bac8c3a25..5cb5e15ab 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basaltic_glass/smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_wall.json index e785b4bcf..f1d68d01e 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basaltic_glass/smooth" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass/smooth" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs.json index 35a1573c8..52d6ac35c 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall.json b/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall.json index a46fed2ad..80e6b9b8c 100644 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:basaltic_glass_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/basaltic_glass" + } + }, + "result": { + "item": "mineralogy:basaltic_glass_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/chalk.json b/src/main/resources/data/mineralogy/recipes/chalk.json index 3bd8ad215..47e52508a 100644 --- a/src/main/resources/data/mineralogy/recipes/chalk.json +++ b/src/main/resources/data/mineralogy/recipes/chalk.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:chalk" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "forge:dusts/chalk" - } - }, - "result": { - "item": "mineralogy:chalk", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:chalk" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:dusts/chalk" + } + }, + "result": { + "item": "mineralogy:chalk", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/chalk_dust.json b/src/main/resources/data/mineralogy/recipes/chalk_dust.json index bdfdcd818..72f6bed92 100644 --- a/src/main/resources/data/mineralogy/recipes/chalk_dust.json +++ b/src/main/resources/data/mineralogy/recipes/chalk_dust.json @@ -1,18 +1,18 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:chalk_dust" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/chalk" - } - ], - "result": { - "item": "mineralogy:chalk_dust", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:chalk_dust" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/chalk" + } + ], + "result": { + "item": "mineralogy:chalk_dust", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/cobblestone.json b/src/main/resources/data/mineralogy/recipes/cobblestone.json index afdad0426..8dccd39c0 100644 --- a/src/main/resources/data/mineralogy/recipes/cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:stone" - }, - { - "item": "minecraft:stone" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:stone" + }, + { + "item": "minecraft:stone" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json index dd1e961fb..2509a906d 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_block_polishing.json index f86f0fc62..37b528c62 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:conglomerate_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_furnace.json index cec13700e..fe14cdf23 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/conglomerate/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/conglomerate/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab.json index f2ef5efd7..895cb946f 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_polishing.json index 925d54d9a..23bbf947c 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:conglomerate_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_recombination.json index 52d810124..818749429 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_brick_slab" - }, - { - "item": "mineralogy:conglomerate_brick_slab" - } - ], - "result": { - "item": "mineralogy:conglomerate_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick_slab" + }, + { + "item": "mineralogy:conglomerate_brick_slab" + } + ], + "result": { + "item": "mineralogy:conglomerate_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs.json index be41bc085..1ed504d0e 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/conglomerate/brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs_polishing.json index a9b693733..7833468ce 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:conglomerate_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall.json index b2316129b..8e00a92fa 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/conglomerate/brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall_polishing.json index dad96be7d..cbe4890be 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:conglomerate_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_cobblestone.json b/src/main/resources/data/mineralogy/recipes/conglomerate_cobblestone.json index 416cd52cc..2903e343c 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/conglomerate" - }, - { - "tag": "mineralogy:stones/conglomerate" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/conglomerate" + }, + { + "tag": "mineralogy:stones/conglomerate" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json b/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json index 1a517d6b3..6111ff2d2 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/conglomerate" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:conglomerate_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/conglomerate" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:conglomerate_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_brick_slab_recombination.json index 8137ac557..3962b8822 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_smooth_brick_slab" - }, - { - "item": "mineralogy:conglomerate_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:conglomerate_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_smooth_brick_slab" + }, + { + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slab_recombination.json index d72ca2df0..b97c1200b 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_smooth_slab" - }, - { - "item": "mineralogy:conglomerate_smooth_slab" - } - ], - "result": { - "item": "mineralogy:conglomerate_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "item": "mineralogy:conglomerate_smooth_slab" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slabs_to_brick.json index b9409a906..10d5bdbff 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth_slab" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth_slab" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_stairs_to_brick.json index 0abed2a0d..a5156e70e 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_walls_to_brick.json index 1fb272df5..99cc5fdcc 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth_wall" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth_wall" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_polishing.json index 6b063844e..e70f71006 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:conglomerate_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_recombination.json index 830c106cc..3b4dfc0dc 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_slab" - }, - { - "item": "mineralogy:conglomerate_slab" - } - ], - "result": { - "item": "mineralogy:conglomerate", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_slab" + }, + { + "item": "mineralogy:conglomerate_slab" + } + ], + "result": { + "item": "mineralogy:conglomerate", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slabs_to_brick.json index 4967292db..aac672673 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_slab" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_slab" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_polishing.json index 65c67f427..098a32866 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:conglomerate_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_to_brick.json index c9b073f0c..8b7dfbe71 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_stairs" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_stairs" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_wall_polishing.json index fa10dc161..e23769f7d 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:conglomerate_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_walls_to_brick.json index 355a0918d..c4f08e7fe 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_wall" - } - }, - "result": { - "item": "mineralogy:conglomerate_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_wall" + } + }, + "result": { + "item": "mineralogy:conglomerate_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_axe.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_axe.json index c89436878..7e4190bb4 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:conglomerate_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:conglomerate_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_blank.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_blank.json index 0374f1a16..6fdfa6925 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_cross.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_cross.json index 0de596085..f1326cbc3 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hammer.json index a5680c5e1..2a6eb8a05 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hoe.json index 332a7e9c0..e905306cd 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:conglomerate_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:conglomerate_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_horizontal.json index b3e7a1ef6..cb8f11232 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_i.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_i.json index ab5468bb2..6fbc2bb0a 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_left.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_left.json index 6e37f6209..b1257f54f 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_pickaxe.json index fe18adbe5..19c079d4d 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:conglomerate_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:conglomerate_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_plus.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_plus.json index 30a38abeb..939fa6d53 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_right.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_right.json index 78e68f288..04672d26c 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_relief_left" - }, - { - "item": "mineralogy:conglomerate_relief_left" - } - ], - "result": { - "item": "mineralogy:conglomerate_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_left" + }, + { + "item": "mineralogy:conglomerate_relief_left" + } + ], + "result": { + "item": "mineralogy:conglomerate_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_sword.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_sword.json index c5c3d0f4e..7598b15db 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "mineralogy:conglomerate_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:conglomerate_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "mineralogy:conglomerate_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:conglomerate_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_vertical.json index 3100433ee..d2eb22a24 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_blank" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_relief_blank" + } + }, + "result": { + "item": "mineralogy:conglomerate_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json b/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json index ad6e150d9..abde9816f 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate" + } + }, + "result": { + "item": "mineralogy:conglomerate_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json index e8bfb17cc..7e8de5bc8 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/conglomerate" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:conglomerate_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/conglomerate" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:conglomerate_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick.json index 0e3b0ee47..7a8573987 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/conglomerate/smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_furnace.json index 74d35cab8..18880a57d 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/conglomerate/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/conglomerate/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_slab.json index bed71c7a1..d2ec2f724 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth_brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_stairs.json index 69c2b5e47..029b5c13f 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/conglomerate/smooth_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth_brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_wall.json index 3671ee17d..003801e35 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/conglomerate/smooth_brick" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth_brick" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_furnace.json index 0732b4a46..c31c41fe3 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/conglomerate/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/conglomerate/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_slab.json index 8ce6bc00b..6c98e594a 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:conglomerate_smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_stairs.json index 009ff9048..e38363bbe 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/conglomerate/smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_wall.json index 9eb179eca..987ffdfec 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/conglomerate/smooth" - } - }, - "result": { - "item": "mineralogy:conglomerate_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate/smooth" + } + }, + "result": { + "item": "mineralogy:conglomerate_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json b/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json index 14ab18f2f..e2aff7a49 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate" + } + }, + "result": { + "item": "mineralogy:conglomerate_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json b/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json index 49acde432..dd03282b9 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:conglomerate_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/conglomerate" + } + }, + "result": { + "item": "mineralogy:conglomerate_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_brick.json index bdb956b1c..988b95613 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diabase" - } - }, - "result": { - "item": "mineralogy:diabase_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase" + } + }, + "result": { + "item": "mineralogy:diabase_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_block_polishing.json index 849f63f05..a93073ad7 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:diabase_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_furnace.json index 8cca7a4f8..9211115c6 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/diabase/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diabase_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diabase/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diabase_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab.json index 6470b1aec..73371a275 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_brick" - } - }, - "result": { - "item": "mineralogy:diabase_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_brick" + } + }, + "result": { + "item": "mineralogy:diabase_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_polishing.json index 9dcc8f721..a9c169568 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:diabase_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_recombination.json index f4d169557..9945cf220 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_brick_slab" - }, - { - "item": "mineralogy:diabase_brick_slab" - } - ], - "result": { - "item": "mineralogy:diabase_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick_slab" + }, + { + "item": "mineralogy:diabase_brick_slab" + } + ], + "result": { + "item": "mineralogy:diabase_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs.json index 16de67711..ebc4c5611 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diabase/brick" - } - }, - "result": { - "item": "mineralogy:diabase_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/brick" + } + }, + "result": { + "item": "mineralogy:diabase_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs_polishing.json index 1f06e6c19..93ac0526a 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:diabase_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_wall.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_wall.json index 4a7939477..ac0ec85e2 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diabase/brick" - } - }, - "result": { - "item": "mineralogy:diabase_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/brick" + } + }, + "result": { + "item": "mineralogy:diabase_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_brick_wall_polishing.json index e0f38ad07..7e9e0caf4 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:diabase_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_cobblestone.json b/src/main/resources/data/mineralogy/recipes/diabase_cobblestone.json index 854dd8c2d..e1b433a63 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/diabase" - }, - { - "tag": "mineralogy:stones/diabase" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/diabase" + }, + { + "tag": "mineralogy:stones/diabase" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_furnace.json b/src/main/resources/data/mineralogy/recipes/diabase_furnace.json index e5625c81a..bf9aa287d 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/diabase" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diabase_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diabase" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diabase_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_brick_slab_recombination.json index f6cd77f9e..68325c2fb 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_smooth_brick_slab" - }, - { - "item": "mineralogy:diabase_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:diabase_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_smooth_brick_slab" + }, + { + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_slab_recombination.json index fe9763bb0..595df7ceb 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_smooth_slab" - }, - { - "item": "mineralogy:diabase_smooth_slab" - } - ], - "result": { - "item": "mineralogy:diabase_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_smooth_slab" + }, + { + "item": "mineralogy:diabase_smooth_slab" + } + ], + "result": { + "item": "mineralogy:diabase_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_slabs_to_brick.json index 2cbc14c73..f2dd4f03b 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth_slab" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth_slab" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_stairs_to_brick.json index c2de91be7..a5d1bd8c7 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_polished_walls_to_brick.json index 174aecb2f..64b16c6b2 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth_wall" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth_wall" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_polishing.json index 9795a2e16..221d780d3 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:diabase_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_recombination.json index 99bdaf5f3..6d8ee951b 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_slab" - }, - { - "item": "mineralogy:diabase_slab" - } - ], - "result": { - "item": "mineralogy:diabase", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_slab" + }, + { + "item": "mineralogy:diabase_slab" + } + ], + "result": { + "item": "mineralogy:diabase", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_slabs_to_brick.json index 6cbb22080..bc1439a5e 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_slab" - } - }, - "result": { - "item": "mineralogy:diabase_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_slab" + } + }, + "result": { + "item": "mineralogy:diabase_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_polishing.json index 979b46b69..a50cdff3a 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:diabase_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_to_brick.json index 427d043df..f275690e6 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_stairs" - } - }, - "result": { - "item": "mineralogy:diabase_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_stairs" + } + }, + "result": { + "item": "mineralogy:diabase_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_wall_polishing.json index 9605c1b04..d6bc77583 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:diabase_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_raw_walls_to_brick.json index c6defb4de..142b57ee7 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_wall" - } - }, - "result": { - "item": "mineralogy:diabase_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_wall" + } + }, + "result": { + "item": "mineralogy:diabase_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_axe.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_axe.json index 7c1219a6d..88e167b75 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:diabase_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:diabase_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_blank.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_blank.json index 83e2eb9ff..f372cb7e6 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - } - }, - "result": { - "item": "mineralogy:diabase_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth" + } + }, + "result": { + "item": "mineralogy:diabase_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_cross.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_cross.json index 7b1f00085..7b2464a77 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_hammer.json index e4c85690f..821456c56 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_hoe.json index 054f84569..bffec9b4e 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:diabase_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:diabase_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_horizontal.json index 414e2598e..f61599567 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_i.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_i.json index 9851e859d..0a34fa385 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_left.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_left.json index 6e9c5ff01..6b7ccf990 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_pickaxe.json index 551b44771..0429f5740 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:diabase_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:diabase_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_plus.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_plus.json index bed057484..1b71114df 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_right.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_right.json index 80a01258c..d4acc1d6c 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_relief_left" - }, - { - "item": "mineralogy:diabase_relief_left" - } - ], - "result": { - "item": "mineralogy:diabase_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_left" + }, + { + "item": "mineralogy:diabase_relief_left" + } + ], + "result": { + "item": "mineralogy:diabase_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_sword.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_sword.json index 3f2c3da2e..b9edda999 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "mineralogy:diabase_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:diabase_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "mineralogy:diabase_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:diabase_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/diabase_relief_vertical.json index aa08d66bf..77abcb795 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_blank" - } - }, - "result": { - "item": "mineralogy:diabase_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:diabase_relief_blank" + } + }, + "result": { + "item": "mineralogy:diabase_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_slab.json b/src/main/resources/data/mineralogy/recipes/diabase_slab.json index b8c950396..d59cae0fb 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase" - } - }, - "result": { - "item": "mineralogy:diabase_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase" + } + }, + "result": { + "item": "mineralogy:diabase_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth.json index 875e7b4f0..b95899615 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/diabase" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:diabase_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/diabase" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:diabase_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick.json index a36893e95..a3f682701 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diabase/smooth" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_furnace.json index 127e833f6..f70b600fc 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/diabase/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diabase/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_slab.json index 705ee1101..46399a6fb 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth_brick" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth_brick" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_stairs.json index 368c8f904..ea77b9b52 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diabase/smooth_brick" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth_brick" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_wall.json index 71c640a38..50b654409 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diabase/smooth_brick" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth_brick" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_furnace.json index 4041bc684..e0931c652 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/diabase/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diabase/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_slab.json index f2525ad8d..a1890504e 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase_smooth" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diabase_smooth" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_stairs.json index 7f99ae7d7..96ebb8474 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diabase/smooth" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth_wall.json index f0293dd2f..e06d2c92a 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diabase/smooth" - } - }, - "result": { - "item": "mineralogy:diabase_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase/smooth" + } + }, + "result": { + "item": "mineralogy:diabase_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_stairs.json b/src/main/resources/data/mineralogy/recipes/diabase_stairs.json index c0db19828..d0ea1b59f 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diabase" - } - }, - "result": { - "item": "mineralogy:diabase_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase" + } + }, + "result": { + "item": "mineralogy:diabase_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_wall.json b/src/main/resources/data/mineralogy/recipes/diabase_wall.json index bb53fb526..7f3ac455f 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diabase_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diabase" - } - }, - "result": { - "item": "mineralogy:diabase_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diabase" + } + }, + "result": { + "item": "mineralogy:diabase_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_brick.json index c5159fd7a..ae3007dbb 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diorite" - } - }, - "result": { - "item": "mineralogy:diorite_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite" + } + }, + "result": { + "item": "mineralogy:diorite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_block_polishing.json index 5ad0d1c88..e421ef0e7 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:diorite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_furnace.json index 0cd1da19d..0ccb6ed13 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/diorite/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diorite_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diorite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diorite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab.json index a213b06e1..af438b7e8 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_brick" - } - }, - "result": { - "item": "mineralogy:diorite_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_brick" + } + }, + "result": { + "item": "mineralogy:diorite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_polishing.json index 9febaf202..40cba09d4 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:diorite_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_recombination.json index 7d585ea15..6e8709b8c 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_brick_slab" - }, - { - "item": "mineralogy:diorite_brick_slab" - } - ], - "result": { - "item": "mineralogy:diorite_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick_slab" + }, + { + "item": "mineralogy:diorite_brick_slab" + } + ], + "result": { + "item": "mineralogy:diorite_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs.json index 8fd1905c0..02101f2d9 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diorite/brick" - } - }, - "result": { - "item": "mineralogy:diorite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/brick" + } + }, + "result": { + "item": "mineralogy:diorite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs_polishing.json index a0db93bc6..76ea7c165 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:diorite_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_wall.json index ddbf530fa..3dfc495c8 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diorite/brick" - } - }, - "result": { - "item": "mineralogy:diorite_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/brick" + } + }, + "result": { + "item": "mineralogy:diorite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_brick_wall_polishing.json index 27f2511e3..7a5c11e4a 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:diorite_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/diorite_cobblestone.json index fd07f1731..c6655c690 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/diorite" - }, - { - "tag": "mineralogy:stones/diorite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/diorite" + }, + { + "tag": "mineralogy:stones/diorite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_furnace.json b/src/main/resources/data/mineralogy/recipes/diorite_furnace.json index 3a48d90a1..6d35f8dbf 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/diorite" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diorite_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diorite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diorite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_brick_slab_recombination.json index 91f4ab1e7..6908a96c0 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_smooth_brick_slab" - }, - { - "item": "mineralogy:diorite_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:diorite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_smooth_brick_slab" + }, + { + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_slab_recombination.json index adf7fe66f..4c138764d 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_smooth_slab" - }, - { - "item": "mineralogy:diorite_smooth_slab" - } - ], - "result": { - "item": "mineralogy:diorite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_smooth_slab" + }, + { + "item": "mineralogy:diorite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:diorite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_slabs_to_brick.json index d834f31f4..11b035a69 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth_slab" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_stairs_to_brick.json index 076b48e2f..0054024fc 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_polished_walls_to_brick.json index 853816620..2a3c82747 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth_wall" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_polishing.json index 47f1239ee..f882428e0 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:diorite_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_recombination.json index 61f9d7090..9384befc9 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_slab" - }, - { - "item": "mineralogy:diorite_slab" - } - ], - "result": { - "item": "mineralogy:diorite", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_slab" + }, + { + "item": "mineralogy:diorite_slab" + } + ], + "result": { + "item": "mineralogy:diorite", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_slabs_to_brick.json index fa2a95a2b..f71092ffc 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_slab" - } - }, - "result": { - "item": "mineralogy:diorite_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_slab" + } + }, + "result": { + "item": "mineralogy:diorite_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_polishing.json index 9ac42f2ea..caf193471 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:diorite_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_to_brick.json index 859f50a5f..d2e3068e6 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_stairs" - } - }, - "result": { - "item": "mineralogy:diorite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_stairs" + } + }, + "result": { + "item": "mineralogy:diorite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_wall_polishing.json index 905ae9afe..a66429018 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:diorite_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_raw_walls_to_brick.json index 19064b1e7..09a6db13f 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_wall" - } - }, - "result": { - "item": "mineralogy:diorite_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_wall" + } + }, + "result": { + "item": "mineralogy:diorite_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_axe.json index 3998f53c5..f9faa4df0 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:diorite_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:diorite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json index e4b2c2e8b..616687912 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diorite/smooth" - } - }, - "result": { - "item": "mineralogy:diorite_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth" + } + }, + "result": { + "item": "mineralogy:diorite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_cross.json index ec02c635c..4e2d68af9 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_hammer.json index f734e1f7d..a3cce08c7 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_hoe.json index 65f18aeac..5fefcfa1d 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:diorite_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:diorite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_horizontal.json index 78fbb5330..5f0174326 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_i.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_i.json index 8df5652b5..ddd54bf85 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_left.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_left.json index a3d0d88fb..f0480722e 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_pickaxe.json index b22dfddb9..282fef905 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:diorite_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:diorite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_plus.json index f18eb5cee..e408b3e28 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_right.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_right.json index 048e708c2..3d3d7169b 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_relief_left" - }, - { - "item": "mineralogy:diorite_relief_left" - } - ], - "result": { - "item": "mineralogy:diorite_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_left" + }, + { + "item": "mineralogy:diorite_relief_left" + } + ], + "result": { + "item": "mineralogy:diorite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_sword.json index 3fe517023..9c0a3f055 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "mineralogy:diorite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:diorite_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "mineralogy:diorite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:diorite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/diorite_relief_vertical.json index c21165bfa..34ca47e46 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_blank" - } - }, - "result": { - "item": "mineralogy:diorite_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:diorite_relief_blank" + } + }, + "result": { + "item": "mineralogy:diorite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_slab.json b/src/main/resources/data/mineralogy/recipes/diorite_slab.json index 44cfe3d6e..6194e68a7 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite" - } - }, - "result": { - "item": "mineralogy:diorite_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite" + } + }, + "result": { + "item": "mineralogy:diorite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/diorite_slab_from_vanilla.json index b426543bb..f7e0f47d7 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_slab_from_vanilla.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:diorite_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:diorite_slab" - } - ], - "result": { - "item": "mineralogy:diorite_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:diorite_slab" + } + ], + "result": { + "item": "mineralogy:diorite_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/diorite_slab_to_vanilla.json index 7501edb97..82b8c746f 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_slab_to_vanilla.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:diorite_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_slab" - } - ], - "result": { - "item": "minecraft:diorite_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:diorite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_slab" + } + ], + "result": { + "item": "minecraft:diorite_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth.json index a4bb2c4c8..94545ae5a 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:diorite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:diorite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick.json index 0e5e72095..bf0d14faf 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diorite/smooth" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_furnace.json index 084e4e851..c80802380 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/diorite/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diorite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_slab.json index 41a69e455..3878b8495 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_stairs.json index f5c189da9..0e296f7f3 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diorite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_wall.json index 0c612e43f..1b7efe70b 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diorite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_furnace.json index badd330ec..36272c488 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/diorite/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/diorite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab.json index 19ea3e8a5..b5382a16e 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_from_vanilla.json index 09064721c..1c0e97d97 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_from_vanilla.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_diorite_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:polished_diorite_slab" - } - ], - "result": { - "item": "mineralogy:diorite_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_diorite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:polished_diorite_slab" + } + ], + "result": { + "item": "mineralogy:diorite_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_to_vanilla.json index ef4cd7895..984f9e0cb 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_slab_to_vanilla.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_diorite_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:diorite_smooth_slab" - } - ], - "result": { - "item": "minecraft:polished_diorite_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_diorite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_smooth_slab" + } + ], + "result": { + "item": "minecraft:polished_diorite_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json index 716133e77..ffcba0d92 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite_smooth" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite_smooth" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth_wall.json index e5fb7a810..ee0b47e25 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/diorite/smooth" - } - }, - "result": { - "item": "mineralogy:diorite_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/diorite/smooth" + } + }, + "result": { + "item": "mineralogy:diorite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_stairs.json index e230a2887..fed8816f0 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite" - } - }, - "result": { - "item": "mineralogy:diorite_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite" + } + }, + "result": { + "item": "mineralogy:diorite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_wall.json index 923e6efb5..df77b691b 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:diorite_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite" - } - }, - "result": { - "item": "mineralogy:diorite_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:diorite" + } + }, + "result": { + "item": "mineralogy:diorite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick.json index 63ccc6f0e..3658cef00 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite" + } + }, + "result": { + "item": "mineralogy:dolomite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_block_polishing.json index f774d6afb..057480376 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:dolomite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_furnace.json index bb36b7a59..e4badc351 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/dolomite/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/dolomite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab.json index 9ac81d406..9defb15aa 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_brick" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_polishing.json index feab3aa3d..a280d3b35 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:dolomite_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_recombination.json index 336658ace..9990e6d8b 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_brick_slab" - }, - { - "item": "mineralogy:dolomite_brick_slab" - } - ], - "result": { - "item": "mineralogy:dolomite_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick_slab" + }, + { + "item": "mineralogy:dolomite_brick_slab" + } + ], + "result": { + "item": "mineralogy:dolomite_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs.json index 4f9e0b9f5..b883901a1 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/dolomite/brick" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/brick" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs_polishing.json index 648b5ec95..11cb487e7 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:dolomite_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall.json index c1823181f..110fd8a6b 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/dolomite/brick" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/brick" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall_polishing.json index 77e638c2f..42a08eb2e 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:dolomite_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/dolomite_cobblestone.json index e898b56ed..a2f058c7c 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/dolomite" - }, - { - "tag": "mineralogy:stones/dolomite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/dolomite" + }, + { + "tag": "mineralogy:stones/dolomite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json b/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json index 58ea4cbb4..e417931c9 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/dolomite" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:dolomite_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/dolomite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:dolomite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_brick_slab_recombination.json index 59e77183f..4e6afcb6e 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_smooth_brick_slab" - }, - { - "item": "mineralogy:dolomite_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:dolomite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_smooth_brick_slab" + }, + { + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_slab_recombination.json index 0adf7e650..cc0bcdf15 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_smooth_slab" - }, - { - "item": "mineralogy:dolomite_smooth_slab" - } - ], - "result": { - "item": "mineralogy:dolomite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "item": "mineralogy:dolomite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_slabs_to_brick.json index 4007116f9..1abf3c3eb 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth_slab" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_stairs_to_brick.json index a3a9339e5..d5ad48da8 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_polished_walls_to_brick.json index 5507e6ff9..0c8b68390 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth_wall" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_polishing.json index e45eaf249..6121a2fc3 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:dolomite_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_recombination.json index aaac80236..4b8488bbd 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_slab" - }, - { - "item": "mineralogy:dolomite_slab" - } - ], - "result": { - "item": "mineralogy:dolomite", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_slab" + }, + { + "item": "mineralogy:dolomite_slab" + } + ], + "result": { + "item": "mineralogy:dolomite", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slabs_to_brick.json index 9e980f6d4..70833fd1b 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_slab" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_slab" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_polishing.json index 44ebb2a66..db8061ea9 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:dolomite_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_to_brick.json index cb30c66a6..518950d14 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_stairs" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_stairs" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_wall_polishing.json index 99e06c573..ce4ed58cc 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:dolomite_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_raw_walls_to_brick.json index b2ab92101..d54fc7a93 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_wall" - } - }, - "result": { - "item": "mineralogy:dolomite_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_wall" + } + }, + "result": { + "item": "mineralogy:dolomite_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_axe.json index dd42e53ab..2bb67b6a8 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:dolomite_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:dolomite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_blank.json index 09dc11264..0007e6edb 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_cross.json index 1ea9222f0..3d8315dcb 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_hammer.json index 41d3a001d..92275d553 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_hoe.json index a30270691..e37cfacb3 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:dolomite_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:dolomite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_horizontal.json index 45a5fd14c..3f3fd1472 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_i.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_i.json index 4d1ed3658..b91f7bfb7 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_left.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_left.json index bd8b811e1..484c593b6 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_pickaxe.json index 5c918c389..dbf6df552 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:dolomite_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:dolomite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_plus.json index 2609feccd..dd80b8b1d 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_right.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_right.json index b4dc36354..1c97c7614 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_relief_left" - }, - { - "item": "mineralogy:dolomite_relief_left" - } - ], - "result": { - "item": "mineralogy:dolomite_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_left" + }, + { + "item": "mineralogy:dolomite_relief_left" + } + ], + "result": { + "item": "mineralogy:dolomite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_sword.json index 3f6229211..c1fd2a3af 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "mineralogy:dolomite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:dolomite_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "mineralogy:dolomite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:dolomite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/dolomite_relief_vertical.json index 329ac9ae1..642a291fd 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_blank" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_relief_blank" + } + }, + "result": { + "item": "mineralogy:dolomite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_slab.json b/src/main/resources/data/mineralogy/recipes/dolomite_slab.json index b6a5dfd6a..92b1d1c62 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite" + } + }, + "result": { + "item": "mineralogy:dolomite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json index 9d93d4121..be2098daa 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/dolomite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:dolomite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/dolomite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:dolomite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick.json index 923cb7ff7..90304a7c3 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/dolomite/smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_furnace.json index 620b23347..eddfcea15 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/dolomite/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/dolomite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_slab.json index 7a5dc1fa4..470eaef77 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_stairs.json index f34bfcb34..c1cd24ee2 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/dolomite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_wall.json index ba39a4dd2..deb4507d5 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/dolomite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_furnace.json index 15ddf9b6e..2422b95c7 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/dolomite/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/dolomite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_slab.json index d61a822d7..e6e9c628a 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite_smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:dolomite_smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_stairs.json index 9cc2b25e1..21d2633c5 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/dolomite/smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_wall.json index fddf6d27e..33c051f0b 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/dolomite/smooth" - } - }, - "result": { - "item": "mineralogy:dolomite_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite/smooth" + } + }, + "result": { + "item": "mineralogy:dolomite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json b/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json index 92cbcd26f..3004bfb31 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite" + } + }, + "result": { + "item": "mineralogy:dolomite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_wall.json b/src/main/resources/data/mineralogy/recipes/dolomite_wall.json index 1a1e383db..ac7bf1c53 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:dolomite_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/dolomite" + } + }, + "result": { + "item": "mineralogy:dolomite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall.json b/src/main/resources/data/mineralogy/recipes/drywall.json index 7027c0062..df2ec0e51 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall.json +++ b/src/main/resources/data/mineralogy/recipes/drywall.json @@ -1,30 +1,30 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_white" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "pgp", - "pgp", - "pgp" - ], - "key": { - "p": { - "tag": "forge:paper" - }, - "g": { - "tag": "forge:dusts/gypsum" - } - }, - "result": { - "item": "mineralogy:drywall_white", - "count": 3 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "pgp", + "pgp", + "pgp" + ], + "key": { + "p": { + "tag": "forge:paper" + }, + "g": { + "tag": "forge:dusts/gypsum" + } + }, + "result": { + "item": "mineralogy:drywall_white", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_black.json b/src/main/resources/data/mineralogy/recipes/drywall_black.json index 62f154c01..093ac9571 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_black.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_black.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_black" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:ink_sac" - } - ], - "result": { - "item": "mineralogy:drywall_black", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_black" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:ink_sac" + } + ], + "result": { + "item": "mineralogy:drywall_black", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_blue.json b/src/main/resources/data/mineralogy/recipes/drywall_blue.json index 934629e38..69061d5d1 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_blue.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_blue.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_blue" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:lapis_lazuli" - } - ], - "result": { - "item": "mineralogy:drywall_blue", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_blue" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:lapis_lazuli" + } + ], + "result": { + "item": "mineralogy:drywall_blue", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_brown.json b/src/main/resources/data/mineralogy/recipes/drywall_brown.json index 2336dae4a..bca763d82 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_brown.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_brown.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_brown" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:cocoa_beans" - } - ], - "result": { - "item": "mineralogy:drywall_brown", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_brown" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:cocoa_beans" + } + ], + "result": { + "item": "mineralogy:drywall_brown", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_cyan.json b/src/main/resources/data/mineralogy/recipes/drywall_cyan.json index 7f08bbb7c..4f87c0a6f 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_cyan.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_cyan.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_cyan" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:cyan_dye" - } - ], - "result": { - "item": "mineralogy:drywall_cyan", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_cyan" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:cyan_dye" + } + ], + "result": { + "item": "mineralogy:drywall_cyan", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_gray.json b/src/main/resources/data/mineralogy/recipes/drywall_gray.json index 9d58d6bc3..c232c19f9 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_gray.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_gray.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_gray" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:gray_dye" - } - ], - "result": { - "item": "mineralogy:drywall_gray", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_gray" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:gray_dye" + } + ], + "result": { + "item": "mineralogy:drywall_gray", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_green.json b/src/main/resources/data/mineralogy/recipes/drywall_green.json index 2501994a6..751824b93 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_green.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_green.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_green" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:green_dye" - } - ], - "result": { - "item": "mineralogy:drywall_green", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_green" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:green_dye" + } + ], + "result": { + "item": "mineralogy:drywall_green", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_light_blue.json b/src/main/resources/data/mineralogy/recipes/drywall_light_blue.json index ceb3866c1..01bbb4753 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_light_blue.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_light_blue.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_light_blue" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:light_blue_dye" - } - ], - "result": { - "item": "mineralogy:drywall_light_blue", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_light_blue" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:light_blue_dye" + } + ], + "result": { + "item": "mineralogy:drywall_light_blue", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_lime.json b/src/main/resources/data/mineralogy/recipes/drywall_lime.json index 00604dee2..d2bff8f9c 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_lime.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_lime.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_lime" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:lime_dye" - } - ], - "result": { - "item": "mineralogy:drywall_lime", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_lime" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:lime_dye" + } + ], + "result": { + "item": "mineralogy:drywall_lime", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_magenta.json b/src/main/resources/data/mineralogy/recipes/drywall_magenta.json index fca1b4b01..a4b3a3223 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_magenta.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_magenta.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_magenta" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:magenta_dye" - } - ], - "result": { - "item": "mineralogy:drywall_magenta", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_magenta" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:magenta_dye" + } + ], + "result": { + "item": "mineralogy:drywall_magenta", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_orange.json b/src/main/resources/data/mineralogy/recipes/drywall_orange.json index 7535200ef..f8c6d266a 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_orange.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_orange.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_orange" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:orange_dye" - } - ], - "result": { - "item": "mineralogy:drywall_orange", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_orange" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:orange_dye" + } + ], + "result": { + "item": "mineralogy:drywall_orange", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_pink.json b/src/main/resources/data/mineralogy/recipes/drywall_pink.json index 9456a9a08..336c92ec1 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_pink.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_pink.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_pink" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:pink_dye" - } - ], - "result": { - "item": "mineralogy:drywall_pink", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_pink" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:pink_dye" + } + ], + "result": { + "item": "mineralogy:drywall_pink", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_purple.json b/src/main/resources/data/mineralogy/recipes/drywall_purple.json index f947b1bf6..ea2741b0c 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_purple.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_purple.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_purple" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:purple_dye" - } - ], - "result": { - "item": "mineralogy:drywall_purple", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_purple" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:purple_dye" + } + ], + "result": { + "item": "mineralogy:drywall_purple", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_red.json b/src/main/resources/data/mineralogy/recipes/drywall_red.json index 1869d12db..3829ac0cb 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_red.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_red.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_red" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:red_dye" - } - ], - "result": { - "item": "mineralogy:drywall_red", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_red" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:red_dye" + } + ], + "result": { + "item": "mineralogy:drywall_red", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_silver.json b/src/main/resources/data/mineralogy/recipes/drywall_silver.json index 8d253652b..45a92bff0 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_silver.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_silver.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_silver" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:light_gray_dye" - } - ], - "result": { - "item": "mineralogy:drywall_silver", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_silver" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:light_gray_dye" + } + ], + "result": { + "item": "mineralogy:drywall_silver", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_white.json b/src/main/resources/data/mineralogy/recipes/drywall_white.json index d574a3845..73780e77d 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_white.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_white.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_white" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:bone_meal" - } - ], - "result": { - "item": "mineralogy:drywall_white", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_white" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:bone_meal" + } + ], + "result": { + "item": "mineralogy:drywall_white", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/drywall_yellow.json b/src/main/resources/data/mineralogy/recipes/drywall_yellow.json index f654ec570..943bc64f3 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall_yellow.json +++ b/src/main/resources/data/mineralogy/recipes/drywall_yellow.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_DRYWALLS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:drywall_yellow" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:drywall/white" - }, - { - "item": "minecraft:yellow_dye" - } - ], - "result": { - "item": "mineralogy:drywall_yellow", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_DRYWALLS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:drywall_yellow" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:drywall/white" + }, + { + "item": "minecraft:yellow_dye" + } + ], + "result": { + "item": "mineralogy:drywall_yellow", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick.json index 379201f4b..a2222191e 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro" + } + }, + "result": { + "item": "mineralogy:gabbro_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_block_polishing.json index 60d4b5e5d..3c1426e6f 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:gabbro_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_furnace.json index bf916bc72..3d6316ad6 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/gabbro/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gabbro/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab.json index c4b05fb55..857e440c3 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_brick" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_polishing.json index fd506637d..7fe7fd19d 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:gabbro_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_recombination.json index 331c014c6..0113d233d 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_brick_slab" - }, - { - "item": "mineralogy:gabbro_brick_slab" - } - ], - "result": { - "item": "mineralogy:gabbro_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick_slab" + }, + { + "item": "mineralogy:gabbro_brick_slab" + } + ], + "result": { + "item": "mineralogy:gabbro_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs.json index 1a5f0e452..1cf859550 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gabbro/brick" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/brick" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs_polishing.json index 6db4c0d7a..a76fb01be 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:gabbro_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall.json index c2356d4b7..5b68ff740 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gabbro/brick" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/brick" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall_polishing.json index c2941b5e3..13ea56e84 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:gabbro_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_cobblestone.json b/src/main/resources/data/mineralogy/recipes/gabbro_cobblestone.json index 9a0d2dca3..3f9227e86 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/gabbro" - }, - { - "tag": "mineralogy:stones/gabbro" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/gabbro" + }, + { + "tag": "mineralogy:stones/gabbro" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json b/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json index 35383a938..05089e9a1 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/gabbro" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gabbro_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gabbro" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gabbro_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_brick_slab_recombination.json index d55dfb292..d018dadb3 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_smooth_brick_slab" - }, - { - "item": "mineralogy:gabbro_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:gabbro_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_smooth_brick_slab" + }, + { + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_slab_recombination.json index 28e5edf68..0fe13f140 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_smooth_slab" - }, - { - "item": "mineralogy:gabbro_smooth_slab" - } - ], - "result": { - "item": "mineralogy:gabbro_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "item": "mineralogy:gabbro_smooth_slab" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_slabs_to_brick.json index f9a214132..cdd5a57d5 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth_slab" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth_slab" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_stairs_to_brick.json index 7b38f85e6..7e5c54664 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_polished_walls_to_brick.json index 16b730b34..0e4542ede 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth_wall" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth_wall" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_polishing.json index 3eced29d9..c387ada98 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:gabbro_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_recombination.json index 1d098711b..3d8f2cdf2 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_slab" - }, - { - "item": "mineralogy:gabbro_slab" - } - ], - "result": { - "item": "mineralogy:gabbro", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_slab" + }, + { + "item": "mineralogy:gabbro_slab" + } + ], + "result": { + "item": "mineralogy:gabbro", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slabs_to_brick.json index 953eb256f..54d09c450 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_slab" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_slab" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_polishing.json index 8af4471e9..b277e7160 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:gabbro_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_to_brick.json index dc96ca803..5d7c1af2a 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_stairs" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_stairs" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_wall_polishing.json index 1f99b3f8b..5c2c36db4 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:gabbro_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_raw_walls_to_brick.json index 9707f0bc8..ce5f0825b 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_wall" - } - }, - "result": { - "item": "mineralogy:gabbro_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_wall" + } + }, + "result": { + "item": "mineralogy:gabbro_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_axe.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_axe.json index da4290519..7a1df82d9 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:gabbro_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:gabbro_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_blank.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_blank.json index 5f86da2af..7dc6ce043 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_cross.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_cross.json index 036b3e42a..6b914f7cd 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_hammer.json index fa34df452..5c923d40c 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_hoe.json index ce09e9986..b4a937672 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:gabbro_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:gabbro_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_horizontal.json index ba546d845..e9557ed38 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_i.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_i.json index 3bf525a3a..c92c9e8fa 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_left.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_left.json index 9c502bc5b..1f2db0cb4 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_pickaxe.json index a9a172f83..8273b9910 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:gabbro_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:gabbro_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_plus.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_plus.json index 27a4c81c9..ca63bbe4b 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_right.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_right.json index 8d4f8406c..3a9e9cd53 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_relief_left" - }, - { - "item": "mineralogy:gabbro_relief_left" - } - ], - "result": { - "item": "mineralogy:gabbro_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_left" + }, + { + "item": "mineralogy:gabbro_relief_left" + } + ], + "result": { + "item": "mineralogy:gabbro_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_sword.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_sword.json index b35f33c95..1f535a655 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "mineralogy:gabbro_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:gabbro_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "mineralogy:gabbro_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:gabbro_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/gabbro_relief_vertical.json index aa8c2c47e..7c6929de7 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_blank" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_relief_blank" + } + }, + "result": { + "item": "mineralogy:gabbro_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_slab.json b/src/main/resources/data/mineralogy/recipes/gabbro_slab.json index e3d87e3e8..132b00040 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro" + } + }, + "result": { + "item": "mineralogy:gabbro_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json index d1455be2a..552e8bc0b 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/gabbro" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:gabbro_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/gabbro" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:gabbro_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick.json index e1f983e7e..cde8c6303 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gabbro/smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_furnace.json index 2edb14526..06109a209 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/gabbro/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gabbro/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_slab.json index 1d328a8d4..c3ea3eb3b 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth_brick" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_stairs.json index 6afa62d62..f0e8edf88 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gabbro/smooth_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth_brick" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_wall.json index 5673f8b75..05b00ae09 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gabbro/smooth_brick" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth_brick" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_furnace.json index fde7607a4..28b15b3ff 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/gabbro/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gabbro/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_slab.json index f4d5e9a78..e77cdf11e 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro_smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gabbro_smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_stairs.json index 4593f1f2b..66770fcf2 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gabbro/smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_wall.json index 6a14ef416..77d6a41aa 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gabbro/smooth" - } - }, - "result": { - "item": "mineralogy:gabbro_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro/smooth" + } + }, + "result": { + "item": "mineralogy:gabbro_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json b/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json index ce1bc20e7..10baf2d63 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro" + } + }, + "result": { + "item": "mineralogy:gabbro_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_wall.json b/src/main/resources/data/mineralogy/recipes/gabbro_wall.json index e612e12a1..8cc6a029e 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gabbro_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gabbro" + } + }, + "result": { + "item": "mineralogy:gabbro_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick.json index ce546be28..1f2535044 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss" + } + }, + "result": { + "item": "mineralogy:gneiss_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_block_polishing.json index 265ec81ff..1c5be4173 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:gneiss_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_furnace.json index 464945c01..b03f760d9 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/gneiss/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gneiss/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab.json index 67c96cfdb..f4ba04ba2 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_brick" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_polishing.json index c7f4e89cf..9a3b0389f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:gneiss_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_recombination.json index b3c5dc490..3a0a8d4e5 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_brick_slab" - }, - { - "item": "mineralogy:gneiss_brick_slab" - } - ], - "result": { - "item": "mineralogy:gneiss_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick_slab" + }, + { + "item": "mineralogy:gneiss_brick_slab" + } + ], + "result": { + "item": "mineralogy:gneiss_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs.json index 0ea494586..a847b70f5 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gneiss/brick" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/brick" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs_polishing.json index 83c2be261..a0db79aad 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:gneiss_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall.json index bd37baa5a..15f3f9a42 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gneiss/brick" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/brick" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall_polishing.json index 11d8fb197..53565441e 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:gneiss_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_cobblestone.json b/src/main/resources/data/mineralogy/recipes/gneiss_cobblestone.json index 2252a83b5..bbb3d2767 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/gneiss" - }, - { - "tag": "mineralogy:stones/gneiss" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/gneiss" + }, + { + "tag": "mineralogy:stones/gneiss" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json b/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json index d078c9f4a..954107e2f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/gneiss" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gneiss_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gneiss" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gneiss_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_brick_slab_recombination.json index b01c87208..eebb0fcdb 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_smooth_brick_slab" - }, - { - "item": "mineralogy:gneiss_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:gneiss_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_smooth_brick_slab" + }, + { + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_slab_recombination.json index da9f65dd6..f449f22ee 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_smooth_slab" - }, - { - "item": "mineralogy:gneiss_smooth_slab" - } - ], - "result": { - "item": "mineralogy:gneiss_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "item": "mineralogy:gneiss_smooth_slab" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_slabs_to_brick.json index 0b309fd5a..cdcaf87c3 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth_slab" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth_slab" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_stairs_to_brick.json index 98460b391..139cea5be 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_polished_walls_to_brick.json index d00491db5..98b140c12 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth_wall" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth_wall" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_polishing.json index 83568f45e..e73914b71 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:gneiss_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_recombination.json index 7873c0413..3bf2bdb3b 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_slab" - }, - { - "item": "mineralogy:gneiss_slab" - } - ], - "result": { - "item": "mineralogy:gneiss", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_slab" + }, + { + "item": "mineralogy:gneiss_slab" + } + ], + "result": { + "item": "mineralogy:gneiss", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slabs_to_brick.json index 384ba20c9..8eae122de 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_slab" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_slab" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_polishing.json index bdc4dbd52..d5a8f61b4 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:gneiss_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_to_brick.json index 3fe0558bb..ffd9be83c 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_stairs" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_stairs" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_wall_polishing.json index 5670e632c..31d11e6bc 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:gneiss_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_raw_walls_to_brick.json index c4b346009..c4afc178d 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_wall" - } - }, - "result": { - "item": "mineralogy:gneiss_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_wall" + } + }, + "result": { + "item": "mineralogy:gneiss_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_axe.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_axe.json index 4f87c3377..0dbfaf824 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:gneiss_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:gneiss_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_blank.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_blank.json index 6c46398af..c259cd6f3 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_cross.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_cross.json index c697b2c9a..d01da19f7 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_hammer.json index fbf230399..67a739bc3 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_hoe.json index f87065da2..de83567d0 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:gneiss_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:gneiss_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_horizontal.json index c415c424f..80aa6ca68 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_i.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_i.json index 44b677616..4ae29a475 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_left.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_left.json index 3b3c60fc6..7dbb2c5bf 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_pickaxe.json index 593a06bae..666247ca9 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:gneiss_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:gneiss_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_plus.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_plus.json index 670eb57cf..15d6dfd5c 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_right.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_right.json index dbe19f4c3..3b6cb632f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_relief_left" - }, - { - "item": "mineralogy:gneiss_relief_left" - } - ], - "result": { - "item": "mineralogy:gneiss_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_left" + }, + { + "item": "mineralogy:gneiss_relief_left" + } + ], + "result": { + "item": "mineralogy:gneiss_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_sword.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_sword.json index fe1b210ec..d0c9eb2e4 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "mineralogy:gneiss_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:gneiss_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "mineralogy:gneiss_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:gneiss_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/gneiss_relief_vertical.json index a1572669f..4206088f6 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_blank" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_relief_blank" + } + }, + "result": { + "item": "mineralogy:gneiss_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_slab.json b/src/main/resources/data/mineralogy/recipes/gneiss_slab.json index 46b03e71e..e21822575 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss" + } + }, + "result": { + "item": "mineralogy:gneiss_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json index 0ae5b638a..e761461d4 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/gneiss" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:gneiss_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/gneiss" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:gneiss_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick.json index 2e2d2b879..8d4b39b21 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gneiss/smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_furnace.json index 1cb64027a..d17678a93 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/gneiss/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gneiss/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_slab.json index 08a36573f..e2104be2c 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth_brick" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_stairs.json index 4399fed7d..0b8d9f3a8 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gneiss/smooth_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth_brick" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_wall.json index 92c59848b..8e26b543c 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gneiss/smooth_brick" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth_brick" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_furnace.json index 8c5d54ada..c0c91da6f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/gneiss/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/gneiss/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_slab.json index 0cb30e62d..35afc97a7 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss_smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:gneiss_smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_stairs.json index 125a8e87b..0e06e380f 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gneiss/smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_wall.json index a0e45d68e..3425f55cf 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gneiss/smooth" - } - }, - "result": { - "item": "mineralogy:gneiss_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss/smooth" + } + }, + "result": { + "item": "mineralogy:gneiss_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json b/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json index 1f9cb9268..3e7d0de00 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss" + } + }, + "result": { + "item": "mineralogy:gneiss_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_wall.json b/src/main/resources/data/mineralogy/recipes/gneiss_wall.json index ca3ca8476..ff2a6b254 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gneiss_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/gneiss" + } + }, + "result": { + "item": "mineralogy:gneiss_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick.json b/src/main/resources/data/mineralogy/recipes/granite_brick.json index 4fc4bc262..d8db2c9c3 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/granite" - } - }, - "result": { - "item": "mineralogy:granite_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite" + } + }, + "result": { + "item": "mineralogy:granite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_brick_block_polishing.json index 497705a13..b52ecc6ab 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:granite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/granite_brick_furnace.json index 892f26b0f..8a0cba0b9 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/granite/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:granite_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/granite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:granite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/granite_brick_slab.json index b16032ccf..b1ac97f5a 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_brick" - } - }, - "result": { - "item": "mineralogy:granite_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_brick" + } + }, + "result": { + "item": "mineralogy:granite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_brick_slab_polishing.json index 23bd5286f..1149031e7 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:granite_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/granite_brick_slab_recombination.json index 0466007e9..043e54604 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_brick_slab" - }, - { - "item": "mineralogy:granite_brick_slab" - } - ], - "result": { - "item": "mineralogy:granite_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick_slab" + }, + { + "item": "mineralogy:granite_brick_slab" + } + ], + "result": { + "item": "mineralogy:granite_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_brick_stairs.json index d30ce5eee..673d62abe 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/granite/brick" - } - }, - "result": { - "item": "mineralogy:granite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/brick" + } + }, + "result": { + "item": "mineralogy:granite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_brick_stairs_polishing.json index 26158df58..8fc1602a4 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:granite_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/granite_brick_wall.json index 83ea00025..555850692 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/granite/brick" - } - }, - "result": { - "item": "mineralogy:granite_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/brick" + } + }, + "result": { + "item": "mineralogy:granite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_brick_wall_polishing.json index 56ca6fcf8..a14d8eb84 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:granite_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/granite_cobblestone.json index 91f5e9116..cccddd42d 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/granite_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/granite" - }, - { - "tag": "mineralogy:stones/granite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/granite" + }, + { + "tag": "mineralogy:stones/granite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_furnace.json b/src/main/resources/data/mineralogy/recipes/granite_furnace.json index faf2765ab..7f62048ca 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/granite" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:granite_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/granite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:granite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/granite_polished_brick_slab_recombination.json index 8c4300afb..4b3494ebf 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_smooth_brick_slab" - }, - { - "item": "mineralogy:granite_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:granite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_smooth_brick_slab" + }, + { + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:granite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/granite_polished_slab_recombination.json index 0279fcfa9..8db726bd6 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_smooth_slab" - }, - { - "item": "mineralogy:granite_smooth_slab" - } - ], - "result": { - "item": "mineralogy:granite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_smooth_slab" + }, + { + "item": "mineralogy:granite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:granite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_polished_slabs_to_brick.json index eb7de501a..446b3e78c 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth_slab" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_polished_stairs_to_brick.json index 5ab67da5c..000ecac67 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_polished_walls_to_brick.json index d196c965e..0ead7cd3d 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth_wall" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_raw_slab_polishing.json index dc1bf37e7..a39724156 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:granite_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/granite_raw_slab_recombination.json index 173abb61f..af2493299 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_slab" - }, - { - "item": "mineralogy:granite_slab" - } - ], - "result": { - "item": "mineralogy:granite", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_slab" + }, + { + "item": "mineralogy:granite_slab" + } + ], + "result": { + "item": "mineralogy:granite", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_raw_slabs_to_brick.json index 88b95dd96..21930053f 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:granite_slab" - } - }, - "result": { - "item": "mineralogy:granite_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_slab" + } + }, + "result": { + "item": "mineralogy:granite_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_polishing.json index a2b951c43..122baa403 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:granite_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_to_brick.json index 4e95813f7..e9b0e5fe7 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:granite_stairs" - } - }, - "result": { - "item": "mineralogy:granite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_stairs" + } + }, + "result": { + "item": "mineralogy:granite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/granite_raw_wall_polishing.json index 672f39fc5..50ddb8677 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:granite_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/granite_raw_walls_to_brick.json index 007ac0d46..3258012bc 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:granite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:granite_wall" - } - }, - "result": { - "item": "mineralogy:granite_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:granite_wall" + } + }, + "result": { + "item": "mineralogy:granite_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/granite_relief_axe.json index 2981808bb..3d4c0684f 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:granite_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:granite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json index ee649fca8..1562b773c 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/granite/smooth" - } - }, - "result": { - "item": "mineralogy:granite_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth" + } + }, + "result": { + "item": "mineralogy:granite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/granite_relief_cross.json index f9e40ee93..871a49361 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/granite_relief_hammer.json index 91abb1898..02bcfa913 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/granite_relief_hoe.json index 78f4fb6bc..cf895d384 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:granite_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:granite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/granite_relief_horizontal.json index 434ec2e68..f71682bc7 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_i.json b/src/main/resources/data/mineralogy/recipes/granite_relief_i.json index 1e0042633..8144dcbce 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_left.json b/src/main/resources/data/mineralogy/recipes/granite_relief_left.json index 192d9fa1e..95559c1ba 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/granite_relief_pickaxe.json index 95d859e9e..1c220a905 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:granite_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:granite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/granite_relief_plus.json index 808c7f48c..2c8c022eb 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_right.json b/src/main/resources/data/mineralogy/recipes/granite_relief_right.json index e102df93c..bb78a9b62 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_relief_left" - }, - { - "item": "mineralogy:granite_relief_left" - } - ], - "result": { - "item": "mineralogy:granite_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_left" + }, + { + "item": "mineralogy:granite_relief_left" + } + ], + "result": { + "item": "mineralogy:granite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/granite_relief_sword.json index 555082c11..bbcf24c37 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "mineralogy:granite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:granite_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "mineralogy:granite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:granite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/granite_relief_vertical.json index 3ea518b73..912259743 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/granite_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_blank" - } - }, - "result": { - "item": "mineralogy:granite_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:granite_relief_blank" + } + }, + "result": { + "item": "mineralogy:granite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_slab.json b/src/main/resources/data/mineralogy/recipes/granite_slab.json index 3a0f24a46..983fea31e 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite" - } - }, - "result": { - "item": "mineralogy:granite_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite" + } + }, + "result": { + "item": "mineralogy:granite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/granite_slab_from_vanilla.json index 78767e690..c91bd5197 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/granite_slab_from_vanilla.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:granite_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:granite_slab" - } - ], - "result": { - "item": "mineralogy:granite_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:granite_slab" + } + ], + "result": { + "item": "mineralogy:granite_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/granite_slab_to_vanilla.json index 09fe09128..20b240929 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/granite_slab_to_vanilla.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:granite_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_slab" - } - ], - "result": { - "item": "minecraft:granite_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:granite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_slab" + } + ], + "result": { + "item": "minecraft:granite_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth.json b/src/main/resources/data/mineralogy/recipes/granite_smooth.json index 83dc8e8ac..46dd14f50 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:granite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:granite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick.json index 465a5cbda..d931e6f6a 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/granite/smooth" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_furnace.json index e9bccde52..5c8869ca1 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/granite/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/granite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_slab.json index 8dc3da154..a24e12384 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_stairs.json index 53f0919b5..f2d992fb7 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/granite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_wall.json index 66aa29eb2..cfc405fd7 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/granite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:granite_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:granite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_furnace.json index 9b9f92ce4..74f00a684 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/granite/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:granite_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/granite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:granite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab.json index ce788946c..fec76f32d 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - } - }, - "result": { - "item": "mineralogy:granite_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth" + } + }, + "result": { + "item": "mineralogy:granite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_from_vanilla.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_from_vanilla.json index fa67f5b6f..424d64000 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_from_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_from_vanilla.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_granite_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:polished_granite_slab" - } - ], - "result": { - "item": "mineralogy:granite_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_granite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:polished_granite_slab" + } + ], + "result": { + "item": "mineralogy:granite_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_to_vanilla.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_to_vanilla.json index 1eb64b6ca..d18a21346 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_to_vanilla.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_slab_to_vanilla.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "minecraft:polished_granite_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:granite_smooth_slab" - } - ], - "result": { - "item": "minecraft:polished_granite_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "minecraft:polished_granite_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_smooth_slab" + } + ], + "result": { + "item": "minecraft:polished_granite_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json index 75b0e4914..cccefe463 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite_smooth" - } - }, - "result": { - "item": "mineralogy:granite_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite_smooth" + } + }, + "result": { + "item": "mineralogy:granite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/granite_smooth_wall.json index c72b54fe2..27e60ecdf 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/granite/smooth" - } - }, - "result": { - "item": "mineralogy:granite_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/granite/smooth" + } + }, + "result": { + "item": "mineralogy:granite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_stairs.json index 92ec7cbd4..2555a1fbd 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite" - } - }, - "result": { - "item": "mineralogy:granite_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite" + } + }, + "result": { + "item": "mineralogy:granite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_wall.json b/src/main/resources/data/mineralogy/recipes/granite_wall.json index 22e5facb4..85a3d87a7 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:granite_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite" - } - }, - "result": { - "item": "mineralogy:granite_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:granite" + } + }, + "result": { + "item": "mineralogy:granite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gravel_to_stone.json b/src/main/resources/data/mineralogy/recipes/gravel_to_stone.json index e8e3c5ecc..64b3311ea 100644 --- a/src/main/resources/data/mineralogy/recipes/gravel_to_stone.json +++ b/src/main/resources/data/mineralogy/recipes/gravel_to_stone.json @@ -1,22 +1,15 @@ { - "type": "forge:conditional", - "recipes": [ + "type": "minecraft:smelting", + "ingredient": { + "item": "minecraft:gravel" + }, + "result": "minecraft:stone", + "experience": 0.1, + "cookingtime": 200, + "conditions": [ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "SMELTABLE_GRAVEL" - } - ], - "recipe": { - "type": "minecraft:smelting", - "ingredient": { - "item": "minecraft:gravel" - }, - "result": "minecraft:stone", - "experience": 0.1, - "cookingtime": 200 - } + "type": "mineralogy:config", + "flag": "SMELTABLE_GRAVEL" } ] } diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon_dust.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon_dust.json index 2e3f5f038..42d698ab2 100644 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon_dust.json +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon_dust.json @@ -1,31 +1,31 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:not", - "value": { - "type": "forge:tag_empty", - "tag": "forge:dusts/carbon" - } - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/carbon" - }, - { - "tag": "forge:dusts/nitrate" - }, - { - "tag": "forge:dusts/sulfur" - } - ], - "result": { - "item": "minecraft:gunpowder", - "count": 4 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/carbon" + } + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/carbon" + }, + { + "tag": "forge:dusts/nitrate" + }, + { + "tag": "forge:dusts/sulfur" + } + ], + "result": { + "item": "minecraft:gunpowder", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json index 4d869dc4b..ed887d527 100644 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json @@ -1,24 +1,24 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:charcoal" - }, - { - "tag": "forge:dusts/nitrate" - }, - { - "tag": "forge:dusts/sulfur" - } - ], - "result": { - "item": "minecraft:gunpowder", - "count": 4 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:charcoal" + }, + { + "tag": "forge:dusts/nitrate" + }, + { + "tag": "forge:dusts/sulfur" + } + ], + "result": { + "item": "minecraft:gunpowder", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal_dust.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal_dust.json index 95a4a8cae..099f13913 100644 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal_dust.json +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_coal_dust.json @@ -1,31 +1,31 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:not", - "value": { - "type": "forge:tag_empty", - "tag": "forge:dusts/coal" - } - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/coal" - }, - { - "tag": "forge:dusts/nitrate" - }, - { - "tag": "forge:dusts/sulfur" - } - ], - "result": { - "item": "minecraft:gunpowder", - "count": 4 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/coal" + } + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/coal" + }, + { + "tag": "forge:dusts/nitrate" + }, + { + "tag": "forge:dusts/sulfur" + } + ], + "result": { + "item": "minecraft:gunpowder", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_sugar.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_sugar.json index 3cdcb7c65..3ee7e98d3 100644 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_sugar.json +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_sugar.json @@ -1,24 +1,24 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:sugar" - }, - { - "tag": "forge:dusts/nitrate" - }, - { - "tag": "forge:dusts/sulfur" - } - ], - "result": { - "item": "minecraft:gunpowder", - "count": 4 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:sugar" + }, + { + "tag": "forge:dusts/nitrate" + }, + { + "tag": "forge:dusts/sulfur" + } + ], + "result": { + "item": "minecraft:gunpowder", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gypsum.json b/src/main/resources/data/mineralogy/recipes/gypsum.json index 4e0b32977..49bc08363 100644 --- a/src/main/resources/data/mineralogy/recipes/gypsum.json +++ b/src/main/resources/data/mineralogy/recipes/gypsum.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gypsum" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "forge:dusts/gypsum" - } - }, - "result": { - "item": "mineralogy:gypsum", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gypsum" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:dusts/gypsum" + } + }, + "result": { + "item": "mineralogy:gypsum", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/gypsum_dust.json b/src/main/resources/data/mineralogy/recipes/gypsum_dust.json index f6d26d2cd..7781a6191 100644 --- a/src/main/resources/data/mineralogy/recipes/gypsum_dust.json +++ b/src/main/resources/data/mineralogy/recipes/gypsum_dust.json @@ -1,18 +1,18 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:gypsum_dust" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/gypsum" - } - ], - "result": { - "item": "mineralogy:gypsum_dust", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gypsum_dust" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/gypsum" + } + ], + "result": { + "item": "mineralogy:gypsum_dust", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick.json index eaa1f1f9d..f8d6e9fb1 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels" + } + }, + "result": { + "item": "mineralogy:hornfels_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_block_polishing.json index 895caff2b..2c50cad38 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:hornfels_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_furnace.json index 07abf9eb1..5afa377cd 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/hornfels/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/hornfels/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab.json index b06f61e6d..0184a0a4e 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_brick" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_polishing.json index 03d8b417b..0aff8fe33 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:hornfels_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_recombination.json index 8372a26ee..ace699124 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_brick_slab" - }, - { - "item": "mineralogy:hornfels_brick_slab" - } - ], - "result": { - "item": "mineralogy:hornfels_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick_slab" + }, + { + "item": "mineralogy:hornfels_brick_slab" + } + ], + "result": { + "item": "mineralogy:hornfels_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs.json index 14fc4bc18..92ce98d42 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/hornfels/brick" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/brick" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs_polishing.json index feaded12e..dbcafa427 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:hornfels_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall.json index 8dc8f34dc..d64ef4d0d 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/hornfels/brick" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/brick" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall_polishing.json index 4e337c18f..aab0ddcae 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:hornfels_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_cobblestone.json b/src/main/resources/data/mineralogy/recipes/hornfels_cobblestone.json index 2a2cf87ec..977936bbc 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/hornfels" - }, - { - "tag": "mineralogy:stones/hornfels" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/hornfels" + }, + { + "tag": "mineralogy:stones/hornfels" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json b/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json index 5ea26dcb0..70d532ca4 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/hornfels" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:hornfels_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/hornfels" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:hornfels_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_brick_slab_recombination.json index 3db0faab8..593aba083 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_smooth_brick_slab" - }, - { - "item": "mineralogy:hornfels_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:hornfels_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_smooth_brick_slab" + }, + { + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_slab_recombination.json index 0ed28a7c3..98825b88f 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_smooth_slab" - }, - { - "item": "mineralogy:hornfels_smooth_slab" - } - ], - "result": { - "item": "mineralogy:hornfels_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "item": "mineralogy:hornfels_smooth_slab" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_slabs_to_brick.json index 7d82ff653..c46470ad5 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth_slab" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth_slab" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_stairs_to_brick.json index 4d72100e5..b2e0d4a7d 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_polished_walls_to_brick.json index d85bff0ab..6b7d6b48d 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth_wall" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth_wall" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_polishing.json index 12def83ef..2db90a7df 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:hornfels_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_recombination.json index dc1d5a748..19ef6a95b 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_slab" - }, - { - "item": "mineralogy:hornfels_slab" - } - ], - "result": { - "item": "mineralogy:hornfels", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_slab" + }, + { + "item": "mineralogy:hornfels_slab" + } + ], + "result": { + "item": "mineralogy:hornfels", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slabs_to_brick.json index d5178ba5d..5f0d54e87 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_slab" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_slab" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_polishing.json index 4c566d017..bf416d1ef 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:hornfels_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_to_brick.json index 2e60a4074..7d80b58c9 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_stairs" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_stairs" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_wall_polishing.json index 18fcd3c14..99caf45da 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:hornfels_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_raw_walls_to_brick.json index be46bc854..9fe737405 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_wall" - } - }, - "result": { - "item": "mineralogy:hornfels_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_wall" + } + }, + "result": { + "item": "mineralogy:hornfels_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_axe.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_axe.json index 4a928f389..885324663 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:hornfels_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:hornfels_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_blank.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_blank.json index 9c87337d1..e64e141ac 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_cross.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_cross.json index 34823ff90..25f271d91 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_hammer.json index 56f4b7bb4..ce0bddfa9 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_hoe.json index 518b3df48..bf86b4262 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:hornfels_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:hornfels_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_horizontal.json index 6c2179429..9f11d2e1c 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_i.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_i.json index 2aa52b270..5c8d9c3d6 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_left.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_left.json index a5575df02..ff3ac9084 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_pickaxe.json index 50906048b..9622f3a87 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:hornfels_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:hornfels_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_plus.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_plus.json index 1990e5d65..2f730dcfd 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_right.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_right.json index 6d6cfa0f7..e362ca6c3 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_relief_left" - }, - { - "item": "mineralogy:hornfels_relief_left" - } - ], - "result": { - "item": "mineralogy:hornfels_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_left" + }, + { + "item": "mineralogy:hornfels_relief_left" + } + ], + "result": { + "item": "mineralogy:hornfels_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_sword.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_sword.json index 13c795649..33b3a9714 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "mineralogy:hornfels_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:hornfels_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "mineralogy:hornfels_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:hornfels_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/hornfels_relief_vertical.json index e3995b4af..a72a92849 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_blank" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_relief_blank" + } + }, + "result": { + "item": "mineralogy:hornfels_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_slab.json b/src/main/resources/data/mineralogy/recipes/hornfels_slab.json index d97f745ed..97d9a44da 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels" + } + }, + "result": { + "item": "mineralogy:hornfels_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json index e91cdf1dc..1652aaed6 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/hornfels" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:hornfels_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/hornfels" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:hornfels_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick.json index 66476ee95..7ef199fe9 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/hornfels/smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_furnace.json index f54ef39f3..6930a32c7 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/hornfels/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/hornfels/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_slab.json index 87d9bd753..4906dd00f 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth_brick" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_stairs.json index a3e12dcf0..022e9b439 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/hornfels/smooth_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth_brick" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_wall.json index 1dc3c2cf9..19eec32c2 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/hornfels/smooth_brick" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth_brick" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_furnace.json index ec7bad694..ed333b061 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/hornfels/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/hornfels/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_slab.json index bdb651369..6cd63acce 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels_smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:hornfels_smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_stairs.json index 21651469f..bf7db1054 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/hornfels/smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_wall.json index 0a713cbf8..de7ddaa16 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/hornfels/smooth" - } - }, - "result": { - "item": "mineralogy:hornfels_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels/smooth" + } + }, + "result": { + "item": "mineralogy:hornfels_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json b/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json index a27fa5620..08fc9f132 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels" + } + }, + "result": { + "item": "mineralogy:hornfels_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_wall.json b/src/main/resources/data/mineralogy/recipes/hornfels_wall.json index 4d0ce9cd9..c11e942a9 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:hornfels_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/hornfels" + } + }, + "result": { + "item": "mineralogy:hornfels_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_brick.json index e71c8b670..d00b2dff9 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/limestone" - } - }, - "result": { - "item": "mineralogy:limestone_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone" + } + }, + "result": { + "item": "mineralogy:limestone_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_block_polishing.json index e3e718989..c106ee58c 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:limestone_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_furnace.json index df10c6099..1d0e6babe 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/limestone/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:limestone_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/limestone/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:limestone_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab.json index ff7662f81..dc1140125 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_brick" - } - }, - "result": { - "item": "mineralogy:limestone_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_brick" + } + }, + "result": { + "item": "mineralogy:limestone_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_polishing.json index 0c3f2080a..a3f514e1c 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:limestone_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_recombination.json index 70db2e995..3c6a01b24 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_brick_slab" - }, - { - "item": "mineralogy:limestone_brick_slab" - } - ], - "result": { - "item": "mineralogy:limestone_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick_slab" + }, + { + "item": "mineralogy:limestone_brick_slab" + } + ], + "result": { + "item": "mineralogy:limestone_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs.json index fe66cafeb..6741a0946 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/limestone/brick" - } - }, - "result": { - "item": "mineralogy:limestone_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/brick" + } + }, + "result": { + "item": "mineralogy:limestone_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs_polishing.json index 2223a4229..92c7f3360 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:limestone_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_wall.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_wall.json index 00da885b4..076a17f19 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/limestone/brick" - } - }, - "result": { - "item": "mineralogy:limestone_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/brick" + } + }, + "result": { + "item": "mineralogy:limestone_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_brick_wall_polishing.json index 2451dde9b..670f0064b 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:limestone_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_cobblestone.json b/src/main/resources/data/mineralogy/recipes/limestone_cobblestone.json index 59eaaf52c..729517842 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/limestone" - }, - { - "tag": "mineralogy:stones/limestone" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/limestone" + }, + { + "tag": "mineralogy:stones/limestone" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_furnace.json b/src/main/resources/data/mineralogy/recipes/limestone_furnace.json index c73f48091..c3a2bd0ed 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/limestone" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:limestone_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/limestone" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:limestone_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_brick_slab_recombination.json index 4d9ee36c5..72403b6cb 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_smooth_brick_slab" - }, - { - "item": "mineralogy:limestone_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:limestone_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_smooth_brick_slab" + }, + { + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_slab_recombination.json index 255cd3ceb..61d71ea3b 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_smooth_slab" - }, - { - "item": "mineralogy:limestone_smooth_slab" - } - ], - "result": { - "item": "mineralogy:limestone_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_smooth_slab" + }, + { + "item": "mineralogy:limestone_smooth_slab" + } + ], + "result": { + "item": "mineralogy:limestone_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_slabs_to_brick.json index fc5a0cb9f..c0de89c9e 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth_slab" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth_slab" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_stairs_to_brick.json index eb812aa17..c04b941ed 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_polished_walls_to_brick.json index 984bcacfd..b81a48d59 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth_wall" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth_wall" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_polishing.json index e5e4c8650..186758820 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:limestone_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_recombination.json index 6af52d637..2828ab5c1 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_slab" - }, - { - "item": "mineralogy:limestone_slab" - } - ], - "result": { - "item": "mineralogy:limestone", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_slab" + }, + { + "item": "mineralogy:limestone_slab" + } + ], + "result": { + "item": "mineralogy:limestone", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_slabs_to_brick.json index b3353664f..5b4e52f9a 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_slab" - } - }, - "result": { - "item": "mineralogy:limestone_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_slab" + } + }, + "result": { + "item": "mineralogy:limestone_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_polishing.json index 5af88afd8..663a25353 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:limestone_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_to_brick.json index 62e21a132..e088307f3 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_stairs" - } - }, - "result": { - "item": "mineralogy:limestone_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_stairs" + } + }, + "result": { + "item": "mineralogy:limestone_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_wall_polishing.json index 14fa3f115..9b6ac5953 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:limestone_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_raw_walls_to_brick.json index 749deefab..0c927507c 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_wall" - } - }, - "result": { - "item": "mineralogy:limestone_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_wall" + } + }, + "result": { + "item": "mineralogy:limestone_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_axe.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_axe.json index d5cb155b3..4278d904a 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:limestone_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:limestone_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_blank.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_blank.json index bf7bc1d94..96c4b17dc 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - } - }, - "result": { - "item": "mineralogy:limestone_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth" + } + }, + "result": { + "item": "mineralogy:limestone_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_cross.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_cross.json index 126f15148..302ed4ae0 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_hammer.json index 15dc06729..3b5e960f8 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_hoe.json index d9a57f2c8..ae6939ee5 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:limestone_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:limestone_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_horizontal.json index 9f291ccb4..11835e0bc 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_i.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_i.json index ea7f2dc51..65038cbfd 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_left.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_left.json index 9e4b9f970..fb171e5ee 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_pickaxe.json index ae12ff2fc..d7080e909 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:limestone_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:limestone_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_plus.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_plus.json index 2b25826d7..b871e57de 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_right.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_right.json index a03ed3a89..acd2f73cc 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_relief_left" - }, - { - "item": "mineralogy:limestone_relief_left" - } - ], - "result": { - "item": "mineralogy:limestone_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_left" + }, + { + "item": "mineralogy:limestone_relief_left" + } + ], + "result": { + "item": "mineralogy:limestone_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_sword.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_sword.json index b7f18389f..ca8807f59 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "mineralogy:limestone_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:limestone_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "mineralogy:limestone_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:limestone_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/limestone_relief_vertical.json index 513a02528..c3186e2f1 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_blank" - } - }, - "result": { - "item": "mineralogy:limestone_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:limestone_relief_blank" + } + }, + "result": { + "item": "mineralogy:limestone_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_slab.json b/src/main/resources/data/mineralogy/recipes/limestone_slab.json index 7e4f5eaf4..b24e15ff9 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone" - } - }, - "result": { - "item": "mineralogy:limestone_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone" + } + }, + "result": { + "item": "mineralogy:limestone_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth.json index f63744d97..1c7c6332e 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/limestone" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:limestone_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/limestone" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:limestone_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick.json index dce6c8237..ac4f2edda 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/limestone/smooth" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_furnace.json index 76b5483f3..2179b0f8c 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/limestone/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/limestone/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_slab.json index a35fd7956..7114d4e5a 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth_brick" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth_brick" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_stairs.json index 325572b58..3db29b699 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/limestone/smooth_brick" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth_brick" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_wall.json index 108b3e441..dad0b8f2d 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/limestone/smooth_brick" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth_brick" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_furnace.json index 1e19d87c2..205cbd0f5 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/limestone/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/limestone/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_slab.json index c4803e65c..1963c2b22 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone_smooth" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:limestone_smooth" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_stairs.json index 9789a10bf..d91a616b2 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/limestone/smooth" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth_wall.json index 2f9888bfa..2834737c1 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/limestone/smooth" - } - }, - "result": { - "item": "mineralogy:limestone_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone/smooth" + } + }, + "result": { + "item": "mineralogy:limestone_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_stairs.json b/src/main/resources/data/mineralogy/recipes/limestone_stairs.json index 2c3e4e0f1..e0d7ffa4d 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/limestone" - } - }, - "result": { - "item": "mineralogy:limestone_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone" + } + }, + "result": { + "item": "mineralogy:limestone_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_wall.json b/src/main/resources/data/mineralogy/recipes/limestone_wall.json index 2f06127f3..a008dbee3 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:limestone_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/limestone" - } - }, - "result": { - "item": "mineralogy:limestone_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/limestone" + } + }, + "result": { + "item": "mineralogy:limestone_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick.json b/src/main/resources/data/mineralogy/recipes/marble_brick.json index 3d67176a1..76c7dd433 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/marble" - } - }, - "result": { - "item": "mineralogy:marble_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble" + } + }, + "result": { + "item": "mineralogy:marble_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_brick_block_polishing.json index 8cef567b0..615650bba 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:marble_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/marble_brick_furnace.json index 91a5f53ff..cf13e4059 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/marble/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:marble_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/marble/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:marble_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_slab.json b/src/main/resources/data/mineralogy/recipes/marble_brick_slab.json index e49b33d77..3bc7e6fa9 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_brick" - } - }, - "result": { - "item": "mineralogy:marble_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_brick" + } + }, + "result": { + "item": "mineralogy:marble_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_brick_slab_polishing.json index 734780458..2f6b11723 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:marble_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/marble_brick_slab_recombination.json index 8d4b69fb5..ea20aea9a 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_brick_slab" - }, - { - "item": "mineralogy:marble_brick_slab" - } - ], - "result": { - "item": "mineralogy:marble_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick_slab" + }, + { + "item": "mineralogy:marble_brick_slab" + } + ], + "result": { + "item": "mineralogy:marble_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/marble_brick_stairs.json index cd84a0ce1..02053f937 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/marble/brick" - } - }, - "result": { - "item": "mineralogy:marble_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/brick" + } + }, + "result": { + "item": "mineralogy:marble_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_brick_stairs_polishing.json index 875c90430..d9831b67e 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:marble_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_wall.json b/src/main/resources/data/mineralogy/recipes/marble_brick_wall.json index ba563244e..9c73c0193 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/marble/brick" - } - }, - "result": { - "item": "mineralogy:marble_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/brick" + } + }, + "result": { + "item": "mineralogy:marble_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_brick_wall_polishing.json index 1ef76f322..f90891490 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:marble_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_cobblestone.json b/src/main/resources/data/mineralogy/recipes/marble_cobblestone.json index cb915ce21..9e3ce5775 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/marble_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/marble" - }, - { - "tag": "mineralogy:stones/marble" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/marble" + }, + { + "tag": "mineralogy:stones/marble" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_furnace.json b/src/main/resources/data/mineralogy/recipes/marble_furnace.json index 0d001caac..c5980f8db 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/marble" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:marble_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/marble" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:marble_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/marble_polished_brick_slab_recombination.json index 352a85bee..62831d180 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_smooth_brick_slab" - }, - { - "item": "mineralogy:marble_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:marble_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_smooth_brick_slab" + }, + { + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:marble_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/marble_polished_slab_recombination.json index b221401a5..ae2ec05a9 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_smooth_slab" - }, - { - "item": "mineralogy:marble_smooth_slab" - } - ], - "result": { - "item": "mineralogy:marble_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_smooth_slab" + }, + { + "item": "mineralogy:marble_smooth_slab" + } + ], + "result": { + "item": "mineralogy:marble_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_polished_slabs_to_brick.json index f75df464b..526aa316f 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth_slab" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth_slab" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_polished_stairs_to_brick.json index 39f2ca936..0c080b93b 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_polished_walls_to_brick.json index 4347a3812..5fef3df58 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth_wall" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth_wall" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_raw_slab_polishing.json index 8cfe300fa..ce2f649cf 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:marble_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/marble_raw_slab_recombination.json index cd806f29a..459ee49ab 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_slab" - }, - { - "item": "mineralogy:marble_slab" - } - ], - "result": { - "item": "mineralogy:marble", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_slab" + }, + { + "item": "mineralogy:marble_slab" + } + ], + "result": { + "item": "mineralogy:marble", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_raw_slabs_to_brick.json index 82ca8bbb3..1ba3f4b72 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:marble_slab" - } - }, - "result": { - "item": "mineralogy:marble_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_slab" + } + }, + "result": { + "item": "mineralogy:marble_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_polishing.json index 765a9a789..a8e1d29e5 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:marble_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_to_brick.json index 43169a5d6..4d8d81a13 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:marble_stairs" - } - }, - "result": { - "item": "mineralogy:marble_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_stairs" + } + }, + "result": { + "item": "mineralogy:marble_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/marble_raw_wall_polishing.json index 17b082a53..5a101579e 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:marble_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/marble_raw_walls_to_brick.json index 74f05a5cf..88635d0e3 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:marble_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:marble_wall" - } - }, - "result": { - "item": "mineralogy:marble_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:marble_wall" + } + }, + "result": { + "item": "mineralogy:marble_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_axe.json b/src/main/resources/data/mineralogy/recipes/marble_relief_axe.json index 42268b337..b89b95fce 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:marble_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:marble_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_blank.json b/src/main/resources/data/mineralogy/recipes/marble_relief_blank.json index 77e789a98..b13cf5008 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - } - }, - "result": { - "item": "mineralogy:marble_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth" + } + }, + "result": { + "item": "mineralogy:marble_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_cross.json b/src/main/resources/data/mineralogy/recipes/marble_relief_cross.json index 7c157cb06..29bdb8d63 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/marble_relief_hammer.json index e6386f1f2..c3a205aa4 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/marble_relief_hoe.json index b49118369..ff6d74c1e 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:marble_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:marble_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/marble_relief_horizontal.json index e7c04dc44..bc2f52a18 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_i.json b/src/main/resources/data/mineralogy/recipes/marble_relief_i.json index 66f051168..8d0f2b3e0 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_left.json b/src/main/resources/data/mineralogy/recipes/marble_relief_left.json index f2620bed3..8e8ac68b5 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/marble_relief_pickaxe.json index 69aef677b..c86a26227 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:marble_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:marble_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_plus.json b/src/main/resources/data/mineralogy/recipes/marble_relief_plus.json index a6a50be1f..5b493b515 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_right.json b/src/main/resources/data/mineralogy/recipes/marble_relief_right.json index c46d3136b..02f0d4f1f 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_relief_left" - }, - { - "item": "mineralogy:marble_relief_left" - } - ], - "result": { - "item": "mineralogy:marble_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_left" + }, + { + "item": "mineralogy:marble_relief_left" + } + ], + "result": { + "item": "mineralogy:marble_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_sword.json b/src/main/resources/data/mineralogy/recipes/marble_relief_sword.json index f0047ab4b..53a063d5a 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "mineralogy:marble_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:marble_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "mineralogy:marble_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:marble_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/marble_relief_vertical.json index 7880148ef..b06f013d2 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/marble_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_blank" - } - }, - "result": { - "item": "mineralogy:marble_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:marble_relief_blank" + } + }, + "result": { + "item": "mineralogy:marble_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_slab.json b/src/main/resources/data/mineralogy/recipes/marble_slab.json index 8afe1b7d2..5f170be5f 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble" - } - }, - "result": { - "item": "mineralogy:marble_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble" + } + }, + "result": { + "item": "mineralogy:marble_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth.json b/src/main/resources/data/mineralogy/recipes/marble_smooth.json index 4571e7db8..593043ba9 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/marble" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:marble_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/marble" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:marble_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick.json index 4e64fc34c..05e868c3b 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/marble/smooth" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_furnace.json index b1ec1bf71..3bccae88a 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/marble/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/marble/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_slab.json index 60d9b10a7..b0605bf1f 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth_brick" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth_brick" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_stairs.json index bb6d9f3b8..8f4a0db13 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/marble/smooth_brick" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth_brick" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_wall.json index 48e8a80bd..e816b0f6b 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/marble/smooth_brick" - } - }, - "result": { - "item": "mineralogy:marble_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth_brick" + } + }, + "result": { + "item": "mineralogy:marble_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_furnace.json index 27ec3ddf9..b025120e0 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/marble/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:marble_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/marble/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:marble_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_slab.json index ce2da208d..df89e9bcd 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble_smooth" - } - }, - "result": { - "item": "mineralogy:marble_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:marble_smooth" + } + }, + "result": { + "item": "mineralogy:marble_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_stairs.json index 0d19541bb..67c4ccca9 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/marble/smooth" - } - }, - "result": { - "item": "mineralogy:marble_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth" + } + }, + "result": { + "item": "mineralogy:marble_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/marble_smooth_wall.json index 8140e77df..55c696ed7 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/marble/smooth" - } - }, - "result": { - "item": "mineralogy:marble_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble/smooth" + } + }, + "result": { + "item": "mineralogy:marble_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_stairs.json b/src/main/resources/data/mineralogy/recipes/marble_stairs.json index a8df994d8..346890345 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/marble" - } - }, - "result": { - "item": "mineralogy:marble_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble" + } + }, + "result": { + "item": "mineralogy:marble_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_wall.json b/src/main/resources/data/mineralogy/recipes/marble_wall.json index 84e3f7c48..1d1d3b41d 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:marble_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/marble" - } - }, - "result": { - "item": "mineralogy:marble_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/marble" + } + }, + "result": { + "item": "mineralogy:marble_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/mineralfertilizer.json b/src/main/resources/data/mineralogy/recipes/mineralfertilizer.json index b3d18072b..6f9e494ac 100644 --- a/src/main/resources/data/mineralogy/recipes/mineralfertilizer.json +++ b/src/main/resources/data/mineralogy/recipes/mineralfertilizer.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_FERTILIZER" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:mineral_fertilizer" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/nitrate" - }, - { - "tag": "forge:dusts/phosphorous" - } - ], - "result": { - "item": "mineralogy:mineral_fertilizer", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_FERTILIZER" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:mineral_fertilizer" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/nitrate" + }, + { + "tag": "forge:dusts/phosphorous" + } + ], + "result": { + "item": "mineralogy:mineral_fertilizer", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/nitrate_block.json b/src/main/resources/data/mineralogy/recipes/nitrate_block.json index ffa4c4537..17ae1ca6b 100644 --- a/src/main/resources/data/mineralogy/recipes/nitrate_block.json +++ b/src/main/resources/data/mineralogy/recipes/nitrate_block.json @@ -1,27 +1,27 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:nitrate_block" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:nitrate_dust" - } - }, - "result": { - "item": "mineralogy:nitrate_block", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_block" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:nitrate_dust" + } + }, + "result": { + "item": "mineralogy:nitrate_block", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/nitrate_dust.json b/src/main/resources/data/mineralogy/recipes/nitrate_dust.json index 6ee3fe804..c8d4a6c09 100644 --- a/src/main/resources/data/mineralogy/recipes/nitrate_dust.json +++ b/src/main/resources/data/mineralogy/recipes/nitrate_dust.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:nitrate_dust" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/nitrate" - } - ], - "result": { - "item": "mineralogy:nitrate_dust", - "count": 9 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:nitrate_dust" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/nitrate" + } + ], + "result": { + "item": "mineralogy:nitrate_dust", + "count": 9 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick.json index 9d746be1a..8bd5b0d80 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite" + } + }, + "result": { + "item": "mineralogy:novaculite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_block_polishing.json index c14cc22c8..99ea3c668 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:novaculite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_furnace.json index a5b807279..4f10ba709 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/novaculite/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/novaculite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab.json index cf1e0f6e7..81af5a568 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_brick" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_polishing.json index ed61b5b03..8344b7c93 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:novaculite_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_recombination.json index 532a6a0cb..150f4c402 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_brick_slab" - }, - { - "item": "mineralogy:novaculite_brick_slab" - } - ], - "result": { - "item": "mineralogy:novaculite_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick_slab" + }, + { + "item": "mineralogy:novaculite_brick_slab" + } + ], + "result": { + "item": "mineralogy:novaculite_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs.json index f8a95f389..31275a6cc 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/novaculite/brick" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/brick" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs_polishing.json index a5c52bf76..bc8c2303b 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:novaculite_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall.json index 58c516370..2f6da80fe 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/novaculite/brick" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/brick" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall_polishing.json index 888abb979..c4f7e9614 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:novaculite_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/novaculite_cobblestone.json index 8886306ef..9a8da12ee 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/novaculite" - }, - { - "tag": "mineralogy:stones/novaculite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/novaculite" + }, + { + "tag": "mineralogy:stones/novaculite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json b/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json index 33eeae7f6..940c68acb 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/novaculite" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:novaculite_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/novaculite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:novaculite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_brick_slab_recombination.json index cc4466477..5b544f41b 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_smooth_brick_slab" - }, - { - "item": "mineralogy:novaculite_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:novaculite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_smooth_brick_slab" + }, + { + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_slab_recombination.json index bb49551ed..19d83bc7c 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_smooth_slab" - }, - { - "item": "mineralogy:novaculite_smooth_slab" - } - ], - "result": { - "item": "mineralogy:novaculite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "item": "mineralogy:novaculite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_slabs_to_brick.json index e745b2dcc..97c598666 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth_slab" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_stairs_to_brick.json index 553b88ab9..c5935de5a 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_polished_walls_to_brick.json index 0736ab652..693faa04a 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth_wall" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_polishing.json index b8dc4c72a..74deeb8ab 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:novaculite_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_recombination.json index efad4ec01..422504daa 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_slab" - }, - { - "item": "mineralogy:novaculite_slab" - } - ], - "result": { - "item": "mineralogy:novaculite", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_slab" + }, + { + "item": "mineralogy:novaculite_slab" + } + ], + "result": { + "item": "mineralogy:novaculite", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slabs_to_brick.json index 2f8ccde1e..021f3ac37 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_slab" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_slab" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_polishing.json index 91d1b04e9..beaeca0db 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:novaculite_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_to_brick.json index e0cbc0aca..1eeaf6b2f 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_stairs" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_stairs" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_wall_polishing.json index 6d43688dd..3edf236d8 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:novaculite_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_raw_walls_to_brick.json index 62418f0fb..08f5bdd8d 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_wall" - } - }, - "result": { - "item": "mineralogy:novaculite_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_wall" + } + }, + "result": { + "item": "mineralogy:novaculite_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_axe.json index fad1a1e04..bb0001d97 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:novaculite_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:novaculite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_blank.json index 7f191c7a1..1fb5e51ba 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_cross.json index c0d70e6b5..f4c0bec4b 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_hammer.json index 85d1af647..53ff2e71b 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_hoe.json index 4dba5fc43..53417aa38 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:novaculite_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:novaculite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_horizontal.json index 39050872b..9ca794140 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_i.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_i.json index 86f3e21ae..b18e022f6 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_left.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_left.json index f0d1f6121..bebc532c6 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_pickaxe.json index f9c68294e..6c4417311 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:novaculite_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:novaculite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_plus.json index 3f2969e61..d32d11a4a 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_right.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_right.json index 2add9c8a4..3e315cab6 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_relief_left" - }, - { - "item": "mineralogy:novaculite_relief_left" - } - ], - "result": { - "item": "mineralogy:novaculite_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_left" + }, + { + "item": "mineralogy:novaculite_relief_left" + } + ], + "result": { + "item": "mineralogy:novaculite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_sword.json index ff85513c3..f5827c283 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "mineralogy:novaculite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:novaculite_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "mineralogy:novaculite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:novaculite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/novaculite_relief_vertical.json index a9200b5ba..c78629d17 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_blank" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_relief_blank" + } + }, + "result": { + "item": "mineralogy:novaculite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_slab.json b/src/main/resources/data/mineralogy/recipes/novaculite_slab.json index 2f75d43ee..0b12e568a 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite" + } + }, + "result": { + "item": "mineralogy:novaculite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json index bab8c6e9a..2bb4fd011 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/novaculite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:novaculite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/novaculite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:novaculite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick.json index a66d9cfbc..dabdca75e 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/novaculite/smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_furnace.json index 7469372f7..a8b83c2c9 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/novaculite/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/novaculite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_slab.json index 6d67fcb6f..d3ce495ee 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_stairs.json index 16f3f2e2d..9fb78eedb 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/novaculite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_wall.json index 138b920ab..0d30014ed 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/novaculite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_furnace.json index 7a97804ea..13e1e27b6 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/novaculite/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/novaculite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_slab.json index 455f86907..e7f1bf2b6 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite_smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:novaculite_smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_stairs.json index 1154b6db9..9fa878a00 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/novaculite/smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_wall.json index 73b901469..447d86dfa 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/novaculite/smooth" - } - }, - "result": { - "item": "mineralogy:novaculite_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite/smooth" + } + }, + "result": { + "item": "mineralogy:novaculite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json b/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json index a08572c56..0ea6b8346 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite" + } + }, + "result": { + "item": "mineralogy:novaculite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_wall.json b/src/main/resources/data/mineralogy/recipes/novaculite_wall.json index 1af81604c..0e1336682 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:novaculite_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/novaculite" + } + }, + "result": { + "item": "mineralogy:novaculite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json index f8b6c2cdc..9c50371d2 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_block_polishing.json index 145c67c1b..66de263cc 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:pegmatite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_furnace.json index 69a371636..061342200 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/pegmatite/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/pegmatite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab.json index 4b9fbd252..2636188f3 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_polishing.json index 11c8c4b4b..47cfe8b4a 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:pegmatite_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_recombination.json index bd73a980d..39e44bd1a 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_brick_slab" - }, - { - "item": "mineralogy:pegmatite_brick_slab" - } - ], - "result": { - "item": "mineralogy:pegmatite_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick_slab" + }, + { + "item": "mineralogy:pegmatite_brick_slab" + } + ], + "result": { + "item": "mineralogy:pegmatite_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs.json index b23441960..6fe25be37 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/pegmatite/brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs_polishing.json index be078c913..d1c04d873 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:pegmatite_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall.json index bd05bf3f3..4f48e7878 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/pegmatite/brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall_polishing.json index 6df44e291..39699e075 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:pegmatite_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/pegmatite_cobblestone.json index 3bf8cb33f..77a1ec268 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/pegmatite" - }, - { - "tag": "mineralogy:stones/pegmatite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/pegmatite" + }, + { + "tag": "mineralogy:stones/pegmatite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json b/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json index 6cae29c8d..0c1780dfe 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/pegmatite" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:pegmatite_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/pegmatite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:pegmatite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_brick_slab_recombination.json index cd0dba4de..d4ba86311 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_smooth_brick_slab" - }, - { - "item": "mineralogy:pegmatite_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:pegmatite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_smooth_brick_slab" + }, + { + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slab_recombination.json index f60fdf06e..a940969df 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_smooth_slab" - }, - { - "item": "mineralogy:pegmatite_smooth_slab" - } - ], - "result": { - "item": "mineralogy:pegmatite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "item": "mineralogy:pegmatite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slabs_to_brick.json index 1655a9123..b1fe90e3e 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth_slab" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_stairs_to_brick.json index 9bd261079..cde3fecee 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_walls_to_brick.json index 4d7e68fb3..41f26f74c 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth_wall" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_polishing.json index f859d7e9b..343766bfd 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:pegmatite_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_recombination.json index 352bb3402..36d0d3133 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_slab" - }, - { - "item": "mineralogy:pegmatite_slab" - } - ], - "result": { - "item": "mineralogy:pegmatite", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_slab" + }, + { + "item": "mineralogy:pegmatite_slab" + } + ], + "result": { + "item": "mineralogy:pegmatite", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slabs_to_brick.json index 1243d2acf..46e06c578 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_slab" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_slab" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_polishing.json index 645734747..adc9d51e9 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:pegmatite_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_to_brick.json index 36d23fac8..d23153915 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_stairs" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_stairs" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_wall_polishing.json index f59ff1905..3314e4d3c 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:pegmatite_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_walls_to_brick.json index 3282211d8..dcc49a9d2 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_wall" - } - }, - "result": { - "item": "mineralogy:pegmatite_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_wall" + } + }, + "result": { + "item": "mineralogy:pegmatite_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_axe.json index 5cd4906e3..2020c49df 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:pegmatite_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:pegmatite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_blank.json index f43dd423f..404aa78fd 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_cross.json index 3f50b2d4b..e4bb4b025 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hammer.json index b7e8cefb9..967e4e643 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hoe.json index 9cb93d1b1..572d850cc 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:pegmatite_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:pegmatite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_horizontal.json index f67af22d5..f8d71228f 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_i.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_i.json index cff042172..d2b6bac83 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_left.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_left.json index 6affaaa17..7d75355d2 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_pickaxe.json index ea31e0d16..5025576c2 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:pegmatite_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:pegmatite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_plus.json index 29419fe54..718d3edcf 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_right.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_right.json index 13d4c1644..98ca59f8f 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_relief_left" - }, - { - "item": "mineralogy:pegmatite_relief_left" - } - ], - "result": { - "item": "mineralogy:pegmatite_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_left" + }, + { + "item": "mineralogy:pegmatite_relief_left" + } + ], + "result": { + "item": "mineralogy:pegmatite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_sword.json index c80a9439b..2249b99aa 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "mineralogy:pegmatite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:pegmatite_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "mineralogy:pegmatite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:pegmatite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_vertical.json index 4d9f70604..0001d529a 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_blank" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_relief_blank" + } + }, + "result": { + "item": "mineralogy:pegmatite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json b/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json index 33b4276a2..22fd121ad 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite" + } + }, + "result": { + "item": "mineralogy:pegmatite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json index 178032c8a..8d8ad449e 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/pegmatite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:pegmatite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/pegmatite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:pegmatite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick.json index 5bf17b549..e78453ed4 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/pegmatite/smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_furnace.json index 8fb322d7a..9255dd16b 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/pegmatite/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/pegmatite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_slab.json index ee414e382..958619679 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_stairs.json index b8a18498d..81178a6ab 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/pegmatite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_wall.json index 99e8a7dde..3bcb15218 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/pegmatite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_furnace.json index ac35291a6..41aef14bb 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/pegmatite/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/pegmatite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_slab.json index 342db82d0..245c19d58 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:pegmatite_smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_stairs.json index 7dddf1f7d..88e487bd0 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/pegmatite/smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_wall.json index edff75596..6b6cb1859 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/pegmatite/smooth" - } - }, - "result": { - "item": "mineralogy:pegmatite_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite/smooth" + } + }, + "result": { + "item": "mineralogy:pegmatite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json b/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json index ed97b6ce5..6b750b565 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite" + } + }, + "result": { + "item": "mineralogy:pegmatite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json b/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json index 0439595f0..0fe71f344 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:pegmatite_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/pegmatite" + } + }, + "result": { + "item": "mineralogy:pegmatite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick.json index f4292382e..762e63fab 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite" + } + }, + "result": { + "item": "mineralogy:peridotite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_block_polishing.json index d0d0eec5e..c0e919f2e 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:peridotite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_furnace.json index e8a51d7cc..d9dad9f1c 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/peridotite/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/peridotite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab.json index 7c695b5cc..6a2bc334e 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_brick" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_polishing.json index 502a66d02..27d157b14 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:peridotite_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_recombination.json index 0fceecc5f..5de82722c 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_brick_slab" - }, - { - "item": "mineralogy:peridotite_brick_slab" - } - ], - "result": { - "item": "mineralogy:peridotite_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick_slab" + }, + { + "item": "mineralogy:peridotite_brick_slab" + } + ], + "result": { + "item": "mineralogy:peridotite_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs.json index 2070ce999..650b61b6c 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/peridotite/brick" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/brick" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs_polishing.json index cf0beeeae..1e4514fcc 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:peridotite_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall.json index 0091e94d7..509285998 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/peridotite/brick" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/brick" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall_polishing.json index 472f689a6..52747be2c 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:peridotite_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/peridotite_cobblestone.json index aee131493..7d9235362 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/peridotite" - }, - { - "tag": "mineralogy:stones/peridotite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/peridotite" + }, + { + "tag": "mineralogy:stones/peridotite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json b/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json index b9833b595..3ee6fd973 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/peridotite" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:peridotite_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/peridotite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:peridotite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_brick_slab_recombination.json index e0d054d38..36b4e42b8 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_smooth_brick_slab" - }, - { - "item": "mineralogy:peridotite_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:peridotite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_smooth_brick_slab" + }, + { + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_slab_recombination.json index c14f9c23d..1b2ab034b 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_smooth_slab" - }, - { - "item": "mineralogy:peridotite_smooth_slab" - } - ], - "result": { - "item": "mineralogy:peridotite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "item": "mineralogy:peridotite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_slabs_to_brick.json index 016ff9bdf..02b3501e5 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth_slab" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_stairs_to_brick.json index 5664ec164..5c886fadc 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_polished_walls_to_brick.json index dbcb6b093..cc5c0a396 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth_wall" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_polishing.json index d34646361..7b02a049d 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:peridotite_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_recombination.json index 9149d6bca..67f0a111b 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_slab" - }, - { - "item": "mineralogy:peridotite_slab" - } - ], - "result": { - "item": "mineralogy:peridotite", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_slab" + }, + { + "item": "mineralogy:peridotite_slab" + } + ], + "result": { + "item": "mineralogy:peridotite", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slabs_to_brick.json index bfab900e5..2420eaf70 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_slab" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_slab" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_polishing.json index a64d71581..7201d0006 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:peridotite_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_to_brick.json index af6a11b46..c98c47bd7 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_stairs" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_stairs" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_wall_polishing.json index 272551f5e..2b5cf1997 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:peridotite_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_raw_walls_to_brick.json index 42e584607..12704ace6 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_wall" - } - }, - "result": { - "item": "mineralogy:peridotite_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_wall" + } + }, + "result": { + "item": "mineralogy:peridotite_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_axe.json index 266019221..5acc10200 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:peridotite_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:peridotite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_blank.json index ec9784a6b..b6af4a866 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_cross.json index c7a8d7f6e..d5774f6fc 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_hammer.json index 9ff5008ed..7205fa4fc 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_hoe.json index f357407ee..26e25eecf 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:peridotite_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:peridotite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_horizontal.json index 474db4cc6..50283598e 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_i.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_i.json index dc65c1856..60fbd5914 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_left.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_left.json index 95faea809..131ba06c6 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_pickaxe.json index 14b7a567c..a658d0084 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:peridotite_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:peridotite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_plus.json index d91ed9c56..97cc0cefb 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_right.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_right.json index 961c67612..0d1e881a9 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_relief_left" - }, - { - "item": "mineralogy:peridotite_relief_left" - } - ], - "result": { - "item": "mineralogy:peridotite_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_left" + }, + { + "item": "mineralogy:peridotite_relief_left" + } + ], + "result": { + "item": "mineralogy:peridotite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_sword.json index 9da5bbd4e..648d1e8c8 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "mineralogy:peridotite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:peridotite_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "mineralogy:peridotite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:peridotite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/peridotite_relief_vertical.json index c1cab26e9..a5868d89e 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_blank" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_relief_blank" + } + }, + "result": { + "item": "mineralogy:peridotite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_slab.json b/src/main/resources/data/mineralogy/recipes/peridotite_slab.json index 3a6e906ea..4fb6b92b7 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite" + } + }, + "result": { + "item": "mineralogy:peridotite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json index 813f54d41..bbb861772 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/peridotite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:peridotite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/peridotite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:peridotite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick.json index 28c5cabc4..341608027 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/peridotite/smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_furnace.json index d8fa405b8..ef015aba0 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/peridotite/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/peridotite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_slab.json index 1058a5718..8ffdc0497 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_stairs.json index 125f4e790..dd4590cd9 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/peridotite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_wall.json index e78eb105e..522a56d49 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/peridotite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_furnace.json index 15d785e3a..34dfc218c 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/peridotite/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/peridotite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_slab.json index 93594bf2a..aac944a6c 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite_smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:peridotite_smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_stairs.json index 8bb2d1b6c..5f77a1e53 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/peridotite/smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_wall.json index 6f5fd17d9..30d8b97a1 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/peridotite/smooth" - } - }, - "result": { - "item": "mineralogy:peridotite_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite/smooth" + } + }, + "result": { + "item": "mineralogy:peridotite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json b/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json index d785eefb8..13d92d8f3 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite" + } + }, + "result": { + "item": "mineralogy:peridotite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_wall.json b/src/main/resources/data/mineralogy/recipes/peridotite_wall.json index a713e3d42..5c16d1139 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:peridotite_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/peridotite" + } + }, + "result": { + "item": "mineralogy:peridotite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phosphorous_block.json b/src/main/resources/data/mineralogy/recipes/phosphorous_block.json index 11a910cd5..f5a0a15ac 100644 --- a/src/main/resources/data/mineralogy/recipes/phosphorous_block.json +++ b/src/main/resources/data/mineralogy/recipes/phosphorous_block.json @@ -1,27 +1,27 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phosphorous_block" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phosphorous_dust" - } - }, - "result": { - "item": "mineralogy:phosphorous_block", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_block" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phosphorous_dust" + } + }, + "result": { + "item": "mineralogy:phosphorous_block", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json b/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json index ca2ad9d1a..a24fe4a77 100644 --- a/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json +++ b/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phosphorous_dust" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/phosphorous" - } - ], - "result": { - "item": "mineralogy:phosphorous_dust", - "count": 9 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phosphorous_dust" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/phosphorous" + } + ], + "result": { + "item": "mineralogy:phosphorous_dust", + "count": 9 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick.json index 1366755d1..8cde90e8f 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite" + } + }, + "result": { + "item": "mineralogy:phyllite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_block_polishing.json index b63bf5fb7..6362b9add 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:phyllite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_furnace.json index 51213d8e1..735385973 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/phyllite/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/phyllite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab.json index 339ed5891..d6463f2a5 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_brick" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_polishing.json index 905fa47a5..bb240aef9 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:phyllite_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_recombination.json index 4e32daad0..c78b2e2e1 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_brick_slab" - }, - { - "item": "mineralogy:phyllite_brick_slab" - } - ], - "result": { - "item": "mineralogy:phyllite_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick_slab" + }, + { + "item": "mineralogy:phyllite_brick_slab" + } + ], + "result": { + "item": "mineralogy:phyllite_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs.json index 368dfdf17..440474ddf 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/phyllite/brick" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/brick" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs_polishing.json index 12e8b4b4c..95bec7b7c 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:phyllite_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall.json index 60fe51ecf..301ed982a 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/phyllite/brick" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/brick" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall_polishing.json index 9f18172ae..4f7e9ac9d 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:phyllite_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/phyllite_cobblestone.json index a76039d7d..a0a5cdc5d 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/phyllite" - }, - { - "tag": "mineralogy:stones/phyllite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/phyllite" + }, + { + "tag": "mineralogy:stones/phyllite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json b/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json index 084dd53e0..19c4dc5dd 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/phyllite" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:phyllite_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/phyllite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:phyllite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_brick_slab_recombination.json index 2a7b898ac..413330f19 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_smooth_brick_slab" - }, - { - "item": "mineralogy:phyllite_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:phyllite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_smooth_brick_slab" + }, + { + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_slab_recombination.json index 2d7eb3f23..81439fb14 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_smooth_slab" - }, - { - "item": "mineralogy:phyllite_smooth_slab" - } - ], - "result": { - "item": "mineralogy:phyllite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "item": "mineralogy:phyllite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_slabs_to_brick.json index de6725d50..f75e9e237 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth_slab" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_stairs_to_brick.json index 592918e9b..fd1316b60 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_polished_walls_to_brick.json index b64a565a2..fd1ef3515 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth_wall" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_polishing.json index ee0f2460b..850b8ac45 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:phyllite_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_recombination.json index ff74ea325..94dea2652 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_slab" - }, - { - "item": "mineralogy:phyllite_slab" - } - ], - "result": { - "item": "mineralogy:phyllite", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_slab" + }, + { + "item": "mineralogy:phyllite_slab" + } + ], + "result": { + "item": "mineralogy:phyllite", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slabs_to_brick.json index 8ed80829e..ee3f409ba 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_slab" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_slab" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_polishing.json index e2ca9fed8..d3f283745 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:phyllite_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_to_brick.json index 35a834f78..7e67846bd 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_stairs" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_stairs" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_wall_polishing.json index 1585f03bd..e1bcf09d5 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:phyllite_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_raw_walls_to_brick.json index 4af6a76f7..8c201e293 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_wall" - } - }, - "result": { - "item": "mineralogy:phyllite_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_wall" + } + }, + "result": { + "item": "mineralogy:phyllite_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_axe.json index f1ccb8dc1..b1a2e2bd0 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:phyllite_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:phyllite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_blank.json index 3a0646940..a6214c023 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_cross.json index 9243dd686..cd7c65242 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_hammer.json index bdc8f3f6d..c6f95e421 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_hoe.json index d0e06b689..3174799b0 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:phyllite_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:phyllite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_horizontal.json index 6ca55eaa8..c993ae66a 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_i.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_i.json index 1cee5a16f..e542e6cad 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_left.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_left.json index 0651625ef..2c8aabba2 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_pickaxe.json index 5c72f2b48..b59dfd460 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:phyllite_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:phyllite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_plus.json index c4f1d3d35..347a951b7 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_right.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_right.json index dee5b3860..ec429f83e 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_relief_left" - }, - { - "item": "mineralogy:phyllite_relief_left" - } - ], - "result": { - "item": "mineralogy:phyllite_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_left" + }, + { + "item": "mineralogy:phyllite_relief_left" + } + ], + "result": { + "item": "mineralogy:phyllite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_sword.json index 9c2e2b44a..b96c614c2 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "mineralogy:phyllite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:phyllite_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "mineralogy:phyllite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:phyllite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/phyllite_relief_vertical.json index 46f6bbdcd..6bf3aa063 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_blank" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_relief_blank" + } + }, + "result": { + "item": "mineralogy:phyllite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_slab.json b/src/main/resources/data/mineralogy/recipes/phyllite_slab.json index 6602ce093..2d8086d9f 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite" + } + }, + "result": { + "item": "mineralogy:phyllite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json index b39bb2e35..ad750a9f7 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/phyllite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:phyllite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/phyllite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:phyllite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick.json index 0160af8f8..b63145c51 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/phyllite/smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_furnace.json index f5f33c409..4f4e20be0 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/phyllite/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/phyllite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_slab.json index c66c840bf..48f772b07 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_stairs.json index cd2eb2eb2..5fbf7a716 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/phyllite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_wall.json index d47389766..3d96a164c 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/phyllite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_furnace.json index fd5543771..832a404e9 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/phyllite/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/phyllite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_slab.json index b5d5d106f..4dd48a01c 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite_smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:phyllite_smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_stairs.json index df2be36a2..a243eb250 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/phyllite/smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_wall.json index 3b9ecc7b8..b6673039f 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/phyllite/smooth" - } - }, - "result": { - "item": "mineralogy:phyllite_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite/smooth" + } + }, + "result": { + "item": "mineralogy:phyllite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json b/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json index 335a21ec4..3c6089f70 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite" + } + }, + "result": { + "item": "mineralogy:phyllite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_wall.json b/src/main/resources/data/mineralogy/recipes/phyllite_wall.json index 0e9062186..3b96dff85 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:phyllite_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/phyllite" + } + }, + "result": { + "item": "mineralogy:phyllite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick.json index ba748ecd3..c16f054b0 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite" + } + }, + "result": { + "item": "mineralogy:quartzite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_block_polishing.json index dce62a83e..be2f1ceaf 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:quartzite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_furnace.json index 0bbed3c2e..fd27d1d68 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/quartzite/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/quartzite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab.json index 29a9eda81..bb40073f4 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_brick" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_polishing.json index caa10ecb4..0dd4d96d4 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:quartzite_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_recombination.json index 4660b18f4..687018811 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_brick_slab" - }, - { - "item": "mineralogy:quartzite_brick_slab" - } - ], - "result": { - "item": "mineralogy:quartzite_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick_slab" + }, + { + "item": "mineralogy:quartzite_brick_slab" + } + ], + "result": { + "item": "mineralogy:quartzite_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs.json index b2f4f29cc..2b7c70457 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/quartzite/brick" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/brick" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs_polishing.json index 1df8cca58..4217ccc4f 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:quartzite_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall.json index 52cab82f3..06d8bd760 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/quartzite/brick" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/brick" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall_polishing.json index 559564a2f..3ced117fb 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:quartzite_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/quartzite_cobblestone.json index 3c46e4b72..d9bc16ae0 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/quartzite" - }, - { - "tag": "mineralogy:stones/quartzite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/quartzite" + }, + { + "tag": "mineralogy:stones/quartzite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json b/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json index 125fc5d62..3bcd85ee9 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/quartzite" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:quartzite_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/quartzite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:quartzite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_brick_slab_recombination.json index 44347ac27..688ac8628 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_smooth_brick_slab" - }, - { - "item": "mineralogy:quartzite_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:quartzite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_smooth_brick_slab" + }, + { + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_slab_recombination.json index 82a66b192..2e878923d 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_smooth_slab" - }, - { - "item": "mineralogy:quartzite_smooth_slab" - } - ], - "result": { - "item": "mineralogy:quartzite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "item": "mineralogy:quartzite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_slabs_to_brick.json index 59e5f36df..97765627e 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth_slab" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_stairs_to_brick.json index bb8e23534..5dbc17ede 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_polished_walls_to_brick.json index e7c0e2f22..a52b08ab6 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth_wall" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_polishing.json index 37cdc6e0f..3c6807375 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:quartzite_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_recombination.json index c388ded48..6f36584e0 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_slab" - }, - { - "item": "mineralogy:quartzite_slab" - } - ], - "result": { - "item": "mineralogy:quartzite", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_slab" + }, + { + "item": "mineralogy:quartzite_slab" + } + ], + "result": { + "item": "mineralogy:quartzite", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slabs_to_brick.json index 318196f51..4145302e2 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_slab" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_slab" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_polishing.json index 44ed038af..e797389f9 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:quartzite_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_to_brick.json index 3a2ce2c4d..0cbe1f8ae 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_stairs" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_stairs" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_wall_polishing.json index d30dc2ab1..551f58408 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:quartzite_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_raw_walls_to_brick.json index 3b0a96743..edb0ae0f7 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_wall" - } - }, - "result": { - "item": "mineralogy:quartzite_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_wall" + } + }, + "result": { + "item": "mineralogy:quartzite_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_axe.json index eca3c339b..b46b28548 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:quartzite_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:quartzite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_blank.json index 0c2d0f239..458800dad 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_cross.json index 41f244370..788af0c5c 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_hammer.json index 1822b2812..dd99ca6fe 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_hoe.json index 8eac2e2f0..c48d7555c 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:quartzite_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:quartzite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_horizontal.json index 3c284d923..31002bb71 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_i.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_i.json index 6403850a7..91b353561 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_left.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_left.json index f0d1d1cd6..8d3db257f 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_pickaxe.json index db3a4e068..c8540c543 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:quartzite_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:quartzite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_plus.json index 052965b84..a57fb11df 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_right.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_right.json index 9f3634197..777ae7393 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_relief_left" - }, - { - "item": "mineralogy:quartzite_relief_left" - } - ], - "result": { - "item": "mineralogy:quartzite_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_left" + }, + { + "item": "mineralogy:quartzite_relief_left" + } + ], + "result": { + "item": "mineralogy:quartzite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_sword.json index 7c861bbfe..4c6565041 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "mineralogy:quartzite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:quartzite_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "mineralogy:quartzite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:quartzite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/quartzite_relief_vertical.json index ab95424c9..cffadc5cb 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_blank" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_relief_blank" + } + }, + "result": { + "item": "mineralogy:quartzite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_slab.json b/src/main/resources/data/mineralogy/recipes/quartzite_slab.json index 87b22089c..7014ce23e 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite" + } + }, + "result": { + "item": "mineralogy:quartzite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json index 219601757..1daaa6690 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/quartzite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:quartzite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/quartzite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:quartzite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick.json index 0cfaf6c80..b77274bf7 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/quartzite/smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_furnace.json index da67dabf0..0fdc35ebc 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/quartzite/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/quartzite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_slab.json index 4910c71ba..b27d018f5 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_stairs.json index fa7cdb34b..192c63327 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/quartzite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_wall.json index 55fe8d9f8..f243c02a3 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/quartzite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_furnace.json index b758875ba..5b876940f 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/quartzite/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/quartzite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_slab.json index 5f852c1d0..31abc3f32 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite_smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:quartzite_smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_stairs.json index 1f55a0f51..ca86bddd5 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/quartzite/smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_wall.json index 21418ef95..f38a422d4 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/quartzite/smooth" - } - }, - "result": { - "item": "mineralogy:quartzite_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite/smooth" + } + }, + "result": { + "item": "mineralogy:quartzite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json b/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json index 7703c80a4..61a0ddad2 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite" + } + }, + "result": { + "item": "mineralogy:quartzite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_wall.json b/src/main/resources/data/mineralogy/recipes/quartzite_wall.json index c94c15eb9..9f3c061b6 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:quartzite_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/quartzite" + } + }, + "result": { + "item": "mineralogy:quartzite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json index 61e53796a..cd57cd10d 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_block_polishing.json index 9ed9a4d18..0f28df821 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:rhyolite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_furnace.json index 9a1bbe0db..0d45d83c5 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/rhyolite/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rhyolite/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab.json index 17d62f982..62d875a65 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_polishing.json index 39586eda0..1f8f35384 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:rhyolite_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_recombination.json index a984f7ee0..d467db70f 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_brick_slab" - }, - { - "item": "mineralogy:rhyolite_brick_slab" - } - ], - "result": { - "item": "mineralogy:rhyolite_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick_slab" + }, + { + "item": "mineralogy:rhyolite_brick_slab" + } + ], + "result": { + "item": "mineralogy:rhyolite_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs.json index 209d9eed9..fc58b3042 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rhyolite/brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs_polishing.json index 2ca24b1cf..6dbcdedcf 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:rhyolite_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall.json index 1d032d1a3..d56d02675 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rhyolite/brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall_polishing.json index d2effdce8..bea252510 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:rhyolite_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_cobblestone.json b/src/main/resources/data/mineralogy/recipes/rhyolite_cobblestone.json index 220b8579e..653c137a7 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/rhyolite" - }, - { - "tag": "mineralogy:stones/rhyolite" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/rhyolite" + }, + { + "tag": "mineralogy:stones/rhyolite" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json b/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json index c4554d33f..b3c85dc8b 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/rhyolite" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rhyolite_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rhyolite" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rhyolite_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_brick_slab_recombination.json index 5e04d5557..f7726df1b 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_smooth_brick_slab" - }, - { - "item": "mineralogy:rhyolite_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:rhyolite_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_smooth_brick_slab" + }, + { + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slab_recombination.json index 6f8b89b44..787728ea2 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_smooth_slab" - }, - { - "item": "mineralogy:rhyolite_smooth_slab" - } - ], - "result": { - "item": "mineralogy:rhyolite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "item": "mineralogy:rhyolite_smooth_slab" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slabs_to_brick.json index 66769ba36..304a10120 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth_slab" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth_slab" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_stairs_to_brick.json index b77c4d61f..885cca5e0 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_walls_to_brick.json index 0388c593f..06712dcfd 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth_wall" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth_wall" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_polishing.json index 4dc0441a2..4140bf23f 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:rhyolite_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_recombination.json index e3044fa0d..69f1bb1b2 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_slab" - }, - { - "item": "mineralogy:rhyolite_slab" - } - ], - "result": { - "item": "mineralogy:rhyolite", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_slab" + }, + { + "item": "mineralogy:rhyolite_slab" + } + ], + "result": { + "item": "mineralogy:rhyolite", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slabs_to_brick.json index 372fac0e8..7231e5db9 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_slab" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_slab" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_polishing.json index 6774976ea..32ec96346 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:rhyolite_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_to_brick.json index d115e9197..d24d45da4 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_stairs" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_stairs" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_wall_polishing.json index 71942da18..d1f3fd1a6 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:rhyolite_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_walls_to_brick.json index bb2a840fe..d4d343ba1 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_wall" - } - }, - "result": { - "item": "mineralogy:rhyolite_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_wall" + } + }, + "result": { + "item": "mineralogy:rhyolite_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_axe.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_axe.json index 19179e11b..41eae33db 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:rhyolite_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:rhyolite_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_blank.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_blank.json index 17c4582a7..441cefca0 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_cross.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_cross.json index 005b4b276..59e19a619 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hammer.json index 2f40e36b4..ba00ebf57 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hoe.json index fa8fe35ed..d2333bf8d 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:rhyolite_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:rhyolite_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_horizontal.json index 92382e245..e22aa8319 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_i.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_i.json index 0604cb42c..50e1a174e 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_left.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_left.json index 68547366b..285ee5b35 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_pickaxe.json index dc39e32ca..4faa5a864 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:rhyolite_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:rhyolite_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_plus.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_plus.json index fd29e41d0..49381b9c9 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_right.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_right.json index c18ee6d81..0a5e32204 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_relief_left" - }, - { - "item": "mineralogy:rhyolite_relief_left" - } - ], - "result": { - "item": "mineralogy:rhyolite_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_left" + }, + { + "item": "mineralogy:rhyolite_relief_left" + } + ], + "result": { + "item": "mineralogy:rhyolite_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_sword.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_sword.json index 6b597cd4f..6c6e5d18c 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "mineralogy:rhyolite_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:rhyolite_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "mineralogy:rhyolite_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:rhyolite_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_vertical.json index 74f85e2c0..9cebdc951 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_blank" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_relief_blank" + } + }, + "result": { + "item": "mineralogy:rhyolite_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json b/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json index c7132fd9e..583f63f1d 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite" + } + }, + "result": { + "item": "mineralogy:rhyolite_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json index 8c611b1d2..f5c29ca51 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/rhyolite" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:rhyolite_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/rhyolite" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:rhyolite_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick.json index bb58f652b..793d5aae4 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rhyolite/smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_furnace.json index 808400f4c..6f24e18a0 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/rhyolite/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rhyolite/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_slab.json index 5da8456a4..afe5788c9 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth_brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_stairs.json index e09a11c80..556a4e84a 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rhyolite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_wall.json index 35a9ceeab..2619d722c 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rhyolite/smooth_brick" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth_brick" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_furnace.json index feade1781..f0dd40901 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/rhyolite/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rhyolite/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_slab.json index 76aa8b7c7..af0bd5263 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rhyolite_smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_stairs.json index eb75f55f8..ebe4285b1 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rhyolite/smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_wall.json index 331be81b3..d42973050 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rhyolite/smooth" - } - }, - "result": { - "item": "mineralogy:rhyolite_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite/smooth" + } + }, + "result": { + "item": "mineralogy:rhyolite_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json b/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json index c2812d03a..2a5ca9c32 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite" + } + }, + "result": { + "item": "mineralogy:rhyolite_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json b/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json index 056bc8445..e46251e6d 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rhyolite_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rhyolite" + } + }, + "result": { + "item": "mineralogy:rhyolite_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt.json b/src/main/resources/data/mineralogy/recipes/rock_salt.json index b22dfdd8b..a6f18282e 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "forge:dusts/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "forge:dusts/rock_salt" + } + }, + "result": { + "item": "mineralogy:rock_salt", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick.json index b3b627655..f335a6177 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_block_polishing.json index b62687fcc..459f75cf0 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:rock_salt_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_furnace.json index e1900ef3e..76be26086 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/rock_salt/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rock_salt/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab.json index 904b02b49..9948de629 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_polishing.json index ac588fa27..a02963f20 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:rock_salt_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_recombination.json index 6f8348912..38bd2d579 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_brick_slab" - }, - { - "item": "mineralogy:rock_salt_brick_slab" - } - ], - "result": { - "item": "mineralogy:rock_salt_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick_slab" + }, + { + "item": "mineralogy:rock_salt_brick_slab" + } + ], + "result": { + "item": "mineralogy:rock_salt_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs.json index 07e6da9b5..917d13376 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rock_salt/brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs_polishing.json index f25f8f8f1..7bbcf337c 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:rock_salt_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall.json index 299a47a5c..e0a9e2c90 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rock_salt/brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall_polishing.json index 2f172462c..4ff39b8b5 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:rock_salt_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_cobblestone.json b/src/main/resources/data/mineralogy/recipes/rock_salt_cobblestone.json index b8ced0161..9045b42c6 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/rock_salt" - }, - { - "tag": "mineralogy:stones/rock_salt" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/rock_salt" + }, + { + "tag": "mineralogy:stones/rock_salt" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_dust.json b/src/main/resources/data/mineralogy/recipes/rock_salt_dust.json index d89728621..a7c5ecd1f 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_dust.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_dust.json @@ -1,18 +1,18 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_dust" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/rock_salt" - } - ], - "result": { - "item": "mineralogy:rock_salt_dust", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_dust" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/rock_salt" + } + ], + "result": { + "item": "mineralogy:rock_salt_dust", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_furnace.json b/src/main/resources/data/mineralogy/recipes/rock_salt_furnace.json index 9840bb0b8..40948ec71 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/rock_salt" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rock_salt_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rock_salt" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rock_salt_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_brick_slab_recombination.json index 1521e6f9c..0601b44de 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_smooth_brick_slab" - }, - { - "item": "mineralogy:rock_salt_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:rock_salt_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_smooth_brick_slab" + }, + { + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slab_recombination.json index 74e690adf..34c6ff413 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_smooth_slab" - }, - { - "item": "mineralogy:rock_salt_smooth_slab" - } - ], - "result": { - "item": "mineralogy:rock_salt_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "item": "mineralogy:rock_salt_smooth_slab" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slabs_to_brick.json index b47446f2d..99229693c 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth_slab" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth_slab" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_stairs_to_brick.json index b046e764c..ec751461d 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_walls_to_brick.json index 81d569b69..209f55a97 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth_wall" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth_wall" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_polishing.json index 7b6a1c32e..a9e65443f 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:rock_salt_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_recombination.json index 0c720c86a..935b6ce63 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_slab" - }, - { - "item": "mineralogy:rock_salt_slab" - } - ], - "result": { - "item": "mineralogy:rock_salt", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_slab" + }, + { + "item": "mineralogy:rock_salt_slab" + } + ], + "result": { + "item": "mineralogy:rock_salt", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slabs_to_brick.json index d6d10173a..17ba95598 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_slab" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_slab" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_polishing.json index 4489e6850..15536ce7d 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:rock_salt_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_to_brick.json index 0aa1afa2d..3e992cb50 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_stairs" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_stairs" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_wall_polishing.json index ace497df5..d8037f405 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:rock_salt_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_walls_to_brick.json index 0d710fb0f..5d419a11f 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_wall" - } - }, - "result": { - "item": "mineralogy:rock_salt_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_wall" + } + }, + "result": { + "item": "mineralogy:rock_salt_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_axe.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_axe.json index 94779cc68..fca0a3020 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:rock_salt_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:rock_salt_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_blank.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_blank.json index 4f5da6560..56722fb04 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_cross.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_cross.json index d60d3344e..35e861779 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hammer.json index edfd9636d..064a7f373 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hoe.json index 3adeec053..09b744d43 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:rock_salt_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:rock_salt_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_horizontal.json index e306daa86..4bd8daf24 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_i.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_i.json index 5414a544d..0c22fafca 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_left.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_left.json index 056c6f3fe..5a507c1a4 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_pickaxe.json index 2eca858a6..2a230ee0f 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:rock_salt_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:rock_salt_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_plus.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_plus.json index bb7378df9..f89898e32 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_right.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_right.json index d9b1d02d0..8af06375d 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_relief_left" - }, - { - "item": "mineralogy:rock_salt_relief_left" - } - ], - "result": { - "item": "mineralogy:rock_salt_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_left" + }, + { + "item": "mineralogy:rock_salt_relief_left" + } + ], + "result": { + "item": "mineralogy:rock_salt_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_sword.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_sword.json index 63e41327f..bed77a197 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "mineralogy:rock_salt_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:rock_salt_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "mineralogy:rock_salt_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:rock_salt_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_vertical.json index f1a6b7e9a..2879cab0e 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_relief_blank" - } - }, - "result": { - "item": "mineralogy:rock_salt_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_relief_blank" + } + }, + "result": { + "item": "mineralogy:rock_salt_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_slab.json b/src/main/resources/data/mineralogy/recipes/rock_salt_slab.json index 6d9aa2009..01ee84ab9 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt" + } + }, + "result": { + "item": "mineralogy:rock_salt_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth.json index 7c224152c..72c8fe40e 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/rock_salt" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:rock_salt_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/rock_salt" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:rock_salt_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick.json index 04175b6e4..c949cf036 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rock_salt/smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_furnace.json index 4d1cd95a7..05179faa4 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/rock_salt/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rock_salt/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_slab.json index 50c01e847..6545ab1ff 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth_brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_stairs.json index 8333db944..d9255b432 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rock_salt/smooth_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth_brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_wall.json index 20bb43335..6af2a8571 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rock_salt/smooth_brick" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth_brick" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_furnace.json index be9683766..0c6979555 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/rock_salt/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/rock_salt/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_slab.json index a556887f1..e3829748d 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt_smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:rock_salt_smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_stairs.json index aea7fbce9..e6f3e17ef 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rock_salt/smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_wall.json index 90f341cb6..2f39acec3 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rock_salt/smooth" - } - }, - "result": { - "item": "mineralogy:rock_salt_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt/smooth" + } + }, + "result": { + "item": "mineralogy:rock_salt_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_stairs.json b/src/main/resources/data/mineralogy/recipes/rock_salt_stairs.json index ad4e92704..472e4e654 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt" + } + }, + "result": { + "item": "mineralogy:rock_salt_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt_wall.json b/src/main/resources/data/mineralogy/recipes/rock_salt_wall.json index b335dc8b8..7d6bf3b82 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:rock_salt_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/rock_salt" + } + }, + "result": { + "item": "mineralogy:rock_salt_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json b/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json index ebec1319b..4fd7b2134 100644 --- a/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json +++ b/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json @@ -1,28 +1,28 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_ROCK_SALT_LAMPS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rocksaltlamp" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:rock_salt" - }, - { - "item": "minecraft:torch" - }, - { - "item": "minecraft:iron_ingot" - } - ], - "result": { - "item": "mineralogy:rocksaltlamp", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltlamp" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt" + }, + { + "item": "minecraft:torch" + }, + { + "item": "minecraft:iron_ingot" + } + ], + "result": { + "item": "mineralogy:rocksaltlamp", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json b/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json index 1d073aee8..4ddf6d1eb 100644 --- a/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json +++ b/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json @@ -1,30 +1,30 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_ROCK_SALT_LAMPS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:rocksaltstreetlamp" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "y", - "y" - ], - "key": { - "x": { - "tag": "forge:lamps/rock_salt" - }, - "y": { - "item": "minecraft:iron_ingot" - } - }, - "result": { - "item": "mineralogy:rocksaltstreetlamp", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_ROCK_SALT_LAMPS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:rocksaltstreetlamp" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "y", + "y" + ], + "key": { + "x": { + "tag": "forge:lamps/rock_salt" + }, + "y": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "item": "mineralogy:rocksaltstreetlamp", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick.json b/src/main/resources/data/mineralogy/recipes/schist_brick.json index 700f53842..076bc08c6 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/schist" - } - }, - "result": { - "item": "mineralogy:schist_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist" + } + }, + "result": { + "item": "mineralogy:schist_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_brick_block_polishing.json index 3a6c2bb72..14dc140c6 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:schist_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/schist_brick_furnace.json index 9dec4c4cf..1bb8f2633 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/schist/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:schist_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/schist/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:schist_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_slab.json b/src/main/resources/data/mineralogy/recipes/schist_brick_slab.json index 32b2c30a1..c0ed9122f 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_brick" - } - }, - "result": { - "item": "mineralogy:schist_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_brick" + } + }, + "result": { + "item": "mineralogy:schist_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_brick_slab_polishing.json index 3dca3d466..8dccd84b8 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:schist_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/schist_brick_slab_recombination.json index f6b0fb921..af0b93999 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_brick_slab" - }, - { - "item": "mineralogy:schist_brick_slab" - } - ], - "result": { - "item": "mineralogy:schist_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick_slab" + }, + { + "item": "mineralogy:schist_brick_slab" + } + ], + "result": { + "item": "mineralogy:schist_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/schist_brick_stairs.json index b8f8e34c3..0c87f50f3 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/schist/brick" - } - }, - "result": { - "item": "mineralogy:schist_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/brick" + } + }, + "result": { + "item": "mineralogy:schist_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_brick_stairs_polishing.json index 5b1a6d006..d8ff76992 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:schist_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_wall.json b/src/main/resources/data/mineralogy/recipes/schist_brick_wall.json index 42b801b34..88c0b699e 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/schist/brick" - } - }, - "result": { - "item": "mineralogy:schist_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/brick" + } + }, + "result": { + "item": "mineralogy:schist_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_brick_wall_polishing.json index 26d6bcb7d..7115224fc 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:schist_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_cobblestone.json b/src/main/resources/data/mineralogy/recipes/schist_cobblestone.json index a21552d9f..8c95ebc3f 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/schist_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/schist" - }, - { - "tag": "mineralogy:stones/schist" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/schist" + }, + { + "tag": "mineralogy:stones/schist" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_furnace.json b/src/main/resources/data/mineralogy/recipes/schist_furnace.json index e1e3acd01..cdb6e6117 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/schist" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:schist_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/schist" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:schist_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/schist_polished_brick_slab_recombination.json index 17d769f67..5a08b9d2b 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_smooth_brick_slab" - }, - { - "item": "mineralogy:schist_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:schist_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_smooth_brick_slab" + }, + { + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:schist_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/schist_polished_slab_recombination.json index c196e4be1..f81102f04 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_smooth_slab" - }, - { - "item": "mineralogy:schist_smooth_slab" - } - ], - "result": { - "item": "mineralogy:schist_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_smooth_slab" + }, + { + "item": "mineralogy:schist_smooth_slab" + } + ], + "result": { + "item": "mineralogy:schist_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_polished_slabs_to_brick.json index f59a0b429..e22a7ab92 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth_slab" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth_slab" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_polished_stairs_to_brick.json index c058678e5..3c4dd95a8 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_polished_walls_to_brick.json index 044870d3e..693a03b95 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth_wall" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth_wall" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_raw_slab_polishing.json index dffe0aa33..94be9aea9 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:schist_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/schist_raw_slab_recombination.json index a4dd98d80..3f2bd9e52 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_slab" - }, - { - "item": "mineralogy:schist_slab" - } - ], - "result": { - "item": "mineralogy:schist", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_slab" + }, + { + "item": "mineralogy:schist_slab" + } + ], + "result": { + "item": "mineralogy:schist", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_raw_slabs_to_brick.json index 4c3c751a0..5bb2a27cb 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:schist_slab" - } - }, - "result": { - "item": "mineralogy:schist_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_slab" + } + }, + "result": { + "item": "mineralogy:schist_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_polishing.json index 3282dc9a7..6ab5a283c 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:schist_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_to_brick.json index defb71637..e7f9b5f37 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:schist_stairs" - } - }, - "result": { - "item": "mineralogy:schist_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_stairs" + } + }, + "result": { + "item": "mineralogy:schist_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/schist_raw_wall_polishing.json index 260352f79..f29dc2f62 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:schist_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/schist_raw_walls_to_brick.json index 6869da865..f4e8257a7 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:schist_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:schist_wall" - } - }, - "result": { - "item": "mineralogy:schist_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:schist_wall" + } + }, + "result": { + "item": "mineralogy:schist_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_axe.json b/src/main/resources/data/mineralogy/recipes/schist_relief_axe.json index b6d119f07..8c896c952 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:schist_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:schist_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_blank.json b/src/main/resources/data/mineralogy/recipes/schist_relief_blank.json index 68ff4e68d..a4a1053fb 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - } - }, - "result": { - "item": "mineralogy:schist_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth" + } + }, + "result": { + "item": "mineralogy:schist_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_cross.json b/src/main/resources/data/mineralogy/recipes/schist_relief_cross.json index 3932f6f92..079c7ea09 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/schist_relief_hammer.json index 94447f953..6ec33c943 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/schist_relief_hoe.json index 54e71839a..da8d29cf3 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:schist_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:schist_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/schist_relief_horizontal.json index 1721315e5..dbea4e106 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_i.json b/src/main/resources/data/mineralogy/recipes/schist_relief_i.json index 6df0a99b9..c3d7e8a02 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_left.json b/src/main/resources/data/mineralogy/recipes/schist_relief_left.json index 0338d059b..7ebc13697 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/schist_relief_pickaxe.json index 539ab900d..661368f00 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:schist_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:schist_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_plus.json b/src/main/resources/data/mineralogy/recipes/schist_relief_plus.json index 841e74ccd..cd1cfc190 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_right.json b/src/main/resources/data/mineralogy/recipes/schist_relief_right.json index 98b6c6ea3..baad551c2 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_relief_left" - }, - { - "item": "mineralogy:schist_relief_left" - } - ], - "result": { - "item": "mineralogy:schist_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_left" + }, + { + "item": "mineralogy:schist_relief_left" + } + ], + "result": { + "item": "mineralogy:schist_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_sword.json b/src/main/resources/data/mineralogy/recipes/schist_relief_sword.json index c07f68ccc..4e35759bc 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "mineralogy:schist_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:schist_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "mineralogy:schist_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:schist_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/schist_relief_vertical.json index 8b221ae1d..bb754263c 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/schist_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_blank" - } - }, - "result": { - "item": "mineralogy:schist_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:schist_relief_blank" + } + }, + "result": { + "item": "mineralogy:schist_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_slab.json b/src/main/resources/data/mineralogy/recipes/schist_slab.json index 4e3cb02b7..4b5c015a3 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist" - } - }, - "result": { - "item": "mineralogy:schist_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist" + } + }, + "result": { + "item": "mineralogy:schist_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth.json b/src/main/resources/data/mineralogy/recipes/schist_smooth.json index eb54c8a5b..d08668f7d 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/schist" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:schist_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/schist" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:schist_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick.json index d571aca72..df69d15c0 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/schist/smooth" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_furnace.json index 2410e89dd..29b355895 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/schist/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/schist/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_slab.json index 12683ff7f..83066bbd9 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth_brick" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth_brick" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_stairs.json index 741c2a1a8..6ba265efc 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/schist/smooth_brick" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth_brick" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_wall.json index e53b1bd68..7deee8619 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/schist/smooth_brick" - } - }, - "result": { - "item": "mineralogy:schist_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth_brick" + } + }, + "result": { + "item": "mineralogy:schist_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_furnace.json index 9bad865f9..27692547e 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/schist/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:schist_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/schist/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:schist_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_slab.json index 851b92142..4026ef141 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist_smooth" - } - }, - "result": { - "item": "mineralogy:schist_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:schist_smooth" + } + }, + "result": { + "item": "mineralogy:schist_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_stairs.json index eed2eb5f3..32e391e4c 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/schist/smooth" - } - }, - "result": { - "item": "mineralogy:schist_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth" + } + }, + "result": { + "item": "mineralogy:schist_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/schist_smooth_wall.json index 5cf84a98f..b1056b4b3 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/schist/smooth" - } - }, - "result": { - "item": "mineralogy:schist_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist/smooth" + } + }, + "result": { + "item": "mineralogy:schist_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_stairs.json b/src/main/resources/data/mineralogy/recipes/schist_stairs.json index e2bc4bba0..8db3b75a9 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/schist" - } - }, - "result": { - "item": "mineralogy:schist_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist" + } + }, + "result": { + "item": "mineralogy:schist_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_wall.json b/src/main/resources/data/mineralogy/recipes/schist_wall.json index 3868aa58f..33b2edc02 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:schist_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/schist" - } - }, - "result": { - "item": "mineralogy:schist_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/schist" + } + }, + "result": { + "item": "mineralogy:schist_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_brick.json index dcc2e1126..fafe32fce 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/scoria" - } - }, - "result": { - "item": "mineralogy:scoria_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria" + } + }, + "result": { + "item": "mineralogy:scoria_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_block_polishing.json index ebfc3a141..8c28d0a32 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:scoria_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_furnace.json index c1b5afaae..9a304a82b 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/scoria/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:scoria_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/scoria/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:scoria_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab.json index 1efee7db3..ffe988566 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_brick" - } - }, - "result": { - "item": "mineralogy:scoria_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_brick" + } + }, + "result": { + "item": "mineralogy:scoria_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_polishing.json index ce47c915d..ad30cb531 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:scoria_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_recombination.json index 651f3baba..92121b06a 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_brick_slab" - }, - { - "item": "mineralogy:scoria_brick_slab" - } - ], - "result": { - "item": "mineralogy:scoria_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick_slab" + }, + { + "item": "mineralogy:scoria_brick_slab" + } + ], + "result": { + "item": "mineralogy:scoria_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs.json index adeb01e97..4b4271956 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/scoria/brick" - } - }, - "result": { - "item": "mineralogy:scoria_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/brick" + } + }, + "result": { + "item": "mineralogy:scoria_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs_polishing.json index 2166d55c6..ddb73200b 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:scoria_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_wall.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_wall.json index 51d52a26e..e51100c7f 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/scoria/brick" - } - }, - "result": { - "item": "mineralogy:scoria_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/brick" + } + }, + "result": { + "item": "mineralogy:scoria_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_brick_wall_polishing.json index b71340d70..13bb9cc01 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:scoria_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_cobblestone.json b/src/main/resources/data/mineralogy/recipes/scoria_cobblestone.json index 19a3c93c2..8b7c3cb94 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/scoria" - }, - { - "tag": "mineralogy:stones/scoria" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/scoria" + }, + { + "tag": "mineralogy:stones/scoria" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_furnace.json b/src/main/resources/data/mineralogy/recipes/scoria_furnace.json index 532b67e4a..7a2333246 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/scoria" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:scoria_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/scoria" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:scoria_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_brick_slab_recombination.json index 0901950eb..9c64fe4d4 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_smooth_brick_slab" - }, - { - "item": "mineralogy:scoria_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:scoria_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_smooth_brick_slab" + }, + { + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_slab_recombination.json index 5168e74cf..e53370753 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_smooth_slab" - }, - { - "item": "mineralogy:scoria_smooth_slab" - } - ], - "result": { - "item": "mineralogy:scoria_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_smooth_slab" + }, + { + "item": "mineralogy:scoria_smooth_slab" + } + ], + "result": { + "item": "mineralogy:scoria_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_slabs_to_brick.json index c32bce248..484191447 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth_slab" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth_slab" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_stairs_to_brick.json index a458a3266..8ea7bcc3c 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_polished_walls_to_brick.json index fa9df9e03..363397047 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth_wall" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth_wall" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_polishing.json index da86a74f9..e16633fa6 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:scoria_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_recombination.json index a36087235..1015e31ed 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_slab" - }, - { - "item": "mineralogy:scoria_slab" - } - ], - "result": { - "item": "mineralogy:scoria", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_slab" + }, + { + "item": "mineralogy:scoria_slab" + } + ], + "result": { + "item": "mineralogy:scoria", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_slabs_to_brick.json index c00180ca8..04c3fafaa 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_slab" - } - }, - "result": { - "item": "mineralogy:scoria_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_slab" + } + }, + "result": { + "item": "mineralogy:scoria_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_polishing.json index a115f7f1a..6e962c799 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:scoria_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_to_brick.json index 5728bb447..ce6c905cd 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_stairs" - } - }, - "result": { - "item": "mineralogy:scoria_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_stairs" + } + }, + "result": { + "item": "mineralogy:scoria_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_wall_polishing.json index 189e11629..966bef34e 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:scoria_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_raw_walls_to_brick.json index 2d5b479a5..bd21fd5df 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_wall" - } - }, - "result": { - "item": "mineralogy:scoria_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_wall" + } + }, + "result": { + "item": "mineralogy:scoria_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_axe.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_axe.json index c5ce26f9d..631e9770a 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:scoria_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:scoria_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_blank.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_blank.json index 681d0e77a..6494b610d 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - } - }, - "result": { - "item": "mineralogy:scoria_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth" + } + }, + "result": { + "item": "mineralogy:scoria_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_cross.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_cross.json index 3a5fa8528..0f42a121b 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_hammer.json index 3ac5a6b84..c75067366 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_hoe.json index b89aaadbf..bad659b95 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:scoria_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:scoria_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_horizontal.json index 235ba0914..5e262cb10 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_i.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_i.json index 3ba8bc6d9..064683ee0 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_left.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_left.json index 1ed5ff3d3..727d0c93f 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_pickaxe.json index 8410a5a56..fb267789e 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:scoria_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:scoria_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_plus.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_plus.json index 39beb9f5f..b4e57b619 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_right.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_right.json index e50f2d65f..25c1451ef 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_relief_left" - }, - { - "item": "mineralogy:scoria_relief_left" - } - ], - "result": { - "item": "mineralogy:scoria_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_left" + }, + { + "item": "mineralogy:scoria_relief_left" + } + ], + "result": { + "item": "mineralogy:scoria_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_sword.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_sword.json index b6c9b3946..37933c4c1 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "mineralogy:scoria_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:scoria_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "mineralogy:scoria_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:scoria_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/scoria_relief_vertical.json index 2c99bd71a..359b6d57e 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_blank" - } - }, - "result": { - "item": "mineralogy:scoria_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:scoria_relief_blank" + } + }, + "result": { + "item": "mineralogy:scoria_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_slab.json b/src/main/resources/data/mineralogy/recipes/scoria_slab.json index 82b2b4dba..a19d3f46d 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria" - } - }, - "result": { - "item": "mineralogy:scoria_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria" + } + }, + "result": { + "item": "mineralogy:scoria_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth.json index 8d5552c99..6f50c977c 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/scoria" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:scoria_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/scoria" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:scoria_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick.json index b7664a8a2..b9e96c342 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/scoria/smooth" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_furnace.json index 31b8f3c83..a27a52015 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/scoria/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/scoria/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_slab.json index ca9036402..45d7b33f6 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth_brick" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth_brick" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_stairs.json index 1890359fc..df9bb8fa0 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/scoria/smooth_brick" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth_brick" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_wall.json index a589e57eb..2ed0560fb 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/scoria/smooth_brick" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth_brick" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_furnace.json index 5e2f67c78..b0d1c5e83 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/scoria/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/scoria/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_slab.json index f3dc9b624..149bcfb87 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria_smooth" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:scoria_smooth" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_stairs.json index d5d926144..12e9d6073 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/scoria/smooth" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth_wall.json index 561c2f268..e23eb1694 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/scoria/smooth" - } - }, - "result": { - "item": "mineralogy:scoria_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria/smooth" + } + }, + "result": { + "item": "mineralogy:scoria_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_stairs.json b/src/main/resources/data/mineralogy/recipes/scoria_stairs.json index 31706616d..f16fc9f96 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/scoria" - } - }, - "result": { - "item": "mineralogy:scoria_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria" + } + }, + "result": { + "item": "mineralogy:scoria_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_wall.json b/src/main/resources/data/mineralogy/recipes/scoria_wall.json index 8a2aeeed6..3a614c933 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:scoria_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/scoria" - } - }, - "result": { - "item": "mineralogy:scoria_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/scoria" + } + }, + "result": { + "item": "mineralogy:scoria_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick.json b/src/main/resources/data/mineralogy/recipes/shale_brick.json index c3827e606..58dc44b82 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/shale" - } - }, - "result": { - "item": "mineralogy:shale_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale" + } + }, + "result": { + "item": "mineralogy:shale_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_brick_block_polishing.json index fc4a1c076..58e113757 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:shale_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/shale_brick_furnace.json index 6ac4c2f93..6d72df0a5 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/shale/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:shale_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/shale/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:shale_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_slab.json b/src/main/resources/data/mineralogy/recipes/shale_brick_slab.json index 05f243157..7c2ee2b09 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_brick" - } - }, - "result": { - "item": "mineralogy:shale_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_brick" + } + }, + "result": { + "item": "mineralogy:shale_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_brick_slab_polishing.json index b6358d17b..3892cd601 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:shale_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/shale_brick_slab_recombination.json index c220113d1..9f5af6b4b 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_brick_slab" - }, - { - "item": "mineralogy:shale_brick_slab" - } - ], - "result": { - "item": "mineralogy:shale_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick_slab" + }, + { + "item": "mineralogy:shale_brick_slab" + } + ], + "result": { + "item": "mineralogy:shale_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/shale_brick_stairs.json index 8ab1f9615..4da8db0e2 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/shale/brick" - } - }, - "result": { - "item": "mineralogy:shale_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/brick" + } + }, + "result": { + "item": "mineralogy:shale_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_brick_stairs_polishing.json index 9dfb44439..a05addf52 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:shale_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_wall.json b/src/main/resources/data/mineralogy/recipes/shale_brick_wall.json index bf1ba0c2f..46c7bab68 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/shale/brick" - } - }, - "result": { - "item": "mineralogy:shale_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/brick" + } + }, + "result": { + "item": "mineralogy:shale_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_brick_wall_polishing.json index 19c2420e1..d5e05e371 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:shale_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_cobblestone.json b/src/main/resources/data/mineralogy/recipes/shale_cobblestone.json index 39214d9df..1024c53e3 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/shale_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/shale" - }, - { - "tag": "mineralogy:stones/shale" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/shale" + }, + { + "tag": "mineralogy:stones/shale" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_furnace.json b/src/main/resources/data/mineralogy/recipes/shale_furnace.json index 08ace2a38..27d358d27 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/shale" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:shale_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/shale" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:shale_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/shale_polished_brick_slab_recombination.json index 138097682..09c9424f3 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_smooth_brick_slab" - }, - { - "item": "mineralogy:shale_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:shale_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_smooth_brick_slab" + }, + { + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:shale_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/shale_polished_slab_recombination.json index a69d2a467..15964903a 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_smooth_slab" - }, - { - "item": "mineralogy:shale_smooth_slab" - } - ], - "result": { - "item": "mineralogy:shale_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_smooth_slab" + }, + { + "item": "mineralogy:shale_smooth_slab" + } + ], + "result": { + "item": "mineralogy:shale_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_polished_slabs_to_brick.json index 27ee1a523..768660cc3 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth_slab" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth_slab" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_polished_stairs_to_brick.json index 7622ba043..aa64e8d1f 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_polished_walls_to_brick.json index 9be598705..e9305bff2 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth_wall" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth_wall" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_raw_slab_polishing.json index 790f08d8a..1905aa418 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:shale_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/shale_raw_slab_recombination.json index fabbdbfeb..a387d41b1 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_slab" - }, - { - "item": "mineralogy:shale_slab" - } - ], - "result": { - "item": "mineralogy:shale", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_slab" + }, + { + "item": "mineralogy:shale_slab" + } + ], + "result": { + "item": "mineralogy:shale", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_raw_slabs_to_brick.json index 2ac7a09c8..0257961f9 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:shale_slab" - } - }, - "result": { - "item": "mineralogy:shale_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_slab" + } + }, + "result": { + "item": "mineralogy:shale_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_polishing.json index 1ee0c9b28..93c3d127d 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:shale_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_to_brick.json index 39fd2a755..d1c3ecfa2 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:shale_stairs" - } - }, - "result": { - "item": "mineralogy:shale_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_stairs" + } + }, + "result": { + "item": "mineralogy:shale_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/shale_raw_wall_polishing.json index b3fdea5c9..ea1bade05 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:shale_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/shale_raw_walls_to_brick.json index c00246a21..2d57f995c 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:shale_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:shale_wall" - } - }, - "result": { - "item": "mineralogy:shale_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:shale_wall" + } + }, + "result": { + "item": "mineralogy:shale_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_axe.json b/src/main/resources/data/mineralogy/recipes/shale_relief_axe.json index e0b0eba78..8d002a9a7 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:shale_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:shale_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_blank.json b/src/main/resources/data/mineralogy/recipes/shale_relief_blank.json index 58f15182c..7523def56 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - } - }, - "result": { - "item": "mineralogy:shale_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth" + } + }, + "result": { + "item": "mineralogy:shale_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_cross.json b/src/main/resources/data/mineralogy/recipes/shale_relief_cross.json index 13df95fbb..faa94b18a 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/shale_relief_hammer.json index 293e20b1b..cb6ce82f3 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/shale_relief_hoe.json index d955b67c4..99ef074af 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:shale_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:shale_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/shale_relief_horizontal.json index 74dbdee92..272f6a513 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_i.json b/src/main/resources/data/mineralogy/recipes/shale_relief_i.json index f0774b9d2..b2cca76cc 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_left.json b/src/main/resources/data/mineralogy/recipes/shale_relief_left.json index 8dfb75921..001fddd8f 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/shale_relief_pickaxe.json index aabafd2a9..20f6812ff 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:shale_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:shale_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_plus.json b/src/main/resources/data/mineralogy/recipes/shale_relief_plus.json index ccd014de9..c209149d5 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_right.json b/src/main/resources/data/mineralogy/recipes/shale_relief_right.json index de3dfee71..2bc6d860b 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_relief_left" - }, - { - "item": "mineralogy:shale_relief_left" - } - ], - "result": { - "item": "mineralogy:shale_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_left" + }, + { + "item": "mineralogy:shale_relief_left" + } + ], + "result": { + "item": "mineralogy:shale_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_sword.json b/src/main/resources/data/mineralogy/recipes/shale_relief_sword.json index fd849c57d..cbd10d3ab 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "mineralogy:shale_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:shale_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "mineralogy:shale_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:shale_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/shale_relief_vertical.json index e5387497f..03b3ae602 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/shale_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_blank" - } - }, - "result": { - "item": "mineralogy:shale_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:shale_relief_blank" + } + }, + "result": { + "item": "mineralogy:shale_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_slab.json b/src/main/resources/data/mineralogy/recipes/shale_slab.json index ec69791cd..fb9498c0d 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale" - } - }, - "result": { - "item": "mineralogy:shale_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale" + } + }, + "result": { + "item": "mineralogy:shale_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth.json b/src/main/resources/data/mineralogy/recipes/shale_smooth.json index 1b2cb9458..b32e6bfcf 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/shale" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:shale_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/shale" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:shale_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick.json index 0da9bfcf1..9e3134fa7 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/shale/smooth" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_furnace.json index f7a8b63c0..a514a025c 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/shale/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/shale/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_slab.json index 02b8d9f7f..b16a0af6c 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth_brick" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth_brick" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_stairs.json index ed906f7c9..7ff9045d9 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/shale/smooth_brick" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth_brick" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_wall.json index c80004a31..368ca6293 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/shale/smooth_brick" - } - }, - "result": { - "item": "mineralogy:shale_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth_brick" + } + }, + "result": { + "item": "mineralogy:shale_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_furnace.json index 9c01ebf47..e3859e124 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/shale/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:shale_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/shale/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:shale_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_slab.json index 89e8a551b..2e7a6d5ac 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale_smooth" - } - }, - "result": { - "item": "mineralogy:shale_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:shale_smooth" + } + }, + "result": { + "item": "mineralogy:shale_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_stairs.json index 31371546d..f207c7178 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/shale/smooth" - } - }, - "result": { - "item": "mineralogy:shale_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth" + } + }, + "result": { + "item": "mineralogy:shale_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/shale_smooth_wall.json index cd6164f90..bbae30703 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/shale/smooth" - } - }, - "result": { - "item": "mineralogy:shale_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale/smooth" + } + }, + "result": { + "item": "mineralogy:shale_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_stairs.json b/src/main/resources/data/mineralogy/recipes/shale_stairs.json index 8d563ac92..13e60ce75 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/shale" - } - }, - "result": { - "item": "mineralogy:shale_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale" + } + }, + "result": { + "item": "mineralogy:shale_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_wall.json b/src/main/resources/data/mineralogy/recipes/shale_wall.json index 9d30f2b36..4efa8b7ae 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:shale_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/shale" - } - }, - "result": { - "item": "mineralogy:shale_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/shale" + } + }, + "result": { + "item": "mineralogy:shale_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick.json index 070930015..2177e4bfb 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone" + } + }, + "result": { + "item": "mineralogy:siltstone_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_block_polishing.json index 8b6683877..33c234a39 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:siltstone_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_furnace.json index 347dccf12..b9afddeb7 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/siltstone/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/siltstone/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab.json index eca3bad91..348bb0cdb 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_brick" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_polishing.json index 48a2fc0db..35810ee22 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:siltstone_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_recombination.json index fdd8a3bf5..bc078ce3a 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_brick_slab" - }, - { - "item": "mineralogy:siltstone_brick_slab" - } - ], - "result": { - "item": "mineralogy:siltstone_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick_slab" + }, + { + "item": "mineralogy:siltstone_brick_slab" + } + ], + "result": { + "item": "mineralogy:siltstone_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs.json index c803bc9ee..733e4413e 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/siltstone/brick" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/brick" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs_polishing.json index 264dfe24a..70abb4284 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:siltstone_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall.json index 9482ba651..b3392bddf 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/siltstone/brick" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/brick" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall_polishing.json index 2785f897d..100e8efab 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:siltstone_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_cobblestone.json b/src/main/resources/data/mineralogy/recipes/siltstone_cobblestone.json index 29e2cf5cb..755cbe68d 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/siltstone" - }, - { - "tag": "mineralogy:stones/siltstone" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/siltstone" + }, + { + "tag": "mineralogy:stones/siltstone" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json b/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json index 6e10043c0..8bb2134fa 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/siltstone" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:siltstone_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/siltstone" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:siltstone_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_brick_slab_recombination.json index 86c456f2b..9fb44cef9 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_smooth_brick_slab" - }, - { - "item": "mineralogy:siltstone_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:siltstone_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_smooth_brick_slab" + }, + { + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_slab_recombination.json index e16cb726b..35bd0a121 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_smooth_slab" - }, - { - "item": "mineralogy:siltstone_smooth_slab" - } - ], - "result": { - "item": "mineralogy:siltstone_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "item": "mineralogy:siltstone_smooth_slab" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_slabs_to_brick.json index 6d939f7e7..aab9e7290 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth_slab" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth_slab" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_stairs_to_brick.json index ac764faf8..bca17b4b2 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_polished_walls_to_brick.json index ba8968938..4eadf7f91 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth_wall" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth_wall" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_polishing.json index ed7d6b8ff..949d88c54 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:siltstone_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_recombination.json index 3de5cf27a..1dee7c36f 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_slab" - }, - { - "item": "mineralogy:siltstone_slab" - } - ], - "result": { - "item": "mineralogy:siltstone", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_slab" + }, + { + "item": "mineralogy:siltstone_slab" + } + ], + "result": { + "item": "mineralogy:siltstone", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slabs_to_brick.json index 93b49632f..6fbb68d56 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_slab" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_slab" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_polishing.json index 4f4fc2672..b241c7820 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:siltstone_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_to_brick.json index e7a350b48..caf08ed1f 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_stairs" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_stairs" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_wall_polishing.json index 9252466cd..facb892ae 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:siltstone_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_raw_walls_to_brick.json index fddd85a2c..641c5c204 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_wall" - } - }, - "result": { - "item": "mineralogy:siltstone_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_wall" + } + }, + "result": { + "item": "mineralogy:siltstone_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_axe.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_axe.json index fc7fcda0e..6a6cacde0 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:siltstone_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:siltstone_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_blank.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_blank.json index 39fa26e11..831f80c13 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_cross.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_cross.json index f4e899fb6..f5e7638d0 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_hammer.json index f707dc652..475dfc4ed 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_hoe.json index 4b673860a..1dc67bda5 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:siltstone_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:siltstone_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_horizontal.json index 7b6fdffff..8bc6ec55a 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_i.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_i.json index 53b17acac..b3cdaa75c 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_left.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_left.json index 1e91e5389..b80082cf5 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_pickaxe.json index ecbec0e8b..59e3628ac 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:siltstone_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:siltstone_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_plus.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_plus.json index 33257b01d..c5137103b 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_right.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_right.json index 814b18230..02262dbf9 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_relief_left" - }, - { - "item": "mineralogy:siltstone_relief_left" - } - ], - "result": { - "item": "mineralogy:siltstone_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_left" + }, + { + "item": "mineralogy:siltstone_relief_left" + } + ], + "result": { + "item": "mineralogy:siltstone_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_sword.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_sword.json index f2646b0fb..0230400fb 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "mineralogy:siltstone_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:siltstone_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "mineralogy:siltstone_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:siltstone_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/siltstone_relief_vertical.json index 9c42ea0dc..e2e0cbafe 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_blank" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_relief_blank" + } + }, + "result": { + "item": "mineralogy:siltstone_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_slab.json b/src/main/resources/data/mineralogy/recipes/siltstone_slab.json index b55a273d9..2f9f880b3 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone" + } + }, + "result": { + "item": "mineralogy:siltstone_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json index 80313189b..ac4939f86 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/siltstone" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:siltstone_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/siltstone" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:siltstone_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick.json index fed922aec..d6a2305d8 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/siltstone/smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_furnace.json index ff89c14c4..c551960b3 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/siltstone/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/siltstone/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_slab.json index 0a328f0e0..6bf514c2c 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth_brick" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_stairs.json index abf105806..5044825bd 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/siltstone/smooth_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth_brick" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_wall.json index 291f500b5..2d24705f3 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/siltstone/smooth_brick" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth_brick" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_furnace.json index f04470b77..bd6223ad1 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/siltstone/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/siltstone/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_slab.json index 95abe3991..0d0d1f0d8 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone_smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:siltstone_smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_stairs.json index a76fe13e1..d670ea931 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/siltstone/smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_wall.json index 852218989..1b0f052b3 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/siltstone/smooth" - } - }, - "result": { - "item": "mineralogy:siltstone_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone/smooth" + } + }, + "result": { + "item": "mineralogy:siltstone_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json b/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json index 7b4f31444..49d9cc59e 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone" + } + }, + "result": { + "item": "mineralogy:siltstone_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_wall.json b/src/main/resources/data/mineralogy/recipes/siltstone_wall.json index 6e325d060..82486e6e5 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:siltstone_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/siltstone" + } + }, + "result": { + "item": "mineralogy:siltstone_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick.json b/src/main/resources/data/mineralogy/recipes/slate_brick.json index 9cc3c1329..107b3cc51 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/slate" - } - }, - "result": { - "item": "mineralogy:slate_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate" + } + }, + "result": { + "item": "mineralogy:slate_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_brick_block_polishing.json index c2cf4e903..fd568464f 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:slate_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/slate_brick_furnace.json index c88a26780..e59436b9c 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/slate/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:slate_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/slate/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:slate_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_slab.json b/src/main/resources/data/mineralogy/recipes/slate_brick_slab.json index 1d7323da0..06a75a8b2 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_brick" - } - }, - "result": { - "item": "mineralogy:slate_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_brick" + } + }, + "result": { + "item": "mineralogy:slate_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_brick_slab_polishing.json index 7e4ad2ba8..962601584 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:slate_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/slate_brick_slab_recombination.json index 3e5fd9e4f..1c493a23c 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_brick_slab" - }, - { - "item": "mineralogy:slate_brick_slab" - } - ], - "result": { - "item": "mineralogy:slate_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick_slab" + }, + { + "item": "mineralogy:slate_brick_slab" + } + ], + "result": { + "item": "mineralogy:slate_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/slate_brick_stairs.json index 1c7ce58a8..b6cadbf7c 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/slate/brick" - } - }, - "result": { - "item": "mineralogy:slate_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/brick" + } + }, + "result": { + "item": "mineralogy:slate_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_brick_stairs_polishing.json index 6835321fb..e249dbcf8 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:slate_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_wall.json b/src/main/resources/data/mineralogy/recipes/slate_brick_wall.json index 8da5cac1b..e9d61e991 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/slate/brick" - } - }, - "result": { - "item": "mineralogy:slate_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/brick" + } + }, + "result": { + "item": "mineralogy:slate_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_brick_wall_polishing.json index 5168f24a2..e0abee16a 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:slate_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_cobblestone.json b/src/main/resources/data/mineralogy/recipes/slate_cobblestone.json index 0642555c3..4c3c37e55 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/slate_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/slate" - }, - { - "tag": "mineralogy:stones/slate" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/slate" + }, + { + "tag": "mineralogy:stones/slate" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_furnace.json b/src/main/resources/data/mineralogy/recipes/slate_furnace.json index b0dd5af7d..85f4a10b1 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/slate" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:slate_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/slate" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:slate_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/slate_polished_brick_slab_recombination.json index d19183503..8585d88bf 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_smooth_brick_slab" - }, - { - "item": "mineralogy:slate_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:slate_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_smooth_brick_slab" + }, + { + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:slate_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/slate_polished_slab_recombination.json index b50e4a8de..d8a060f99 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_smooth_slab" - }, - { - "item": "mineralogy:slate_smooth_slab" - } - ], - "result": { - "item": "mineralogy:slate_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_smooth_slab" + }, + { + "item": "mineralogy:slate_smooth_slab" + } + ], + "result": { + "item": "mineralogy:slate_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_polished_slabs_to_brick.json index e1c871cb1..6a9fc8cec 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth_slab" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth_slab" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_polished_stairs_to_brick.json index 08bcf34f2..38616b75a 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_polished_walls_to_brick.json index 2360ca17e..c297bf090 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth_wall" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth_wall" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_raw_slab_polishing.json index e4d3368b9..d6cd49e15 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:slate_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/slate_raw_slab_recombination.json index abf3f7f40..e6d1b7449 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_slab" - }, - { - "item": "mineralogy:slate_slab" - } - ], - "result": { - "item": "mineralogy:slate", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_slab" + }, + { + "item": "mineralogy:slate_slab" + } + ], + "result": { + "item": "mineralogy:slate", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_raw_slabs_to_brick.json index 257c69288..86b407d03 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:slate_slab" - } - }, - "result": { - "item": "mineralogy:slate_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_slab" + } + }, + "result": { + "item": "mineralogy:slate_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_polishing.json index 92b22978c..22a308f99 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:slate_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_to_brick.json index 05b7e02fe..7ce75737c 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:slate_stairs" - } - }, - "result": { - "item": "mineralogy:slate_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_stairs" + } + }, + "result": { + "item": "mineralogy:slate_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/slate_raw_wall_polishing.json index cc00c298b..1f2cd918d 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:slate_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/slate_raw_walls_to_brick.json index 2dbaae16f..d2604aed7 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:slate_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:slate_wall" - } - }, - "result": { - "item": "mineralogy:slate_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:slate_wall" + } + }, + "result": { + "item": "mineralogy:slate_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_axe.json b/src/main/resources/data/mineralogy/recipes/slate_relief_axe.json index 1a4e4236c..3e92d3f5c 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:slate_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:slate_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_blank.json b/src/main/resources/data/mineralogy/recipes/slate_relief_blank.json index 0b8223e72..101f1e0fd 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - } - }, - "result": { - "item": "mineralogy:slate_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth" + } + }, + "result": { + "item": "mineralogy:slate_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_cross.json b/src/main/resources/data/mineralogy/recipes/slate_relief_cross.json index 5e84c29a9..2deb2b2f6 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/slate_relief_hammer.json index ab7f2a9e9..b53912ef3 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/slate_relief_hoe.json index 25c425b53..7044d39fe 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:slate_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:slate_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/slate_relief_horizontal.json index e13c2dddf..128021985 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_i.json b/src/main/resources/data/mineralogy/recipes/slate_relief_i.json index 75b7e070d..515e88343 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_left.json b/src/main/resources/data/mineralogy/recipes/slate_relief_left.json index 0108ab6f5..612917737 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/slate_relief_pickaxe.json index 4a196ce64..34d48ed1f 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:slate_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:slate_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_plus.json b/src/main/resources/data/mineralogy/recipes/slate_relief_plus.json index d905edb92..667c3d12b 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_right.json b/src/main/resources/data/mineralogy/recipes/slate_relief_right.json index 052a10cb8..84328d06b 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_relief_left" - }, - { - "item": "mineralogy:slate_relief_left" - } - ], - "result": { - "item": "mineralogy:slate_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_left" + }, + { + "item": "mineralogy:slate_relief_left" + } + ], + "result": { + "item": "mineralogy:slate_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_sword.json b/src/main/resources/data/mineralogy/recipes/slate_relief_sword.json index 25d195e09..74360b013 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "mineralogy:slate_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:slate_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "mineralogy:slate_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:slate_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/slate_relief_vertical.json index ebf66bbba..52b37d4ae 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/slate_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_blank" - } - }, - "result": { - "item": "mineralogy:slate_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:slate_relief_blank" + } + }, + "result": { + "item": "mineralogy:slate_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_slab.json b/src/main/resources/data/mineralogy/recipes/slate_slab.json index b5872fa86..4c67b5175 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate" - } - }, - "result": { - "item": "mineralogy:slate_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate" + } + }, + "result": { + "item": "mineralogy:slate_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth.json b/src/main/resources/data/mineralogy/recipes/slate_smooth.json index 7349a2a1f..6397edce8 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/slate" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:slate_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/slate" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:slate_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick.json index e6dfc849b..94f86fa63 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/slate/smooth" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_furnace.json index 36c1c940b..64ddfbf2b 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/slate/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/slate/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_slab.json index 9e9226552..b47121a97 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth_brick" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth_brick" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_stairs.json index 21ff64061..d4c102e0a 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/slate/smooth_brick" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth_brick" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_wall.json index 40c11e81e..c99d9b74b 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/slate/smooth_brick" - } - }, - "result": { - "item": "mineralogy:slate_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth_brick" + } + }, + "result": { + "item": "mineralogy:slate_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_furnace.json index 041582d47..151cff07d 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/slate/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:slate_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/slate/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:slate_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_slab.json index 9998ca044..8f29375ac 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate_smooth" - } - }, - "result": { - "item": "mineralogy:slate_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:slate_smooth" + } + }, + "result": { + "item": "mineralogy:slate_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_stairs.json index e6ec83adc..d5114b634 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/slate/smooth" - } - }, - "result": { - "item": "mineralogy:slate_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth" + } + }, + "result": { + "item": "mineralogy:slate_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/slate_smooth_wall.json index 6b37b8f7e..a5858d0b2 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/slate/smooth" - } - }, - "result": { - "item": "mineralogy:slate_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate/smooth" + } + }, + "result": { + "item": "mineralogy:slate_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_stairs.json b/src/main/resources/data/mineralogy/recipes/slate_stairs.json index 54f07a20f..1460c18ae 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/slate" - } - }, - "result": { - "item": "mineralogy:slate_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate" + } + }, + "result": { + "item": "mineralogy:slate_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_wall.json b/src/main/resources/data/mineralogy/recipes/slate_wall.json index fa2c674d1..82c1ed805 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:slate_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/slate" - } - }, - "result": { - "item": "mineralogy:slate_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/slate" + } + }, + "result": { + "item": "mineralogy:slate_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/sulfur_block.json b/src/main/resources/data/mineralogy/recipes/sulfur_block.json index d3be94c09..9b09930ab 100644 --- a/src/main/resources/data/mineralogy/recipes/sulfur_block.json +++ b/src/main/resources/data/mineralogy/recipes/sulfur_block.json @@ -1,27 +1,27 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:sulfur_block" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:sulfur_dust" - } - }, - "result": { - "item": "mineralogy:sulfur_block", - "count": 1 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_block" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:sulfur_dust" + } + }, + "result": { + "item": "mineralogy:sulfur_block", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/sulfur_dust.json b/src/main/resources/data/mineralogy/recipes/sulfur_dust.json index 8c5e0aef4..f2ee994e1 100644 --- a/src/main/resources/data/mineralogy/recipes/sulfur_dust.json +++ b/src/main/resources/data/mineralogy/recipes/sulfur_dust.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "mineralogy:config", - "flag": "ENABLE_MINERAL_DUSTS" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:sulfur_dust" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/sulfur" - } - ], - "result": { - "item": "mineralogy:sulfur_dust", - "count": 9 - } + "conditions": [ + { + "type": "mineralogy:config", + "flag": "ENABLE_MINERAL_DUSTS" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:sulfur_dust" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/sulfur" + } + ], + "result": { + "item": "mineralogy:sulfur_dust", + "count": 9 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_brick.json index c01221a43..a36104fc8 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/tuff" - } - }, - "result": { - "item": "mineralogy:tuff_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff" + } + }, + "result": { + "item": "mineralogy:tuff_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_block_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_block_polishing.json index 93dc670c9..7e132185e 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_block_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_block_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_brick" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:tuff_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_furnace.json index 22bf881c6..00005e56e 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/tuff/brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:tuff_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/tuff/brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:tuff_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab.json index a9093d33b..1ca9ff9d2 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_brick" - } - }, - "result": { - "item": "mineralogy:tuff_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_brick" + } + }, + "result": { + "item": "mineralogy:tuff_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_polishing.json index 9e3d8e8b1..0dac00b8f 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_brick_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:tuff_smooth_brick_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_brick_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_recombination.json index 65badb3fa..cd29d3afa 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_brick_slab" - }, - { - "item": "mineralogy:tuff_brick_slab" - } - ], - "result": { - "item": "mineralogy:tuff_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick_slab" + }, + { + "item": "mineralogy:tuff_brick_slab" + } + ], + "result": { + "item": "mineralogy:tuff_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs.json index 5f601a638..f15d9f1d6 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/tuff/brick" - } - }, - "result": { - "item": "mineralogy:tuff_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/brick" + } + }, + "result": { + "item": "mineralogy:tuff_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs_polishing.json index 59afd39a6..93d399e69 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_brick_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:tuff_smooth_brick_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_brick_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_wall.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_wall.json index f3f7448cf..e883d8946 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/tuff/brick" - } - }, - "result": { - "item": "mineralogy:tuff_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/brick" + } + }, + "result": { + "item": "mineralogy:tuff_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_brick_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_brick_wall_polishing.json index ef2915893..3d037a981 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_brick_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:tuff_smooth_brick_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_brick_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_brick_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_cobblestone.json b/src/main/resources/data/mineralogy/recipes/tuff_cobblestone.json index d866b9398..8993da264 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_cobblestone.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_cobblestone.json @@ -1,22 +1,24 @@ { - "conditions": [], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/tuff" - }, - { - "tag": "mineralogy:stones/tuff" - }, - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:gravel" - } - ], - "result": { - "item": "minecraft:cobblestone", - "count": 4 - } + "conditions": [ + + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/tuff" + }, + { + "tag": "mineralogy:stones/tuff" + }, + { + "item": "minecraft:gravel" + }, + { + "item": "minecraft:gravel" + } + ], + "result": { + "item": "minecraft:cobblestone", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_furnace.json b/src/main/resources/data/mineralogy/recipes/tuff_furnace.json index f4a3ebdcb..bfaf4e7fc 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/tuff" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:tuff_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/tuff" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:tuff_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_brick_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_brick_slab_recombination.json index 20664f706..3e9fc577c 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_polished_brick_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_brick_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_smooth_brick_slab" - }, - { - "item": "mineralogy:tuff_smooth_brick_slab" - } - ], - "result": { - "item": "mineralogy:tuff_smooth_brick", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_smooth_brick_slab" + }, + { + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_brick", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_slab_recombination.json index 7415c9ed7..fcf12b80d 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_polished_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_smooth_slab" - }, - { - "item": "mineralogy:tuff_smooth_slab" - } - ], - "result": { - "item": "mineralogy:tuff_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_smooth_slab" + }, + { + "item": "mineralogy:tuff_smooth_slab" + } + ], + "result": { + "item": "mineralogy:tuff_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_slabs_to_brick.json index c5ce97d4e..a9c792e7b 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_polished_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth_slab" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth_slab" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_stairs_to_brick.json index a18d86d8b..952278dd1 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_polished_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth_stairs" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth_stairs" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_polished_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_polished_walls_to_brick.json index 60ffbdbad..2fbf24839 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_polished_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_polished_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth_wall" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth_wall" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_polishing.json index 096904f0d..d2035ce44 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_slab" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:tuff_smooth_slab", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_slab" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_slab", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_recombination.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_recombination.json index e8035c5d6..1c5ab931a 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_recombination.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_slab_recombination.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_slab" - }, - { - "item": "mineralogy:tuff_slab" - } - ], - "result": { - "item": "mineralogy:tuff", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_slab" + }, + { + "item": "mineralogy:tuff_slab" + } + ], + "result": { + "item": "mineralogy:tuff", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_slabs_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_slabs_to_brick.json index 9e430f55a..59a9abaad 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_raw_slabs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_slabs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_slab" - } - }, - "result": { - "item": "mineralogy:tuff_brick_slab", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_slab" + } + }, + "result": { + "item": "mineralogy:tuff_brick_slab", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_polishing.json index 130fce3f9..688e71c23 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_stairs" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_stairs" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:tuff_smooth_stairs", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_stairs" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_stairs", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_to_brick.json index 1e0b25a69..3ed0b1f72 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_stairs_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_stairs" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_stairs" - } - }, - "result": { - "item": "mineralogy:tuff_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_stairs" + } + }, + "result": { + "item": "mineralogy:tuff_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_wall_polishing.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_wall_polishing.json index c1616e202..48560826a 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_raw_wall_polishing.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_wall_polishing.json @@ -1,25 +1,25 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_wall" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_wall" - }, - { - "tag": "forge:sand" - } - ], - "result": { - "item": "mineralogy:tuff_smooth_wall", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_wall" + }, + { + "tag": "forge:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth_wall", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_raw_walls_to_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_raw_walls_to_brick.json index 4e571bbaf..56c5366e5 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_raw_walls_to_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_raw_walls_to_brick.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_wall" - }, - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_wall" - } - }, - "result": { - "item": "mineralogy:tuff_brick_wall", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + }, + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_wall" + } + }, + "result": { + "item": "mineralogy:tuff_brick_wall", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_axe.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_axe.json index 7b7a50861..5203be981 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_axe.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_axe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_axe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "minecraft:stone_axe" - } - ], - "result": { - "item": "mineralogy:tuff_relief_axe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_axe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "minecraft:stone_axe" + } + ], + "result": { + "item": "mineralogy:tuff_relief_axe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_blank.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_blank.json index 74ea457be..86b20cde4 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_blank.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_blank.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_blank" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - } - }, - "result": { - "item": "mineralogy:tuff_relief_blank", - "count": 16 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_blank" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth" + } + }, + "result": { + "item": "mineralogy:tuff_relief_blank", + "count": 16 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_cross.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_cross.json index cfc7c01e3..80cf00560 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_cross.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_cross.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_cross" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - " ", - "x x" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_cross", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_cross" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x x", + " ", + "x x" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_cross", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_hammer.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_hammer.json index bb3fb4a88..2edc79865 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_hammer.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_hammer.json @@ -1,29 +1,29 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_hammer" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "zxz", - "zyz", - "zzz" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - }, - "y": { - "item": "minecraft:stick" - }, - "z": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_hammer", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hammer" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "zxz", + "zyz", + "zzz" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth" + }, + "y": { + "item": "minecraft:stick" + }, + "z": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_hammer", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_hoe.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_hoe.json index 92a17c63a..4a5f4de50 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_hoe.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_hoe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_hoe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "minecraft:stone_hoe" - } - ], - "result": { - "item": "mineralogy:tuff_relief_hoe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hoe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "minecraft:stone_hoe" + } + ], + "result": { + "item": "mineralogy:tuff_relief_hoe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_horizontal.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_horizontal.json index 85ba22264..f8cc12efa 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_horizontal.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_horizontal.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_horizontal" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_horizontal", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_horizontal" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_horizontal", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_i.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_i.json index 1ece856c2..7284cd87c 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_i.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_i.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_i" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - " x ", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_i", - "count": 7 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_i" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + " x ", + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_i", + "count": 7 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_left.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_left.json index 11fd5644e..3bfbd2577 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_left.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_left.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_left" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - " x ", - " x" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_left", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_left" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + " x ", + " x" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_left", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_pickaxe.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_pickaxe.json index 89cf7f037..f9463a3be 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_pickaxe.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_pickaxe.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_pickaxe" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "minecraft:stone_pickaxe" - } - ], - "result": { - "item": "mineralogy:tuff_relief_pickaxe", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_pickaxe" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "minecraft:stone_pickaxe" + } + ], + "result": { + "item": "mineralogy:tuff_relief_pickaxe", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_plus.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_plus.json index 483f77bb6..b34adfea7 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_plus.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_plus.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_plus" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " x ", - "xxx", - " x " - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_plus", - "count": 5 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_plus" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " x ", + "xxx", + " x " + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_plus", + "count": 5 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_right.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_right.json index aa48bc21d..94a1db532 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_right.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_right.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_right" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_relief_left" - }, - { - "item": "mineralogy:tuff_relief_left" - } - ], - "result": { - "item": "mineralogy:tuff_relief_right", - "count": 2 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_left" + }, + { + "item": "mineralogy:tuff_relief_left" + } + ], + "result": { + "item": "mineralogy:tuff_relief_right", + "count": 2 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_sword.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_sword.json index 616051723..ce0d41ccd 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_sword.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_sword.json @@ -1,42 +1,42 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_sword" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "mineralogy:tuff_relief_blank" - }, - { - "item": "minecraft:stone_sword" - } - ], - "result": { - "item": "mineralogy:tuff_relief_sword", - "count": 8 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_sword" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "mineralogy:tuff_relief_blank" + }, + { + "item": "minecraft:stone_sword" + } + ], + "result": { + "item": "mineralogy:tuff_relief_sword", + "count": 8 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_relief_vertical.json b/src/main/resources/data/mineralogy/recipes/tuff_relief_vertical.json index 98fa873e9..f05955700 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_relief_vertical.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_relief_vertical.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_relief_vertical" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "x", - "x" - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_blank" - } - }, - "result": { - "item": "mineralogy:tuff_relief_vertical", - "count": 3 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_vertical" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x", + "x", + "x" + ], + "key": { + "x": { + "item": "mineralogy:tuff_relief_blank" + } + }, + "result": { + "item": "mineralogy:tuff_relief_vertical", + "count": 3 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_slab.json b/src/main/resources/data/mineralogy/recipes/tuff_slab.json index 0401d5a55..52c31a4d2 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff" - } - }, - "result": { - "item": "mineralogy:tuff_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff" + } + }, + "result": { + "item": "mineralogy:tuff_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth.json index eee5b5cd1..edcbcaa94 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth" - } - ], - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "mineralogy:stones/tuff" - }, - { - "item": "minecraft:sand" - } - ], - "result": { - "item": "mineralogy:tuff_smooth", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "mineralogy:stones/tuff" + }, + { + "item": "minecraft:sand" + } + ], + "result": { + "item": "mineralogy:tuff_smooth", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick.json index 01d29db93..142081412 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/tuff/smooth" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xx", + "xx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_furnace.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_furnace.json index 950673561..1bceadfca 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/tuff/smooth_brick" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/tuff/smooth_brick" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_slab.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_slab.json index eee157afb..8b7e764c6 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth_brick" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "item": "mineralogy:tuff_smooth_brick" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_stairs.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_stairs.json index e880b8624..ae82e931b 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/tuff/smooth_brick" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth_brick" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_wall.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_wall.json index 754f45038..d93560a08 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_brick_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_brick_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/tuff/smooth_brick" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_brick_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth_brick" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_brick_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_furnace.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_furnace.json index fff61b1b6..9a2877f87 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_furnace.json @@ -1,26 +1,26 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_furnace" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xyx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:slabs/tuff/smooth" - }, - "y": { - "item": "minecraft:furnace" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_furnace", - "count": 1 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_furnace" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xyx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:slabs/tuff/smooth" + }, + "y": { + "item": "minecraft:furnace" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_furnace", + "count": 1 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_slab.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_slab.json index d34f6fad5..3d4f5fa18 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_slab.json @@ -1,21 +1,21 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_slab" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff_smooth" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_slab", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_slab", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_stairs.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_stairs.json index 30cad1fa4..7ef525853 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/tuff/smooth" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth_wall.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth_wall.json index f592d30d3..aac22c40a 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_smooth_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/tuff/smooth" - } - }, - "result": { - "item": "mineralogy:tuff_smooth_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff/smooth" + } + }, + "result": { + "item": "mineralogy:tuff_smooth_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_stairs.json b/src/main/resources/data/mineralogy/recipes/tuff_stairs.json index b922d6ede..f207336f7 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_stairs.json @@ -1,23 +1,23 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "x ", - "xx ", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/tuff" - } - }, - "result": { - "item": "mineralogy:tuff_stairs", - "count": 4 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "x ", + "xx ", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff" + } + }, + "result": { + "item": "mineralogy:tuff_stairs", + "count": 4 + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_wall.json b/src/main/resources/data/mineralogy/recipes/tuff_wall.json index 8182a9816..c02fb2a46 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_wall.json @@ -1,22 +1,22 @@ { - "conditions": [ - { - "type": "forge:item_exists", - "item": "mineralogy:tuff_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "mineralogy:stones/tuff" - } - }, - "result": { - "item": "mineralogy:tuff_wall", - "count": 6 - } + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "xxx", + "xxx" + ], + "key": { + "x": { + "tag": "mineralogy:stones/tuff" + } + }, + "result": { + "item": "mineralogy:tuff_wall", + "count": 6 + } } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/amphibolite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/amphibolite.json index 26e1eac26..5cdea399b 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/amphibolite.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/amphibolite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:amphibolite" - ] + "replace": false, + "values": [ + "mineralogy:amphibolite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/andesite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/andesite.json index 0680f2507..708588bcd 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/andesite.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/andesite.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:andesite", - "minecraft:andesite" - ] + "replace": false, + "values": [ + "mineralogy:andesite", + "minecraft:andesite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/basalt.json b/src/main/resources/data/mineralogy/tags/blocks/stones/basalt.json index e0e10bf52..1ae916657 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/basalt.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/basalt.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:basalt", - "minecraft:basalt" - ] + "replace": false, + "values": [ + "mineralogy:basalt", + "minecraft:basalt" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/basaltic_glass.json b/src/main/resources/data/mineralogy/tags/blocks/stones/basaltic_glass.json index 59c1e89a3..9cb3a5c60 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/basaltic_glass.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/basaltic_glass.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basaltic_glass" - ] + "replace": false, + "values": [ + "mineralogy:basaltic_glass" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/conglomerate.json b/src/main/resources/data/mineralogy/tags/blocks/stones/conglomerate.json index e4e289fb2..9a8db044e 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/conglomerate.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/conglomerate.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:conglomerate" - ] + "replace": false, + "values": [ + "mineralogy:conglomerate" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/diabase.json b/src/main/resources/data/mineralogy/tags/blocks/stones/diabase.json index c53507246..b1d74d01e 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/diabase.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/diabase.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:diabase" - ] + "replace": false, + "values": [ + "mineralogy:diabase" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/diorite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/diorite.json index 8d8329944..a6c473010 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/diorite.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/diorite.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:diorite", - "minecraft:diorite" - ] + "replace": false, + "values": [ + "mineralogy:diorite", + "minecraft:diorite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/dolomite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/dolomite.json index 1ed6b212d..f329a9162 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/dolomite.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/dolomite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:dolomite" - ] + "replace": false, + "values": [ + "mineralogy:dolomite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/gabbro.json b/src/main/resources/data/mineralogy/tags/blocks/stones/gabbro.json index d2d73ceb1..2b664843f 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/gabbro.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/gabbro.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gabbro" - ] + "replace": false, + "values": [ + "mineralogy:gabbro" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/gneiss.json b/src/main/resources/data/mineralogy/tags/blocks/stones/gneiss.json index 6d15d2677..a19fbac88 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/gneiss.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/gneiss.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gneiss" - ] + "replace": false, + "values": [ + "mineralogy:gneiss" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/granite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/granite.json index 817e7c5da..ae5dd9590 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/granite.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/granite.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:granite", - "minecraft:granite" - ] + "replace": false, + "values": [ + "mineralogy:granite", + "minecraft:granite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/hornfels.json b/src/main/resources/data/mineralogy/tags/blocks/stones/hornfels.json index 59acdf116..7ec83bdd3 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/hornfels.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/hornfels.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:hornfels" - ] + "replace": false, + "values": [ + "mineralogy:hornfels" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/limestone.json b/src/main/resources/data/mineralogy/tags/blocks/stones/limestone.json index ae25aec9e..3f32e2ff2 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/limestone.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/limestone.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:limestone" - ] + "replace": false, + "values": [ + "mineralogy:limestone" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/marble.json b/src/main/resources/data/mineralogy/tags/blocks/stones/marble.json index e22e67bb1..bdb724467 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/marble.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/marble.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:marble" - ] + "replace": false, + "values": [ + "mineralogy:marble" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/novaculite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/novaculite.json index 2339a11c9..74fb17da3 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/novaculite.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/novaculite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:novaculite" - ] + "replace": false, + "values": [ + "mineralogy:novaculite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/pegmatite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/pegmatite.json index 442dbf678..7675fc010 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/pegmatite.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/pegmatite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:pegmatite" - ] + "replace": false, + "values": [ + "mineralogy:pegmatite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/peridotite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/peridotite.json index d774099e2..34de42c18 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/peridotite.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/peridotite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:peridotite" - ] + "replace": false, + "values": [ + "mineralogy:peridotite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/phyllite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/phyllite.json index f705ab15b..991dc28d5 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/phyllite.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/phyllite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:phyllite" - ] + "replace": false, + "values": [ + "mineralogy:phyllite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/quartzite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/quartzite.json index 21db863d4..f539e57f9 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/quartzite.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/quartzite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:quartzite" - ] + "replace": false, + "values": [ + "mineralogy:quartzite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/rhyolite.json b/src/main/resources/data/mineralogy/tags/blocks/stones/rhyolite.json index 77c7ece7b..460e41c8e 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/rhyolite.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/rhyolite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rhyolite" - ] + "replace": false, + "values": [ + "mineralogy:rhyolite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/rock_salt.json b/src/main/resources/data/mineralogy/tags/blocks/stones/rock_salt.json index 8133cee26..24df4c009 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/rock_salt.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/rock_salt.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rock_salt" - ] + "replace": false, + "values": [ + "mineralogy:rock_salt" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/schist.json b/src/main/resources/data/mineralogy/tags/blocks/stones/schist.json index 61f16050a..ba6cdfc2c 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/schist.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/schist.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:schist" - ] + "replace": false, + "values": [ + "mineralogy:schist" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/scoria.json b/src/main/resources/data/mineralogy/tags/blocks/stones/scoria.json index 064d4d35b..51d04b13d 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/scoria.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/scoria.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:scoria" - ] + "replace": false, + "values": [ + "mineralogy:scoria" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/shale.json b/src/main/resources/data/mineralogy/tags/blocks/stones/shale.json index f5bb0657a..e95cbccee 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/shale.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/shale.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:shale" - ] + "replace": false, + "values": [ + "mineralogy:shale" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/siltstone.json b/src/main/resources/data/mineralogy/tags/blocks/stones/siltstone.json index d09f8782d..105f43a4d 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/siltstone.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/siltstone.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:siltstone" - ] + "replace": false, + "values": [ + "mineralogy:siltstone" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/slate.json b/src/main/resources/data/mineralogy/tags/blocks/stones/slate.json index a9a6c28e5..75a410d88 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/slate.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/slate.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:slate" - ] + "replace": false, + "values": [ + "mineralogy:slate" + ] } diff --git a/src/main/resources/data/mineralogy/tags/blocks/stones/tuff.json b/src/main/resources/data/mineralogy/tags/blocks/stones/tuff.json index b28c5a07c..922156e16 100644 --- a/src/main/resources/data/mineralogy/tags/blocks/stones/tuff.json +++ b/src/main/resources/data/mineralogy/tags/blocks/stones/tuff.json @@ -1,6 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:tuff" - ] + "replace": false, + "values": [ + "mineralogy:tuff", + "minecraft:tuff" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/cobblestone_equivalents.json b/src/main/resources/data/mineralogy/tags/items/cobblestone_equivalents.json index 3f9669028..dda5bb541 100644 --- a/src/main/resources/data/mineralogy/tags/items/cobblestone_equivalents.json +++ b/src/main/resources/data/mineralogy/tags/items/cobblestone_equivalents.json @@ -1,33 +1,33 @@ { - "replace": false, - "values": [ - "#forge:cobblestone", - "#mineralogy:stones/andesite", - "#mineralogy:stones/basalt", - "#mineralogy:stones/diorite", - "#mineralogy:stones/granite", - "#mineralogy:stones/rhyolite", - "#mineralogy:stones/pegmatite", - "#mineralogy:stones/diabase", - "#mineralogy:stones/gabbro", - "#mineralogy:stones/peridotite", - "#mineralogy:stones/basaltic_glass", - "#mineralogy:stones/scoria", - "#mineralogy:stones/tuff", - "#mineralogy:stones/shale", - "#mineralogy:stones/conglomerate", - "#mineralogy:stones/dolomite", - "#mineralogy:stones/limestone", - "#mineralogy:stones/siltstone", - "#mineralogy:stones/marble", - "#mineralogy:stones/slate", - "#mineralogy:stones/schist", - "#mineralogy:stones/gneiss", - "#mineralogy:stones/phyllite", - "#mineralogy:stones/amphibolite", - "#mineralogy:stones/hornfels", - "#mineralogy:stones/quartzite", - "#mineralogy:stones/novaculite", - "#mineralogy:stones/rock_salt" - ] + "replace": false, + "values": [ + "#forge:cobblestone", + "#mineralogy:stones/andesite", + "#mineralogy:stones/basalt", + "#mineralogy:stones/diorite", + "#mineralogy:stones/granite", + "#mineralogy:stones/rhyolite", + "#mineralogy:stones/pegmatite", + "#mineralogy:stones/diabase", + "#mineralogy:stones/gabbro", + "#mineralogy:stones/peridotite", + "#mineralogy:stones/basaltic_glass", + "#mineralogy:stones/scoria", + "#mineralogy:stones/tuff", + "#mineralogy:stones/shale", + "#mineralogy:stones/conglomerate", + "#mineralogy:stones/dolomite", + "#mineralogy:stones/limestone", + "#mineralogy:stones/siltstone", + "#mineralogy:stones/marble", + "#mineralogy:stones/slate", + "#mineralogy:stones/schist", + "#mineralogy:stones/gneiss", + "#mineralogy:stones/phyllite", + "#mineralogy:stones/amphibolite", + "#mineralogy:stones/hornfels", + "#mineralogy:stones/quartzite", + "#mineralogy:stones/novaculite", + "#mineralogy:stones/rock_salt" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite.json b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite.json index 6c69ddf73..cc4117a83 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:amphibolite_slab" - ] + "replace": false, + "values": [ + "mineralogy:amphibolite_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/brick.json index 46a24f9fd..9db82ccae 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:amphibolite_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:amphibolite_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth.json index 67d861832..5670a0a5f 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:amphibolite_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:amphibolite_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth_brick.json index 789448072..fbbd50b2c 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/amphibolite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:amphibolite_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:amphibolite_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/andesite.json b/src/main/resources/data/mineralogy/tags/items/slabs/andesite.json index a2dad5cbb..2d0d6184e 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/andesite.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/andesite.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:andesite_slab", - "minecraft:andesite_slab" - ] + "replace": false, + "values": [ + "mineralogy:andesite_slab", + "minecraft:andesite_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/andesite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/brick.json index 86fc7b5f6..66931ac90 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/andesite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:andesite_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:andesite_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json index a2cc3c4d9..6fe008cd9 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:andesite_smooth_slab", - "minecraft:polished_andesite_slab" - ] + "replace": false, + "values": [ + "mineralogy:andesite_smooth_slab", + "minecraft:polished_andesite_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth_brick.json index 5318fc8be..397fdafd5 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/andesite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:andesite_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:andesite_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basalt.json b/src/main/resources/data/mineralogy/tags/items/slabs/basalt.json index e9009b136..c86626703 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/basalt.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basalt.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basalt_slab" - ] + "replace": false, + "values": [ + "mineralogy:basalt_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basalt/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/brick.json index 8473ca13e..b7c770d7c 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/basalt/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basalt_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:basalt_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth.json index 01fbe72a9..a61e9fd5d 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basalt_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:basalt_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth_brick.json index e7e72f896..d90666abc 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basalt/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basalt_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:basalt_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass.json b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass.json index 235c14f48..717c00479 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basaltic_glass_slab" - ] + "replace": false, + "values": [ + "mineralogy:basaltic_glass_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/brick.json index ed0d0dddc..5a3e112e8 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basaltic_glass_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:basaltic_glass_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth.json index 9d66a4f36..1a0e8a748 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basaltic_glass_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:basaltic_glass_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth_brick.json index 8dc7c14e0..3ce475146 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/basaltic_glass/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basaltic_glass_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:basaltic_glass_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate.json b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate.json index 87155b98c..d97b6a843 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:conglomerate_slab" - ] + "replace": false, + "values": [ + "mineralogy:conglomerate_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/brick.json index 734d203f0..2970425bc 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:conglomerate_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:conglomerate_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth.json index a91c0394b..d04c77375 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:conglomerate_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:conglomerate_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth_brick.json index 8c5011c1b..d28a89f07 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/conglomerate/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:conglomerate_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:conglomerate_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diabase.json b/src/main/resources/data/mineralogy/tags/items/slabs/diabase.json index eca7810bf..665ed6689 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/diabase.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diabase.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:diabase_slab" - ] + "replace": false, + "values": [ + "mineralogy:diabase_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diabase/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/brick.json index 86dc2e36c..1a8dc00dc 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/diabase/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:diabase_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:diabase_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth.json index 7fe562492..a511e4684 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:diabase_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:diabase_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth_brick.json index 74411ad6d..8e2151cfc 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diabase/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:diabase_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:diabase_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diorite.json b/src/main/resources/data/mineralogy/tags/items/slabs/diorite.json index a788d9f5c..67b558bee 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/diorite.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diorite.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:diorite_slab", - "minecraft:diorite_slab" - ] + "replace": false, + "values": [ + "mineralogy:diorite_slab", + "minecraft:diorite_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diorite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/brick.json index ad21c87ef..6bf529738 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/diorite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:diorite_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:diorite_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json index c9121aee1..20eef8ccb 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:diorite_smooth_slab", - "minecraft:polished_diorite_slab" - ] + "replace": false, + "values": [ + "mineralogy:diorite_smooth_slab", + "minecraft:polished_diorite_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth_brick.json index 0fe1f24d4..7a98dd262 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/diorite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:diorite_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:diorite_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite.json b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite.json index 4629c21aa..4d290eed2 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:dolomite_slab" - ] + "replace": false, + "values": [ + "mineralogy:dolomite_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/brick.json index 38cf3c315..97227b908 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:dolomite_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:dolomite_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth.json index 150097a68..1dc98f76e 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:dolomite_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:dolomite_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth_brick.json index 5be581a10..8dd4268b0 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/dolomite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:dolomite_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:dolomite_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro.json b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro.json index a6417c016..e3576cff4 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gabbro_slab" - ] + "replace": false, + "values": [ + "mineralogy:gabbro_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/brick.json index 86e301bf7..643872776 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gabbro_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:gabbro_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth.json index e76568c00..20e323ef8 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gabbro_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:gabbro_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth_brick.json index 377e70c5d..4e328768c 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gabbro/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gabbro_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:gabbro_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss.json b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss.json index c277f959b..68512d817 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gneiss_slab" - ] + "replace": false, + "values": [ + "mineralogy:gneiss_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/brick.json index c71a3b803..e962d4e9c 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gneiss_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:gneiss_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth.json index a41d0d512..7aa2f746d 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gneiss_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:gneiss_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth_brick.json index c4d892e20..c6a513819 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/gneiss/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gneiss_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:gneiss_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/granite.json b/src/main/resources/data/mineralogy/tags/items/slabs/granite.json index b8277bc3c..892116b2c 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/granite.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/granite.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:granite_slab", - "minecraft:granite_slab" - ] + "replace": false, + "values": [ + "mineralogy:granite_slab", + "minecraft:granite_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/granite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/granite/brick.json index 1f6a1049a..c7c412ec2 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/granite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/granite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:granite_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:granite_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json index a3f8a1a3f..730511a99 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:granite_smooth_slab", - "minecraft:polished_granite_slab" - ] + "replace": false, + "values": [ + "mineralogy:granite_smooth_slab", + "minecraft:polished_granite_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth_brick.json index 2aa54502a..e56697231 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/granite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:granite_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:granite_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels.json b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels.json index 674535f32..408d05b3c 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:hornfels_slab" - ] + "replace": false, + "values": [ + "mineralogy:hornfels_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/brick.json index 547291ff0..4297940a7 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:hornfels_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:hornfels_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth.json index d1265c838..97f5d04e1 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:hornfels_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:hornfels_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth_brick.json index 60132ec26..b1ce7f4db 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/hornfels/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:hornfels_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:hornfels_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/limestone.json b/src/main/resources/data/mineralogy/tags/items/slabs/limestone.json index ff332e77d..e5f7333c1 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/limestone.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/limestone.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:limestone_slab" - ] + "replace": false, + "values": [ + "mineralogy:limestone_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/limestone/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/brick.json index 94765e9fa..ef5bdae0d 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/limestone/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:limestone_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:limestone_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth.json index 909a1d37b..f5701a999 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:limestone_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:limestone_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth_brick.json index c662796c3..113f36066 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/limestone/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:limestone_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:limestone_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/marble.json b/src/main/resources/data/mineralogy/tags/items/slabs/marble.json index f0a05b980..ebda57b3d 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/marble.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/marble.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:marble_slab" - ] + "replace": false, + "values": [ + "mineralogy:marble_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/marble/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/marble/brick.json index fc86044b6..3b9fba246 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/marble/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/marble/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:marble_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:marble_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth.json index e92c5d02e..876baf7d3 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:marble_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:marble_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth_brick.json index b7d2e550e..cc716132c 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/marble/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:marble_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:marble_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite.json b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite.json index 8f4c9718b..2d75804c5 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:novaculite_slab" - ] + "replace": false, + "values": [ + "mineralogy:novaculite_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/brick.json index 73ad82e52..1fa49bab1 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:novaculite_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:novaculite_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth.json index dc2b13442..842a79951 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:novaculite_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:novaculite_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth_brick.json index 085648387..975702399 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/novaculite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:novaculite_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:novaculite_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite.json b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite.json index 52d50562a..85d7de59c 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:pegmatite_slab" - ] + "replace": false, + "values": [ + "mineralogy:pegmatite_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/brick.json index 70c0fb849..a9e624210 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:pegmatite_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:pegmatite_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth.json index f22d74ab7..66f6500ec 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:pegmatite_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:pegmatite_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth_brick.json index d9ffedd98..8ccfcb2a6 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/pegmatite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:pegmatite_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:pegmatite_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite.json b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite.json index 9425b4c32..15551daab 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:peridotite_slab" - ] + "replace": false, + "values": [ + "mineralogy:peridotite_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/brick.json index 4ea5079a6..e31a75bdf 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:peridotite_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:peridotite_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth.json index 940b05161..18572c5d3 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:peridotite_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:peridotite_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth_brick.json index 215baec58..651d50fe3 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/peridotite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:peridotite_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:peridotite_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite.json b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite.json index fa9c15c9e..f727b589a 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:phyllite_slab" - ] + "replace": false, + "values": [ + "mineralogy:phyllite_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/brick.json index 4760ed624..d470beba6 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:phyllite_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:phyllite_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth.json index 842b451dd..a43bb7783 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:phyllite_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:phyllite_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth_brick.json index 4ebdae194..bf5f49a29 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/phyllite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:phyllite_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:phyllite_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite.json b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite.json index 263571ea7..3595ab596 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:quartzite_slab" - ] + "replace": false, + "values": [ + "mineralogy:quartzite_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/brick.json index 32035f3a7..f58f9f563 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:quartzite_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:quartzite_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth.json index 1f73e700e..1dd4e97fe 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:quartzite_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:quartzite_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth_brick.json index 05d19d992..9a998c5dc 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/quartzite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:quartzite_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:quartzite_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite.json b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite.json index 9ec17b051..c185ea5e4 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rhyolite_slab" - ] + "replace": false, + "values": [ + "mineralogy:rhyolite_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/brick.json index 9caa4d7ed..dd1efa5d1 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rhyolite_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:rhyolite_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth.json index 8fda40f22..d41b64b15 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rhyolite_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:rhyolite_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth_brick.json index b5858e7d4..a4932de04 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rhyolite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rhyolite_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:rhyolite_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt.json b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt.json index 0a8068edd..e76862b94 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rock_salt_slab" - ] + "replace": false, + "values": [ + "mineralogy:rock_salt_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/brick.json index 211adf7dc..cd5329250 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rock_salt_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:rock_salt_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth.json index 0ca994774..85a609347 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rock_salt_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:rock_salt_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth_brick.json index 6c3f23062..9864136eb 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/rock_salt/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rock_salt_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:rock_salt_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/schist.json b/src/main/resources/data/mineralogy/tags/items/slabs/schist.json index a9fb96052..a1ce71a3a 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/schist.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/schist.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:schist_slab" - ] + "replace": false, + "values": [ + "mineralogy:schist_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/schist/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/schist/brick.json index 2b3afdc2a..e1306e381 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/schist/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/schist/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:schist_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:schist_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth.json index 06d30fc65..93401df40 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:schist_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:schist_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth_brick.json index be8e69417..c0658afea 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/schist/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:schist_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:schist_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/scoria.json b/src/main/resources/data/mineralogy/tags/items/slabs/scoria.json index c9944d9dc..b58eade46 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/scoria.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/scoria.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:scoria_slab" - ] + "replace": false, + "values": [ + "mineralogy:scoria_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/scoria/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/brick.json index a5899b7e8..9ca979dc7 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/scoria/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:scoria_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:scoria_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth.json index 46f4c2bd5..fbcce69b9 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:scoria_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:scoria_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth_brick.json index 0151b0aa8..a53e4803e 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/scoria/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:scoria_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:scoria_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/shale.json b/src/main/resources/data/mineralogy/tags/items/slabs/shale.json index 872602391..b55c232a4 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/shale.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/shale.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:shale_slab" - ] + "replace": false, + "values": [ + "mineralogy:shale_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/shale/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/shale/brick.json index be65235e7..1981c8a99 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/shale/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/shale/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:shale_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:shale_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth.json index e5e9170c0..662067502 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:shale_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:shale_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth_brick.json index 630314255..77666c63d 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/shale/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:shale_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:shale_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone.json b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone.json index b7f38d8c2..dc95b1428 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:siltstone_slab" - ] + "replace": false, + "values": [ + "mineralogy:siltstone_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/brick.json index 27c478fcb..d461205e9 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:siltstone_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:siltstone_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth.json index abe13b010..0aeafc131 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:siltstone_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:siltstone_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth_brick.json index 136c08404..c90b6e834 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/siltstone/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:siltstone_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:siltstone_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/slate.json b/src/main/resources/data/mineralogy/tags/items/slabs/slate.json index 4a53e2403..6c4f3d89b 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/slate.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/slate.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:slate_slab" - ] + "replace": false, + "values": [ + "mineralogy:slate_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/slate/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/slate/brick.json index 4933a4e75..4aabe2c82 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/slate/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/slate/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:slate_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:slate_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth.json index 981c75014..4e198eb90 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:slate_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:slate_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth_brick.json index 66b48d143..77e8f5b2c 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/slate/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:slate_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:slate_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/tuff.json b/src/main/resources/data/mineralogy/tags/items/slabs/tuff.json index ab5c83bda..55fbe278b 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/tuff.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/tuff.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:tuff_slab" - ] + "replace": false, + "values": [ + "mineralogy:tuff_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/tuff/brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/brick.json index dd9e31c88..079ddf207 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/tuff/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:tuff_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:tuff_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth.json b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth.json index 011c7bf65..5be1ce879 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:tuff_smooth_slab" - ] + "replace": false, + "values": [ + "mineralogy:tuff_smooth_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth_brick.json index bf5975824..6c6dd368b 100644 --- a/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/slabs/tuff/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:tuff_smooth_brick_slab" - ] + "replace": false, + "values": [ + "mineralogy:tuff_smooth_brick_slab" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stone_crafting_materials.json b/src/main/resources/data/mineralogy/tags/items/stone_crafting_materials.json index eb501c330..5643de212 100644 --- a/src/main/resources/data/mineralogy/tags/items/stone_crafting_materials.json +++ b/src/main/resources/data/mineralogy/tags/items/stone_crafting_materials.json @@ -1,33 +1,33 @@ { - "replace": false, - "values": [ - "#minecraft:stone_crafting_materials", - "#mineralogy:stones/andesite", - "#mineralogy:stones/basalt", - "#mineralogy:stones/diorite", - "#mineralogy:stones/granite", - "#mineralogy:stones/rhyolite", - "#mineralogy:stones/pegmatite", - "#mineralogy:stones/diabase", - "#mineralogy:stones/gabbro", - "#mineralogy:stones/peridotite", - "#mineralogy:stones/basaltic_glass", - "#mineralogy:stones/scoria", - "#mineralogy:stones/tuff", - "#mineralogy:stones/shale", - "#mineralogy:stones/conglomerate", - "#mineralogy:stones/dolomite", - "#mineralogy:stones/limestone", - "#mineralogy:stones/siltstone", - "#mineralogy:stones/marble", - "#mineralogy:stones/slate", - "#mineralogy:stones/schist", - "#mineralogy:stones/gneiss", - "#mineralogy:stones/phyllite", - "#mineralogy:stones/amphibolite", - "#mineralogy:stones/hornfels", - "#mineralogy:stones/quartzite", - "#mineralogy:stones/novaculite", - "#mineralogy:stones/rock_salt" - ] + "replace": false, + "values": [ + "#minecraft:stone_crafting_materials", + "#mineralogy:stones/andesite", + "#mineralogy:stones/basalt", + "#mineralogy:stones/diorite", + "#mineralogy:stones/granite", + "#mineralogy:stones/rhyolite", + "#mineralogy:stones/pegmatite", + "#mineralogy:stones/diabase", + "#mineralogy:stones/gabbro", + "#mineralogy:stones/peridotite", + "#mineralogy:stones/basaltic_glass", + "#mineralogy:stones/scoria", + "#mineralogy:stones/tuff", + "#mineralogy:stones/shale", + "#mineralogy:stones/conglomerate", + "#mineralogy:stones/dolomite", + "#mineralogy:stones/limestone", + "#mineralogy:stones/siltstone", + "#mineralogy:stones/marble", + "#mineralogy:stones/slate", + "#mineralogy:stones/schist", + "#mineralogy:stones/gneiss", + "#mineralogy:stones/phyllite", + "#mineralogy:stones/amphibolite", + "#mineralogy:stones/hornfels", + "#mineralogy:stones/quartzite", + "#mineralogy:stones/novaculite", + "#mineralogy:stones/rock_salt" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stone_tool_materials.json b/src/main/resources/data/mineralogy/tags/items/stone_tool_materials.json index 1a3a9a931..d2bd2ba86 100644 --- a/src/main/resources/data/mineralogy/tags/items/stone_tool_materials.json +++ b/src/main/resources/data/mineralogy/tags/items/stone_tool_materials.json @@ -1,33 +1,33 @@ { - "replace": false, - "values": [ - "#minecraft:stone_tool_materials", - "#mineralogy:stones/andesite", - "#mineralogy:stones/basalt", - "#mineralogy:stones/diorite", - "#mineralogy:stones/granite", - "#mineralogy:stones/rhyolite", - "#mineralogy:stones/pegmatite", - "#mineralogy:stones/diabase", - "#mineralogy:stones/gabbro", - "#mineralogy:stones/peridotite", - "#mineralogy:stones/basaltic_glass", - "#mineralogy:stones/scoria", - "#mineralogy:stones/tuff", - "#mineralogy:stones/shale", - "#mineralogy:stones/conglomerate", - "#mineralogy:stones/dolomite", - "#mineralogy:stones/limestone", - "#mineralogy:stones/siltstone", - "#mineralogy:stones/marble", - "#mineralogy:stones/slate", - "#mineralogy:stones/schist", - "#mineralogy:stones/gneiss", - "#mineralogy:stones/phyllite", - "#mineralogy:stones/amphibolite", - "#mineralogy:stones/hornfels", - "#mineralogy:stones/quartzite", - "#mineralogy:stones/novaculite", - "#mineralogy:stones/rock_salt" - ] + "replace": false, + "values": [ + "#minecraft:stone_tool_materials", + "#mineralogy:stones/andesite", + "#mineralogy:stones/basalt", + "#mineralogy:stones/diorite", + "#mineralogy:stones/granite", + "#mineralogy:stones/rhyolite", + "#mineralogy:stones/pegmatite", + "#mineralogy:stones/diabase", + "#mineralogy:stones/gabbro", + "#mineralogy:stones/peridotite", + "#mineralogy:stones/basaltic_glass", + "#mineralogy:stones/scoria", + "#mineralogy:stones/tuff", + "#mineralogy:stones/shale", + "#mineralogy:stones/conglomerate", + "#mineralogy:stones/dolomite", + "#mineralogy:stones/limestone", + "#mineralogy:stones/siltstone", + "#mineralogy:stones/marble", + "#mineralogy:stones/slate", + "#mineralogy:stones/schist", + "#mineralogy:stones/gneiss", + "#mineralogy:stones/phyllite", + "#mineralogy:stones/amphibolite", + "#mineralogy:stones/hornfels", + "#mineralogy:stones/quartzite", + "#mineralogy:stones/novaculite", + "#mineralogy:stones/rock_salt" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite.json b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite.json index 26e1eac26..5cdea399b 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:amphibolite" - ] + "replace": false, + "values": [ + "mineralogy:amphibolite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/brick.json index 09c0bacbd..1651716ad 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:amphibolite_brick" - ] + "replace": false, + "values": [ + "mineralogy:amphibolite_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth.json index 896936dfe..a891ba7f8 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:amphibolite_smooth" - ] + "replace": false, + "values": [ + "mineralogy:amphibolite_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth_brick.json index 42c31f259..48eb807c9 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/amphibolite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:amphibolite_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:amphibolite_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/andesite.json b/src/main/resources/data/mineralogy/tags/items/stones/andesite.json index 0680f2507..708588bcd 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/andesite.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/andesite.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:andesite", - "minecraft:andesite" - ] + "replace": false, + "values": [ + "mineralogy:andesite", + "minecraft:andesite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/andesite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/andesite/brick.json index 664447e78..65dd79abf 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/andesite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/andesite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:andesite_brick" - ] + "replace": false, + "values": [ + "mineralogy:andesite_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json index 66bc8782f..a69cca9fa 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:andesite_smooth", - "minecraft:polished_andesite" - ] + "replace": false, + "values": [ + "mineralogy:andesite_smooth", + "minecraft:polished_andesite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth_brick.json index 7d8ea7173..77fa030cc 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/andesite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:andesite_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:andesite_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basalt.json b/src/main/resources/data/mineralogy/tags/items/stones/basalt.json index e0e10bf52..1ae916657 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/basalt.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/basalt.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:basalt", - "minecraft:basalt" - ] + "replace": false, + "values": [ + "mineralogy:basalt", + "minecraft:basalt" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basalt/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/basalt/brick.json index b11e0a450..49e671bdb 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/basalt/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/basalt/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basalt_brick" - ] + "replace": false, + "values": [ + "mineralogy:basalt_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json index ee0c0c15b..4a744d51b 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "mineralogy:basalt_smooth", - "minecraft:polished_basalt" - ] + "replace": false, + "values": [ + "mineralogy:basalt_smooth", + "minecraft:polished_basalt", + "minecraft:smooth_basalt" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth_brick.json index 78d3151ba..3118bb8c9 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/basalt/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basalt_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:basalt_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass.json b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass.json index 59c1e89a3..9cb3a5c60 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basaltic_glass" - ] + "replace": false, + "values": [ + "mineralogy:basaltic_glass" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/brick.json index c3e714d9b..ca6b5c874 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basaltic_glass_brick" - ] + "replace": false, + "values": [ + "mineralogy:basaltic_glass_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth.json index 5d316108c..c26bf62e0 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basaltic_glass_smooth" - ] + "replace": false, + "values": [ + "mineralogy:basaltic_glass_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth_brick.json index 5683c3449..687a62cb9 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/basaltic_glass/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:basaltic_glass_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:basaltic_glass_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate.json b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate.json index e4e289fb2..9a8db044e 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:conglomerate" - ] + "replace": false, + "values": [ + "mineralogy:conglomerate" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/brick.json index 16c776423..dbb375208 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:conglomerate_brick" - ] + "replace": false, + "values": [ + "mineralogy:conglomerate_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth.json index ed03eccae..e9b9b7d51 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:conglomerate_smooth" - ] + "replace": false, + "values": [ + "mineralogy:conglomerate_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth_brick.json index eb4fade20..0c58445bb 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/conglomerate/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:conglomerate_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:conglomerate_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diabase.json b/src/main/resources/data/mineralogy/tags/items/stones/diabase.json index c53507246..b1d74d01e 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/diabase.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/diabase.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:diabase" - ] + "replace": false, + "values": [ + "mineralogy:diabase" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diabase/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/diabase/brick.json index e8f95bf2d..dfd293283 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/diabase/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/diabase/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:diabase_brick" - ] + "replace": false, + "values": [ + "mineralogy:diabase_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth.json index f82c21daa..3931e59c9 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:diabase_smooth" - ] + "replace": false, + "values": [ + "mineralogy:diabase_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth_brick.json index 8f7a84978..c4039acd1 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/diabase/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:diabase_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:diabase_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diorite.json b/src/main/resources/data/mineralogy/tags/items/stones/diorite.json index 8d8329944..a6c473010 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/diorite.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/diorite.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:diorite", - "minecraft:diorite" - ] + "replace": false, + "values": [ + "mineralogy:diorite", + "minecraft:diorite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diorite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/diorite/brick.json index bb7d68cd5..44f75de23 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/diorite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/diorite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:diorite_brick" - ] + "replace": false, + "values": [ + "mineralogy:diorite_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json index 1e9107888..28fc952bd 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:diorite_smooth", - "minecraft:polished_diorite" - ] + "replace": false, + "values": [ + "mineralogy:diorite_smooth", + "minecraft:polished_diorite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth_brick.json index 82d7dba0f..9d2661c01 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/diorite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:diorite_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:diorite_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/dolomite.json b/src/main/resources/data/mineralogy/tags/items/stones/dolomite.json index 1ed6b212d..f329a9162 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/dolomite.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/dolomite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:dolomite" - ] + "replace": false, + "values": [ + "mineralogy:dolomite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/dolomite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/brick.json index 7687e5979..c010f8c2e 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/dolomite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:dolomite_brick" - ] + "replace": false, + "values": [ + "mineralogy:dolomite_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth.json index 80a03fa1f..d1e984d14 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:dolomite_smooth" - ] + "replace": false, + "values": [ + "mineralogy:dolomite_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth_brick.json index 80d7e45bc..2f74306bc 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/dolomite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:dolomite_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:dolomite_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gabbro.json b/src/main/resources/data/mineralogy/tags/items/stones/gabbro.json index d2d73ceb1..2b664843f 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/gabbro.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/gabbro.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gabbro" - ] + "replace": false, + "values": [ + "mineralogy:gabbro" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gabbro/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/brick.json index 6ee0d9b94..1a4f230f9 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/gabbro/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gabbro_brick" - ] + "replace": false, + "values": [ + "mineralogy:gabbro_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth.json index 2991c2caf..ce9b70813 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gabbro_smooth" - ] + "replace": false, + "values": [ + "mineralogy:gabbro_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth_brick.json index dba246ae4..53dea2b13 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/gabbro/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gabbro_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:gabbro_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gneiss.json b/src/main/resources/data/mineralogy/tags/items/stones/gneiss.json index 6d15d2677..a19fbac88 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/gneiss.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/gneiss.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gneiss" - ] + "replace": false, + "values": [ + "mineralogy:gneiss" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gneiss/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/brick.json index b70ba68ac..6a784a9fb 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/gneiss/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gneiss_brick" - ] + "replace": false, + "values": [ + "mineralogy:gneiss_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth.json index bc0ba263f..211fd8983 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gneiss_smooth" - ] + "replace": false, + "values": [ + "mineralogy:gneiss_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth_brick.json index 45acbec54..5ab5d0aaa 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/gneiss/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:gneiss_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:gneiss_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/granite.json b/src/main/resources/data/mineralogy/tags/items/stones/granite.json index 817e7c5da..ae5dd9590 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/granite.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/granite.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:granite", - "minecraft:granite" - ] + "replace": false, + "values": [ + "mineralogy:granite", + "minecraft:granite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/granite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/granite/brick.json index c16cf5c6b..b4f65a8a6 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/granite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/granite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:granite_brick" - ] + "replace": false, + "values": [ + "mineralogy:granite_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json index 8c7cecd8a..947518d8b 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:granite_smooth", - "minecraft:polished_granite" - ] + "replace": false, + "values": [ + "mineralogy:granite_smooth", + "minecraft:polished_granite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth_brick.json index 404ac981b..a68aa55e3 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/granite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:granite_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:granite_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/hornfels.json b/src/main/resources/data/mineralogy/tags/items/stones/hornfels.json index 59acdf116..7ec83bdd3 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/hornfels.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/hornfels.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:hornfels" - ] + "replace": false, + "values": [ + "mineralogy:hornfels" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/hornfels/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/brick.json index 6aa77206d..fa6cbf595 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/hornfels/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:hornfels_brick" - ] + "replace": false, + "values": [ + "mineralogy:hornfels_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth.json index 07cebd176..9f6801294 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:hornfels_smooth" - ] + "replace": false, + "values": [ + "mineralogy:hornfels_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth_brick.json index ffea474be..9da4b03c2 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/hornfels/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:hornfels_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:hornfels_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/limestone.json b/src/main/resources/data/mineralogy/tags/items/stones/limestone.json index ae25aec9e..3f32e2ff2 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/limestone.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/limestone.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:limestone" - ] + "replace": false, + "values": [ + "mineralogy:limestone" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/limestone/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/limestone/brick.json index 6b0d439c2..f49563caf 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/limestone/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/limestone/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:limestone_brick" - ] + "replace": false, + "values": [ + "mineralogy:limestone_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth.json index 507e26428..d45ba82ba 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:limestone_smooth" - ] + "replace": false, + "values": [ + "mineralogy:limestone_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth_brick.json index 4fdaa20ac..4e7f4269e 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/limestone/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:limestone_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:limestone_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/marble.json b/src/main/resources/data/mineralogy/tags/items/stones/marble.json index e22e67bb1..bdb724467 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/marble.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/marble.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:marble" - ] + "replace": false, + "values": [ + "mineralogy:marble" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/marble/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/marble/brick.json index 5929140c8..7359596ec 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/marble/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/marble/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:marble_brick" - ] + "replace": false, + "values": [ + "mineralogy:marble_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth.json index 4a4461db9..4ec76fe47 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:marble_smooth" - ] + "replace": false, + "values": [ + "mineralogy:marble_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth_brick.json index 43df1bb35..ed9758ea4 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/marble/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:marble_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:marble_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/novaculite.json b/src/main/resources/data/mineralogy/tags/items/stones/novaculite.json index 2339a11c9..74fb17da3 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/novaculite.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/novaculite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:novaculite" - ] + "replace": false, + "values": [ + "mineralogy:novaculite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/novaculite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/brick.json index dbf80694b..5572d90dd 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/novaculite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:novaculite_brick" - ] + "replace": false, + "values": [ + "mineralogy:novaculite_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth.json index 4051ebdc5..99993cecc 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:novaculite_smooth" - ] + "replace": false, + "values": [ + "mineralogy:novaculite_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth_brick.json index 08c1ee6dc..b393df328 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/novaculite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:novaculite_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:novaculite_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite.json b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite.json index 442dbf678..7675fc010 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:pegmatite" - ] + "replace": false, + "values": [ + "mineralogy:pegmatite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/brick.json index d3eb34db3..79089e743 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:pegmatite_brick" - ] + "replace": false, + "values": [ + "mineralogy:pegmatite_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth.json index 08eed28b3..f0cd06b16 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:pegmatite_smooth" - ] + "replace": false, + "values": [ + "mineralogy:pegmatite_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth_brick.json index acd0d803f..c947fbd24 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/pegmatite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:pegmatite_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:pegmatite_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/peridotite.json b/src/main/resources/data/mineralogy/tags/items/stones/peridotite.json index d774099e2..34de42c18 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/peridotite.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/peridotite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:peridotite" - ] + "replace": false, + "values": [ + "mineralogy:peridotite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/peridotite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/brick.json index 63d016f1b..d5164e79e 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/peridotite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:peridotite_brick" - ] + "replace": false, + "values": [ + "mineralogy:peridotite_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth.json index df0eb7298..05cc3984e 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:peridotite_smooth" - ] + "replace": false, + "values": [ + "mineralogy:peridotite_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth_brick.json index 8c09bb92d..f4aea4223 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/peridotite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:peridotite_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:peridotite_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/phyllite.json b/src/main/resources/data/mineralogy/tags/items/stones/phyllite.json index f705ab15b..991dc28d5 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/phyllite.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/phyllite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:phyllite" - ] + "replace": false, + "values": [ + "mineralogy:phyllite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/phyllite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/brick.json index 48217ba35..9e33f47aa 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/phyllite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:phyllite_brick" - ] + "replace": false, + "values": [ + "mineralogy:phyllite_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth.json index 0262774fc..6c74aea08 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:phyllite_smooth" - ] + "replace": false, + "values": [ + "mineralogy:phyllite_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth_brick.json index 5a4d2ab25..d381910bc 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/phyllite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:phyllite_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:phyllite_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/quartzite.json b/src/main/resources/data/mineralogy/tags/items/stones/quartzite.json index 21db863d4..f539e57f9 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/quartzite.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/quartzite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:quartzite" - ] + "replace": false, + "values": [ + "mineralogy:quartzite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/quartzite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/brick.json index 52e4999bb..ae21a9047 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/quartzite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:quartzite_brick" - ] + "replace": false, + "values": [ + "mineralogy:quartzite_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth.json index 93425eab3..f29a3ef24 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:quartzite_smooth" - ] + "replace": false, + "values": [ + "mineralogy:quartzite_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth_brick.json index 2331a2b9b..73b47a97a 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/quartzite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:quartzite_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:quartzite_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite.json b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite.json index 77c7ece7b..460e41c8e 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rhyolite" - ] + "replace": false, + "values": [ + "mineralogy:rhyolite" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/brick.json index 13795d330..324c3af21 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rhyolite_brick" - ] + "replace": false, + "values": [ + "mineralogy:rhyolite_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth.json index c0efe6ff2..37b2943cc 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rhyolite_smooth" - ] + "replace": false, + "values": [ + "mineralogy:rhyolite_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth_brick.json index 0d66a8397..3fb64d82b 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/rhyolite/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rhyolite_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:rhyolite_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt.json b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt.json index 8133cee26..24df4c009 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rock_salt" - ] + "replace": false, + "values": [ + "mineralogy:rock_salt" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/brick.json index 817a098e1..a66102e22 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rock_salt_brick" - ] + "replace": false, + "values": [ + "mineralogy:rock_salt_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth.json index 06d1768f9..cb1591d29 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rock_salt_smooth" - ] + "replace": false, + "values": [ + "mineralogy:rock_salt_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth_brick.json index a4201fe22..b63b027b0 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/rock_salt/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:rock_salt_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:rock_salt_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/schist.json b/src/main/resources/data/mineralogy/tags/items/stones/schist.json index 61f16050a..ba6cdfc2c 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/schist.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/schist.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:schist" - ] + "replace": false, + "values": [ + "mineralogy:schist" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/schist/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/schist/brick.json index fc9085b03..9e7adbfbf 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/schist/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/schist/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:schist_brick" - ] + "replace": false, + "values": [ + "mineralogy:schist_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth.json index 909bf8736..35372ad18 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:schist_smooth" - ] + "replace": false, + "values": [ + "mineralogy:schist_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth_brick.json index 2c5fef98b..b1eaa31df 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/schist/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:schist_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:schist_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/scoria.json b/src/main/resources/data/mineralogy/tags/items/stones/scoria.json index 064d4d35b..51d04b13d 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/scoria.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/scoria.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:scoria" - ] + "replace": false, + "values": [ + "mineralogy:scoria" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/scoria/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/scoria/brick.json index e9b5259e7..d752ece67 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/scoria/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/scoria/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:scoria_brick" - ] + "replace": false, + "values": [ + "mineralogy:scoria_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth.json index 4868f7e4d..72faf39b1 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:scoria_smooth" - ] + "replace": false, + "values": [ + "mineralogy:scoria_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth_brick.json index ebe08dc1c..3d375e806 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/scoria/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:scoria_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:scoria_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/shale.json b/src/main/resources/data/mineralogy/tags/items/stones/shale.json index f5bb0657a..e95cbccee 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/shale.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/shale.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:shale" - ] + "replace": false, + "values": [ + "mineralogy:shale" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/shale/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/shale/brick.json index fa80fcdf2..645bac6d1 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/shale/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/shale/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:shale_brick" - ] + "replace": false, + "values": [ + "mineralogy:shale_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth.json index 6459ae55c..c0ac17bed 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:shale_smooth" - ] + "replace": false, + "values": [ + "mineralogy:shale_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth_brick.json index 91555bf03..f87e41f64 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/shale/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:shale_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:shale_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/siltstone.json b/src/main/resources/data/mineralogy/tags/items/stones/siltstone.json index d09f8782d..105f43a4d 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/siltstone.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/siltstone.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:siltstone" - ] + "replace": false, + "values": [ + "mineralogy:siltstone" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/siltstone/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/brick.json index 4938dfb4b..e156e2851 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/siltstone/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:siltstone_brick" - ] + "replace": false, + "values": [ + "mineralogy:siltstone_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth.json index c9102dbd7..40a652aba 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:siltstone_smooth" - ] + "replace": false, + "values": [ + "mineralogy:siltstone_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth_brick.json index 6a1503d2d..3ace16070 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/siltstone/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:siltstone_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:siltstone_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/slate.json b/src/main/resources/data/mineralogy/tags/items/stones/slate.json index a9a6c28e5..75a410d88 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/slate.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/slate.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:slate" - ] + "replace": false, + "values": [ + "mineralogy:slate" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/slate/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/slate/brick.json index 615cf2cc3..8d291b1f2 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/slate/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/slate/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:slate_brick" - ] + "replace": false, + "values": [ + "mineralogy:slate_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth.json index 00d738b2e..ead7f959d 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:slate_smooth" - ] + "replace": false, + "values": [ + "mineralogy:slate_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth_brick.json index 2296b997b..50301895c 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/slate/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:slate_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:slate_smooth_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/tuff.json b/src/main/resources/data/mineralogy/tags/items/stones/tuff.json index b28c5a07c..922156e16 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/tuff.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/tuff.json @@ -1,6 +1,7 @@ { - "replace": false, - "values": [ - "mineralogy:tuff" - ] + "replace": false, + "values": [ + "mineralogy:tuff", + "minecraft:tuff" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/tuff/brick.json b/src/main/resources/data/mineralogy/tags/items/stones/tuff/brick.json index f156dac18..1c1e95f53 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/tuff/brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/tuff/brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:tuff_brick" - ] + "replace": false, + "values": [ + "mineralogy:tuff_brick" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth.json b/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth.json index 008c2f3a3..09c8e7619 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:tuff_smooth" - ] + "replace": false, + "values": [ + "mineralogy:tuff_smooth" + ] } diff --git a/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth_brick.json b/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth_brick.json index 08fc4afec..db7ed6370 100644 --- a/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth_brick.json +++ b/src/main/resources/data/mineralogy/tags/items/stones/tuff/smooth_brick.json @@ -1,6 +1,6 @@ { - "replace": false, - "values": [ - "mineralogy:tuff_smooth_brick" - ] + "replace": false, + "values": [ + "mineralogy:tuff_smooth_brick" + ] } diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 790304aa1..67b250017 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -2,6 +2,6 @@ "pack": { "description": "Minecraft Mineralogy", "pack_format": 7, - "_comment": "A pack_format of 6 is required for Minecraft 1.16.2+ resource packs." + "_comment": "A pack_format of 7 is required for Minecraft 1.17 resource packs." } } diff --git a/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java index dd3d42023..aa7194241 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/GameplayContractTest.java @@ -41,7 +41,9 @@ public void creativePolicyUsesReliefBeforeSlabAndFiveGroups() throws Exception { assertTrue(groups.contains("create(\"slab\", \"basalt_slab\")")); assertTrue(groups.contains("create(\"wall\", \"basalt_wall\")")); assertTrue(groups.contains("create(\"item\", \"sulfur_dust\")")); - assertTrue(groups.contains("ItemGroup.MATERIALS")); + assertTrue(groups.contains("CreativeModeTab.TAB_MATERIALS")); + assertTrue(groups.contains("public boolean hasSearchBar()")); + assertTrue(groups.contains("textures/gui/container/creative_inventory/tab_item_search.png")); CreativeTabPolicy grouped = new CreativeTabPolicy(true); assertTrue(grouped.groupTabsByType()); @@ -66,15 +68,15 @@ public void dropsSlabsAndFurnacePersistenceFollowAcceptedSemantics() throws Exce assertTrue(slab.contains("new ItemStack(drops, 2)")); assertTrue(slab.contains("Collections.singletonList(new ItemStack(fullBlock))")); String furnace = text("src/main/java/zone/moddev/mc/mineralogy/tileentity/TileEntityRockFurnace.java"); - assertTrue(furnace.contains("public TileEntityRockFurnace()")); + assertTrue(furnace.contains("public TileEntityRockFurnace(BlockPos pos, BlockState state)")); assertTrue(furnace.contains("BlockState state = getBlockState()")); assertTrue(furnace.contains("Block block = state.getBlock()")); assertTrue(furnace.contains("getBurnModifier()")); - assertTrue(furnace.contains("ItemStackHelper.loadAllItems")); + assertTrue(furnace.contains("ContainerHelper.loadAllItems")); String lamp = text("src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java"); assertTrue(lamp.contains("facing.getAxis().isVertical()")); - assertTrue(lamp.contains("Block.hasEnoughSolidSide(world, supportPos, facing)")); + assertTrue(lamp.contains("Block.canSupportCenter(world, supportPos, facing)")); } @Test @@ -96,8 +98,9 @@ public void cobblestonePolicyReappliesAfterReloadAndKeepsSpecialCases() throws E assertTrue(policy.contains("replaceElementsInPlace(required(itemTags, COBBLESTONE), items)")); assertTrue(policy.contains("STONE_CRAFTING_MATERIALS")); assertTrue(policy.contains("STONE_TOOL_MATERIALS")); - assertTrue(policy.contains("setRetainedField")); - assertFalse(policy.contains("TagRegistryManager.fetchTags")); + assertTrue(policy.contains("SetTag.create(values)")); + assertTrue(policy.contains("field.set(tag, field.get(replacement))")); + assertFalse(policy.contains("TagCollectionManager")); assertTrue(policy.contains("Ingredient.invalidateAll()")); } @@ -111,17 +114,17 @@ public void optionalGunpowderDustsCannotCollapseToTwoIngredients() throws Except } @Test - public void forge36OilUsesNativeFlowingFluidRendering() throws Exception { + public void forge37OilUsesNativeFlowingFluidRendering() throws Exception { String fluid = text("src/main/java/zone/moddev/mc/mineralogy/fluids/MineralogyFluids.java"); assertTrue(fluid.contains("ForgeFlowingFluid.Source")); assertTrue(fluid.contains("ForgeFlowingFluid.Flowing")); - assertTrue(fluid.contains("FlowingFluidBlock")); + assertTrue(fluid.contains("LiquidBlock")); assertTrue(fluid.contains("BucketItem")); assertTrue(fluid.contains("blocks/crude_oil_still")); assertTrue(fluid.contains("blocks/crude_oil_flow")); String client = text("src/main/java/zone/moddev/mc/mineralogy/client/ClientSetup.java"); - assertTrue(client.contains("RenderTypeLookup.setRenderLayer(MineralogyFluids.CRUDE_OIL")); - assertTrue(client.contains("RenderType.getTranslucent()")); + assertTrue(client.contains("ItemBlockRenderTypes.setRenderLayer(MineralogyFluids.CRUDE_OIL")); + assertTrue(client.contains("RenderType.translucent()")); assertFalse(new File("src/main/java/zone/moddev/mc/mineralogy/client/ClientOilRenderer.java").exists()); } @@ -133,29 +136,38 @@ public void legacyWorldConversionPreservesIndexedChunksAndFurnaces() throws Exce assertTrue(hook.contains("TerrainPopulated")); assertTrue(hook.contains("LightPopulated")); assertTrue(hook.contains("rewriteLegacyRockFurnaceTileEntities")); - assertTrue(hook.contains("normalizeLegacyTileEntityIds(level)")); - assertTrue(new File("src/main/java/zone/moddev/mc/mineralogy/patching/LegacyTileEntityIdNormalizer.java").exists()); + assertTrue(hook.contains("tileEntity.putString(\"id\", ROCK_FURNACE_TILE_ENTITY)")); String transformer = text("src/main/resources/coremods/mineralogy_legacy_world_fix.js"); assertTrue(transformer.contains("mineralogy_legacy_chunk_data")); - assertTrue(transformer.contains("net.minecraft.world.chunk.storage.ChunkLoader")); + assertTrue(transformer.contains("net.minecraft.world.level.chunk.storage.ChunkStorage")); assertTrue(transformer.contains("prepareLegacyChunk")); assertTrue(transformer.contains("finalizeLegacyChunk")); + + String mappings = text("src/main/java/zone/moddev/mc/mineralogy/patching/PatchHandler.java"); + assertTrue(mappings.contains("GRASS_PATH")); + assertTrue(mappings.contains("DIRT_PATH")); + assertTrue(mappings.contains("SWEET_BERRIES_PICK")); + assertTrue(mappings.contains("SWEET_BERRY_BUSH_PICK")); + assertTrue(mappings.contains("ForgeRegistries.SOUND_EVENTS")); + assertTrue(mappings.contains("bus = Mod.EventBusSubscriber.Bus.FORGE")); + assertTrue(mappings.contains("event.getAllMappings()")); } @Test public void legacyFlatteningUsesTheExpandedArrayAndReinstallsTheSelectedWorldMapping() throws Exception { String hook = text("src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java"); assertTrue(hook.contains("expandFlatteningTable(highestStateId + 1)")); - assertTrue(hook.contains("valuesField.getType().getComponentType() != Dynamic.class")); - assertTrue(hook.contains("addEntry.invoke")); + assertTrue(hook.contains("type.getComponentType() != Dynamic.class")); + assertTrue(hook.contains("legacyStates[stateId] = BlockStateData.parse(stateNbt)")); + assertTrue(hook.contains("unsafe.putObjectVolatile(base, offset, expanded)")); assertTrue(hook.contains("WorldPersistenceHooks.addHook")); assertTrue(hook.contains("writeSidecar(levelDat.getParentFile(), blocks)")); - assertTrue(hook.contains("install(levelDat.getParentFile(), CompressedStreamTools.readCompressed(input)")); + assertTrue(hook.contains("prepareLegacyWorld(levelDat)")); String build = text("build.gradle"); assertTrue(build.contains("dependsOn tasks.named('processResources')")); - assertTrue(build.contains("mineralogy%%${mainOutput}${File.pathSeparator}")); + assertTrue(build.contains("mineralogy%%${mainOutput}")); assertTrue(build.contains("from processedResources")); assertTrue(build.contains("data/mineralogy/orespawn/provider.json")); assertTrue(build.contains("Eclipse output contains stale processed production resources")); diff --git a/src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java b/src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java index 9d92569dd..e0695ec7e 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/LocalizationQualityTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.*; -/** Quality policy for the reviewed 1.16.5 JSON localization inventory. */ +/** Quality policy for the reviewed 1.17.1 JSON localization inventory. */ public class LocalizationQualityTest { private static final File LANG_DIR = new File("src/main/resources/assets/mineralogy/lang"); private static final Set ENGLISH_LOCALES = new HashSet(Arrays.asList( diff --git a/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java b/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java index 5b7a17c2a..42e7793a0 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/NativeRecipeManagerTest.java @@ -18,21 +18,25 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import net.minecraft.block.Blocks; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.CraftingInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.ICraftingRecipe; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.RecipeManager; -import net.minecraft.tags.ITag; -import net.minecraft.tags.ITagCollection; -import net.minecraft.tags.ITagCollectionSupplier; -import net.minecraft.tags.TagCollectionManager; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.registry.Bootstrap; +import net.minecraft.core.Registry; +import net.minecraft.SharedConstants; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.Bootstrap; +import net.minecraft.tags.SerializationTags; +import net.minecraft.tags.SetTag; +import net.minecraft.tags.Tag; +import net.minecraft.tags.TagCollection; +import net.minecraft.tags.TagContainer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.CraftingContainer; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.CraftingRecipe; +import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.item.crafting.RecipeManager; +import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.crafting.VanillaIngredientSerializer; import net.minecraftforge.common.crafting.conditions.NotCondition; @@ -45,16 +49,10 @@ public class NativeRecipeManagerTest { private static final File RECIPE_ROOT = new File("src/main/resources/data/minecraft/recipes"); private static final File MINERALOGY_RECIPE_ROOT = new File( "src/main/resources/data/mineralogy/recipes"); - private static final Container DUMMY_CONTAINER = new Container(null, -1) { - @Override - public boolean canInteractWith(PlayerEntity playerIn) { - return false; - } - }; - @BeforeClass public static void initializeRegistriesAndConditions() { - Bootstrap.register(); + SharedConstants.tryDetectVersion(); + Bootstrap.bootStrap(); CraftingHelper.register(NotCondition.Serializer.INSTANCE); CraftingHelper.register(new ResourceLocation("minecraft", "item"), VanillaIngredientSerializer.INSTANCE); @@ -62,39 +60,58 @@ public static void initializeRegistriesAndConditions() { } @Test - public void enabledNativeBasaltMatchesEveryCoveredVanillaRecipe() throws Exception { - ITagCollectionSupplier previous = TagCollectionManager.getManager(); + public void enabledNativeAndLegacyFamilyRepresentativesMatchEveryCoveredVanillaRecipe() + throws Exception { + TagContainer previous = SerializationTags.getInstance(); try { installRecipeTags(); loadConfig(true); - for (String recipeName : recipeNames()) { - ICraftingRecipe recipe = recipe(recipeName); - CraftingInventory inventory = inventory(recipeName, Blocks.BASALT.asItem()); - assertTrue(recipeName, recipe.matches(inventory, null)); - assertEquals(recipeName, "minecraft:" + recipeName, - recipe.getRecipeOutput().getItem().getRegistryName().toString()); + for (Item rock : ordinaryRockInputs()) { + for (String recipeName : recipeNames()) { + CraftingRecipe recipe = recipe(recipeName); + CraftingContainer inventory = inventory(recipeName, rock); + assertTrue(recipeName + " with " + Registry.ITEM.getKey(rock), + recipe.matches(inventory, null)); + String expectedOutput = recipeName.startsWith("mossy_cobblestone_from_") + ? "minecraft:mossy_cobblestone" : "minecraft:" + recipeName; + assertEquals(recipeName, expectedOutput, + Registry.ITEM.getKey(recipe.getResultItem().getItem()).toString()); + } } } finally { - TagCollectionManager.setManager(previous); + SerializationTags.bind(previous); } } @Test - public void disabledEquivalenceRejectsBasaltButKeepsVanillaMaterials() throws Exception { - ITagCollectionSupplier previous = TagCollectionManager.getManager(); + public void disabledEquivalenceRejectsOrdinaryFamiliesButKeepsVanillaChertAndPumice() + throws Exception { + TagContainer previous = SerializationTags.getInstance(); try { installRecipeTags(); loadConfig(false); for (String recipeName : recipeNames()) { - ICraftingRecipe recipe = recipe(recipeName); - assertFalse(recipeName, recipe.matches(inventory(recipeName, Blocks.BASALT.asItem()), null)); + CraftingRecipe recipe = recipe(recipeName); + for (Item rock : ordinaryRockInputs()) { + assertFalse(recipeName + " with " + Registry.ITEM.getKey(rock), + recipe.matches(inventory(recipeName, rock), null)); + } assertTrue(recipeName, recipe.matches(inventory(recipeName, Blocks.COBBLESTONE.asItem()), null)); + // Stand-ins for always-tagged Mineralogy chert and pumice. + assertTrue(recipeName + " with chert stand-in", + recipe.matches(inventory(recipeName, Blocks.NETHERRACK.asItem()), null)); + assertTrue(recipeName + " with pumice stand-in", + recipe.matches(inventory(recipeName, Blocks.END_STONE.asItem()), null)); } assertTrue(recipe("furnace").matches(inventory("furnace", Blocks.BLACKSTONE.asItem()), null)); assertTrue(recipe("brewing_stand").matches( inventory("brewing_stand", Blocks.BLACKSTONE.asItem()), null)); + assertTrue(recipe("furnace").matches( + inventory("furnace", Blocks.COBBLED_DEEPSLATE.asItem()), null)); + assertTrue(recipe("stone_pickaxe").matches( + inventory("stone_pickaxe", Blocks.COBBLED_DEEPSLATE.asItem()), null)); } finally { - TagCollectionManager.setManager(previous); + SerializationTags.bind(previous); } } @@ -117,39 +134,52 @@ public void nativeAndMineralogySlabsConvertExactlyOneForOneInBothDirections() private static void assertSlabConversion(String prefix, Item vanilla) throws Exception { Item standIn = Blocks.COBBLESTONE.asItem(); - ICraftingRecipe toVanilla = mineralogyRecipe(prefix + "_to_vanilla", standIn); + CraftingRecipe toVanilla = mineralogyRecipe(prefix + "_to_vanilla", standIn); assertTrue(prefix, toVanilla.matches(shapeless(new ItemStack(standIn)), null)); assertFalse(prefix, toVanilla.matches(shapeless(new ItemStack(vanilla)), null)); - assertEquals(prefix, vanilla, toVanilla.getRecipeOutput().getItem()); - assertEquals(prefix, 1, toVanilla.getRecipeOutput().getCount()); + assertEquals(prefix, vanilla, toVanilla.getResultItem().getItem()); + assertEquals(prefix, 1, toVanilla.getResultItem().getCount()); - ICraftingRecipe fromVanilla = mineralogyRecipe(prefix + "_from_vanilla", standIn); + CraftingRecipe fromVanilla = mineralogyRecipe(prefix + "_from_vanilla", standIn); assertTrue(prefix, fromVanilla.matches(shapeless(new ItemStack(vanilla)), null)); assertFalse(prefix, fromVanilla.matches(shapeless(new ItemStack(standIn)), null)); - assertEquals(prefix, standIn, fromVanilla.getRecipeOutput().getItem()); - assertEquals(prefix, 1, fromVanilla.getRecipeOutput().getCount()); + assertEquals(prefix, standIn, fromVanilla.getResultItem().getItem()); + assertEquals(prefix, 1, fromVanilla.getResultItem().getCount()); } private static void installRecipeTags() { - Map> tags = new LinkedHashMap>(); - tags.put(id("forge:cobblestone"), tag(Blocks.COBBLESTONE.asItem())); + Map> tags = new LinkedHashMap>(); + tags.put(id("forge:cobblestone"), tag(Blocks.COBBLESTONE.asItem(), + Blocks.NETHERRACK.asItem(), Blocks.END_STONE.asItem())); tags.put(id("minecraft:stone_crafting_materials"), - tag(Blocks.COBBLESTONE.asItem(), Blocks.BLACKSTONE.asItem())); - tags.put(id("minecraft:stone_tool_materials"), tag(Blocks.COBBLESTONE.asItem())); + tag(Blocks.COBBLESTONE.asItem(), Blocks.BLACKSTONE.asItem(), + Blocks.COBBLED_DEEPSLATE.asItem(), Blocks.NETHERRACK.asItem(), + Blocks.END_STONE.asItem())); + tags.put(id("minecraft:stone_tool_materials"), tag(Blocks.COBBLESTONE.asItem(), + Blocks.BLACKSTONE.asItem(), Blocks.COBBLED_DEEPSLATE.asItem(), + Blocks.NETHERRACK.asItem(), Blocks.END_STONE.asItem())); tags.put(id("minecraft:planks"), tag(Blocks.OAK_PLANKS.asItem())); tags.put(id("mineralogy:cobblestone_equivalents"), - tag(Blocks.COBBLESTONE.asItem(), Blocks.BASALT.asItem(), Blocks.DIORITE.asItem())); + tag(Blocks.COBBLESTONE.asItem(), Blocks.NETHERRACK.asItem(), Blocks.END_STONE.asItem(), + Blocks.BASALT.asItem(), Blocks.TUFF.asItem(), Blocks.ANDESITE.asItem(), + Blocks.DIORITE.asItem(), Blocks.GRANITE.asItem(), Blocks.CALCITE.asItem())); tags.put(id("mineralogy:stone_crafting_materials"), tag(Blocks.COBBLESTONE.asItem(), - Blocks.BLACKSTONE.asItem(), Blocks.BASALT.asItem(), Blocks.DIORITE.asItem())); - tags.put(id("mineralogy:stone_tool_materials"), - tag(Blocks.COBBLESTONE.asItem(), Blocks.BASALT.asItem(), Blocks.DIORITE.asItem())); - TagCollectionManager.setManager(ITagCollectionSupplier.getTagCollectionSupplier( - ITagCollection.getEmptyTagCollection(), ITagCollection.getTagCollectionFromMap(tags), - ITagCollection.getEmptyTagCollection(), ITagCollection.getEmptyTagCollection())); + Blocks.BLACKSTONE.asItem(), Blocks.COBBLED_DEEPSLATE.asItem(), + Blocks.NETHERRACK.asItem(), Blocks.END_STONE.asItem(), Blocks.BASALT.asItem(), + Blocks.TUFF.asItem(), Blocks.ANDESITE.asItem(), Blocks.DIORITE.asItem(), + Blocks.GRANITE.asItem(), Blocks.CALCITE.asItem())); + tags.put(id("mineralogy:stone_tool_materials"), tag(Blocks.COBBLESTONE.asItem(), + Blocks.BLACKSTONE.asItem(), Blocks.COBBLED_DEEPSLATE.asItem(), + Blocks.NETHERRACK.asItem(), Blocks.END_STONE.asItem(), Blocks.BASALT.asItem(), + Blocks.TUFF.asItem(), Blocks.ANDESITE.asItem(), Blocks.DIORITE.asItem(), + Blocks.GRANITE.asItem(), Blocks.CALCITE.asItem())); + SerializationTags.bind(new TagContainer.Builder() + .add(Registry.ITEM_REGISTRY, TagCollection.of(tags)) + .build()); } - private static ITag tag(Item... items) { - return ITag.getTagOf(new LinkedHashSet(Arrays.asList(items))); + private static Tag tag(Item... items) { + return SetTag.create(new LinkedHashSet(Arrays.asList(items))); } private static ResourceLocation id(String value) { @@ -164,7 +194,7 @@ private static void loadConfig(boolean enabled) throws Exception { MineralogyConfig.load(directory); } - private static ICraftingRecipe recipe(String name) throws Exception { + private static CraftingRecipe recipe(String name) throws Exception { JsonObject wrapper = json(new File(RECIPE_ROOT, name + ".json")); JsonObject selected = null; for (JsonElement element : wrapper.getAsJsonArray("recipes")) { @@ -175,15 +205,15 @@ private static ICraftingRecipe recipe(String name) throws Exception { } } assertTrue(name + " has no selected conditional branch", selected != null); - IRecipe deserialized = RecipeManager.deserializeRecipe(new ResourceLocation("minecraft", name), selected); - assertTrue(name, deserialized instanceof ICraftingRecipe); - return (ICraftingRecipe) deserialized; + Recipe deserialized = RecipeManager.fromJson(new ResourceLocation("minecraft", name), selected); + assertTrue(name, deserialized instanceof CraftingRecipe); + return (CraftingRecipe) deserialized; } - private static ICraftingRecipe mineralogyRecipe(String name, Item mineralogyStandIn) + private static CraftingRecipe mineralogyRecipe(String name, Item mineralogyStandIn) throws Exception { JsonObject data = json(new File(MINERALOGY_RECIPE_ROOT, name + ".json")); - String standInId = mineralogyStandIn.getRegistryName().toString(); + String standInId = Registry.ITEM.getKey(mineralogyStandIn).toString(); JsonObject ingredient = data.getAsJsonArray("ingredients").get(0).getAsJsonObject(); if (ingredient.get("item").getAsString().startsWith("mineralogy:")) { ingredient.addProperty("item", standInId); @@ -192,16 +222,19 @@ private static ICraftingRecipe mineralogyRecipe(String name, Item mineralogyStan if (result.get("item").getAsString().startsWith("mineralogy:")) { result.addProperty("item", standInId); } - IRecipe deserialized = RecipeManager.deserializeRecipe( + Recipe deserialized = RecipeManager.fromJson( new ResourceLocation("mineralogy", name), data); - assertTrue(name, deserialized instanceof ICraftingRecipe); - return (ICraftingRecipe) deserialized; + assertTrue(name, deserialized instanceof CraftingRecipe); + return (CraftingRecipe) deserialized; } - private static CraftingInventory inventory(String name, Item rock) { - if ("mossy_cobblestone".equals(name)) { + private static CraftingContainer inventory(String name, Item rock) { + if ("mossy_cobblestone_from_vine".equals(name)) { return shapeless(new ItemStack(rock), new ItemStack(Blocks.VINE)); } + if ("mossy_cobblestone_from_moss_block".equals(name)) { + return shapeless(new ItemStack(rock), new ItemStack(Blocks.MOSS_BLOCK)); + } if ("andesite".equals(name)) { return shapeless(new ItemStack(Blocks.DIORITE), new ItemStack(rock)); } @@ -213,70 +246,86 @@ private static CraftingInventory inventory(String name, Item rock) { case "furnace": pattern = new String[] { "###", "# #", "###" }; break; case "brewing_stand": pattern = new String[] { " B ", "###" }; - ingredients.put('B', net.minecraft.item.Items.BLAZE_ROD); + ingredients.put('B', Items.BLAZE_ROD); break; case "lever": pattern = new String[] { "X", "#" }; - ingredients.put('X', net.minecraft.item.Items.STICK); + ingredients.put('X', Items.STICK); break; case "piston": pattern = new String[] { "TTT", "#X#", "#R#" }; ingredients.put('T', Blocks.OAK_PLANKS.asItem()); - ingredients.put('X', net.minecraft.item.Items.IRON_INGOT); - ingredients.put('R', net.minecraft.item.Items.REDSTONE); + ingredients.put('X', Items.IRON_INGOT); + ingredients.put('R', Items.REDSTONE); break; case "dispenser": pattern = new String[] { "###", "#X#", "#R#" }; - ingredients.put('X', net.minecraft.item.Items.BOW); - ingredients.put('R', net.minecraft.item.Items.REDSTONE); + ingredients.put('X', Items.BOW); + ingredients.put('R', Items.REDSTONE); break; case "dropper": pattern = new String[] { "###", "# #", "#R#" }; - ingredients.put('R', net.minecraft.item.Items.REDSTONE); + ingredients.put('R', Items.REDSTONE); break; case "observer": pattern = new String[] { "###", "RRQ", "###" }; - ingredients.put('R', net.minecraft.item.Items.REDSTONE); - ingredients.put('Q', net.minecraft.item.Items.QUARTZ); + ingredients.put('R', Items.REDSTONE); + ingredients.put('Q', Items.QUARTZ); break; case "diorite": pattern = new String[] { "CQ", "QC" }; ingredients.put('C', rock); - ingredients.put('Q', net.minecraft.item.Items.QUARTZ); + ingredients.put('Q', Items.QUARTZ); break; - case "stone_axe": pattern = new String[] { "XX", "X#", " #" }; ingredients.put('X', rock); ingredients.put('#', net.minecraft.item.Items.STICK); break; - case "stone_hoe": pattern = new String[] { "XX", " #", " #" }; ingredients.put('X', rock); ingredients.put('#', net.minecraft.item.Items.STICK); break; - case "stone_pickaxe": pattern = new String[] { "XXX", " # ", " # " }; ingredients.put('X', rock); ingredients.put('#', net.minecraft.item.Items.STICK); break; - case "stone_shovel": pattern = new String[] { "X", "#", "#" }; ingredients.put('X', rock); ingredients.put('#', net.minecraft.item.Items.STICK); break; - case "stone_sword": pattern = new String[] { "X", "X", "#" }; ingredients.put('X', rock); ingredients.put('#', net.minecraft.item.Items.STICK); break; + case "stone_axe": pattern = new String[] { "XX", "X#", " #" }; ingredients.put('X', rock); ingredients.put('#', Items.STICK); break; + case "stone_hoe": pattern = new String[] { "XX", " #", " #" }; ingredients.put('X', rock); ingredients.put('#', Items.STICK); break; + case "stone_pickaxe": pattern = new String[] { "XXX", " # ", " # " }; ingredients.put('X', rock); ingredients.put('#', Items.STICK); break; + case "stone_shovel": pattern = new String[] { "X", "#", "#" }; ingredients.put('X', rock); ingredients.put('#', Items.STICK); break; + case "stone_sword": pattern = new String[] { "X", "X", "#" }; ingredients.put('X', rock); ingredients.put('#', Items.STICK); break; default: throw new IllegalArgumentException(name); } return shaped(pattern, ingredients); } - private static CraftingInventory shaped(String[] pattern, Map ingredients) { - CraftingInventory inventory = new CraftingInventory(DUMMY_CONTAINER, 3, 3); + private static CraftingContainer shaped(String[] pattern, Map ingredients) { + CraftingContainer inventory = new CraftingContainer(dummyContainer(), 3, 3); for (int row = 0; row < pattern.length; row++) { for (int column = 0; column < pattern[row].length(); column++) { Item item = ingredients.get(pattern[row].charAt(column)); - if (item != null) inventory.setInventorySlotContents(row * 3 + column, new ItemStack(item)); + if (item != null) inventory.setItem(row * 3 + column, new ItemStack(item)); } } return inventory; } - private static CraftingInventory shapeless(ItemStack... stacks) { - CraftingInventory inventory = new CraftingInventory(DUMMY_CONTAINER, 3, 3); - for (int index = 0; index < stacks.length; index++) inventory.setInventorySlotContents(index, stacks[index]); + private static CraftingContainer shapeless(ItemStack... stacks) { + CraftingContainer inventory = new CraftingContainer(dummyContainer(), 3, 3); + for (int index = 0; index < stacks.length; index++) inventory.setItem(index, stacks[index]); return inventory; } + private static AbstractContainerMenu dummyContainer() { + return new AbstractContainerMenu(null, -1) { + @Override + public boolean stillValid(Player playerIn) { + return false; + } + }; + } + private static String[] recipeNames() { return new String[] { "furnace", "brewing_stand", "lever", "piston", "dispenser", - "dropper", "observer", "mossy_cobblestone", "andesite", "diorite", + "dropper", "observer", "mossy_cobblestone_from_vine", + "mossy_cobblestone_from_moss_block", "andesite", "diorite", "stone_axe", "stone_hoe", "stone_pickaxe", "stone_shovel", "stone_sword" }; } + private static Item[] ordinaryRockInputs() { + return new Item[] { Blocks.BASALT.asItem(), Blocks.TUFF.asItem(), + Blocks.ANDESITE.asItem(), Blocks.DIORITE.asItem(), Blocks.GRANITE.asItem(), + Blocks.CALCITE.asItem() }; + } + private static JsonObject json(File file) throws Exception { try (Reader reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { return new JsonParser().parse(reader).getAsJsonObject(); diff --git a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java index 65c99c13e..3e8ff6a50 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/ResourceContractTest.java @@ -44,10 +44,12 @@ public void providerUsesOreSpawnFourAndOwnsNoVanillaGeneration() throws Exceptio .get("mineralogy:basalt").getAsString()); assertEquals("minecraft:basalt", provider.getAsJsonObject("rocks") .getAsJsonObject("mineralogy:rock/minecraft/basalt").get("block").getAsString()); - assertEquals("mineralogy:tuff", provider.getAsJsonObject("rocks") + assertEquals("minecraft:tuff", provider.getAsJsonObject("rocks") .getAsJsonObject("mineralogy:rock/minecraft/tuff").get("block").getAsString()); assertFalse(text.contains("metadata")); - assertFalse(text.contains("deepslate")); + assertTrue(text.contains("minecraft:deepslate")); + assertTrue(text.contains("minecraft:stone_ore_replaceables")); + assertTrue(text.contains("minecraft:deepslate_ore_replaceables")); } @Test @@ -94,6 +96,30 @@ public void everyRecipeHasAProgressiveAdvancement() throws Exception { assertEquals("mineralogy:basalt_relief_left", criterionItem(right, "has_rock")); } + @Test + public void advancementsUseMinecraft117ItemPredicateSchema() throws Exception { + File mineralogy = new File(ROOT, "data/mineralogy/advancements"); + for (File file : jsonFiles(mineralogy)) { + JsonObject advancement = json(file); + if (advancement.has("criteria")) { + assertInventoryPredicates(file.getPath(), advancement); + } + } + + File minecraft = new File(ROOT, "data/minecraft/advancements/recipes"); + for (File file : jsonFiles(minecraft)) { + JsonObject wrapper = json(file); + if (wrapper.has("advancements")) { + for (JsonElement branch : wrapper.getAsJsonArray("advancements")) { + assertInventoryPredicates(file.getPath(), branch.getAsJsonObject() + .getAsJsonObject("advancement")); + } + } else { + assertInventoryPredicates(file.getPath(), wrapper); + } + } + } + @Test public void rockFurnacesUnlockFromTheirMatchingSlabs() throws Exception { File advancementDir = new File(ROOT, "data/mineralogy/advancements/recipes"); @@ -121,12 +147,20 @@ public void rockFurnacesUnlockFromTheirMatchingSlabs() throws Exception { @Test public void nativeRockAliasesDriveRecipesAndAdvancementsWithoutStealingVanillaForms() throws Exception { File tags = new File(ROOT, "data/mineralogy/tags/items"); - for (String family : Arrays.asList("andesite", "basalt", "diorite", "granite")) { + for (String family : Arrays.asList("andesite", "diorite", "granite")) { assertTagValues(new File(tags, "stones/" + family + ".json"), "mineralogy:" + family, "minecraft:" + family); assertTagValues(new File(tags, "stones/" + family + "/smooth.json"), "mineralogy:" + family + "_smooth", "minecraft:polished_" + family); } + assertTagValues(new File(tags, "stones/basalt.json"), + "mineralogy:basalt", "minecraft:basalt"); + assertTagValues(new File(tags, "stones/basalt/smooth.json"), + "mineralogy:basalt_smooth", "minecraft:polished_basalt", "minecraft:smooth_basalt"); + assertTagValues(new File(tags, "stones/tuff.json"), + "mineralogy:tuff", "minecraft:tuff"); + assertTagValues(new File(tags, "stones/tuff/smooth.json"), + "mineralogy:tuff_smooth"); for (String family : Arrays.asList("andesite", "diorite", "granite")) { assertTagValues(new File(tags, "slabs/" + family + ".json"), "mineralogy:" + family + "_slab", "minecraft:" + family + "_slab"); @@ -144,6 +178,10 @@ public void nativeRockAliasesDriveRecipesAndAdvancementsWithoutStealingVanillaFo assertRecipeIngredient("basalt_smooth_slab", "tag", "mineralogy:stones/basalt/smooth"); assertRecipeIngredient("basalt_smooth_stairs", "tag", "mineralogy:stones/basalt/smooth"); assertRecipeIngredient("basalt_smooth_wall", "tag", "mineralogy:stones/basalt/smooth"); + assertRecipeIngredient("tuff_slab", "tag", "mineralogy:stones/tuff"); + assertRecipeIngredient("tuff_stairs", "tag", "mineralogy:stones/tuff"); + assertRecipeIngredient("tuff_wall", "tag", "mineralogy:stones/tuff"); + assertRecipeIngredient("tuff_smooth", "tag", "mineralogy:stones/tuff"); for (String family : Arrays.asList("andesite", "diorite", "granite")) { assertRecipeIngredient(family + "_slab", "item", "mineralogy:" + family); @@ -181,10 +219,12 @@ public void nativeRockAliasesDriveRecipesAndAdvancementsWithoutStealingVanillaFo + family + ".json")); assertEquals("minecraft:" + family, nativeAdvancement.getAsJsonObject("criteria") .getAsJsonObject("has_rock").getAsJsonObject("conditions") - .getAsJsonArray("items").get(0).getAsJsonObject().get("item").getAsString()); + .getAsJsonArray("items").get(0).getAsJsonObject() + .getAsJsonArray("items").get(0).getAsString()); assertEquals("minecraft:sand", nativeAdvancement.getAsJsonObject("criteria") .getAsJsonObject("has_sand").getAsJsonObject("conditions") - .getAsJsonArray("items").get(0).getAsJsonObject().get("item").getAsString()); + .getAsJsonArray("items").get(0).getAsJsonObject() + .getAsJsonArray("items").get(0).getAsString()); assertEquals(2, nativeAdvancement.getAsJsonArray("requirements").size()); } @@ -246,6 +286,14 @@ public void acceptedRecipeDetailsArePresent() throws Exception { assertTagValues(new File(ROOT, "data/forge/tags/blocks/cobblestone.json"), "mineralogy:chert", "mineralogy:pumice"); assertFalse(new File(ROOT, "data/mineralogy/tags/items/vanilla_furnace_materials.json").exists()); + for (String moss : Arrays.asList("mossy_cobblestone_from_vine", + "mossy_cobblestone_from_moss_block")) { + JsonObject wrapper = json(new File(ROOT, "data/minecraft/recipes/" + moss + ".json")); + assertEquals(moss, "mossy_cobblestone", conditionalRecipe(wrapper, 0) + .get("group").getAsString()); + assertEquals(moss, "mossy_cobblestone", conditionalRecipe(wrapper, 1) + .get("group").getAsString()); + } assertEquals("minecraft:red_dye", json(new File(recipes, "drywall_red.json")) .getAsJsonArray("ingredients").get(1).getAsJsonObject().get("item").getAsString()); assertEquals("minecraft:green_dye", json(new File(recipes, "drywall_green.json")) @@ -290,9 +338,9 @@ public void allSeventeenLocalesHaveOrdered938KeyParity() throws Exception { } @Test - public void forge36ResourcesRetainNativeWallsTagsAndPackFormat() throws Exception { + public void forge37ResourcesRetainNativeWallsTagsAndPackFormat() throws Exception { JsonObject pack = json(new File(ROOT, "pack.mcmeta")); - assertEquals(6, pack.getAsJsonObject("pack").get("pack_format").getAsInt()); + assertEquals(7, pack.getAsJsonObject("pack").get("pack_format").getAsInt()); File blockstates = new File(ROOT, "assets/mineralogy/blockstates"); File[] wallStates = blockstates.listFiles((dir, name) -> name.endsWith("_wall.json")); @@ -312,12 +360,13 @@ public void forge36ResourcesRetainNativeWallsTagsAndPackFormat() throws Exceptio File minecraftRecipes = new File(ROOT, "data/minecraft/recipes"); File[] overrides = minecraftRecipes.listFiles((dir, name) -> name.endsWith(".json")); assertNotNull(overrides); - assertEquals(34, overrides.length); + assertEquals(35, overrides.length); Set overrideNames = new HashSet(); for (File override : overrides) overrideNames.add(override.getName()); Set expected = new HashSet(Arrays.asList( "furnace.json", "brewing_stand.json", "lever.json", "piston.json", - "dispenser.json", "dropper.json", "observer.json", "mossy_cobblestone.json", + "dispenser.json", "dropper.json", "observer.json", + "mossy_cobblestone_from_vine.json", "mossy_cobblestone_from_moss_block.json", "andesite.json", "diorite.json", "stone_axe.json", "stone_hoe.json", "stone_pickaxe.json", "stone_shovel.json", "stone_sword.json", "polished_andesite.json", "polished_basalt.json", @@ -381,7 +430,7 @@ public void nativeSlabsAndCobblestoneOverridesUseStableConditionalTags() throws "mineralogy:basalt", "minecraft:basalt"); File advancementRoot = new File(ROOT, "data/minecraft/advancements/recipes"); - assertEquals(19, countJsonFiles(advancementRoot)); + assertEquals(20, countJsonFiles(advancementRoot)); JsonObject furnace = json(new File(advancementRoot, "decorations/furnace.json")); assertEquals("mineralogy:stone_crafting_materials", conditionalAdvancement(furnace, 0) .getAsJsonObject("criteria").getAsJsonObject("has_cobblestone") @@ -403,7 +452,8 @@ public void nativeSlabsAndCobblestoneOverridesUseStableConditionalTags() throws { "redstone/dispenser", "has_bow", "item", "minecraft:bow", "minecraft:bow" }, { "redstone/dropper", "has_redstone", "item", "minecraft:redstone", "minecraft:redstone" }, { "redstone/observer", "has_quartz", "item", "minecraft:quartz", "minecraft:quartz" }, - { "building_blocks/mossy_cobblestone", "has_vine", "item", "minecraft:vine", "minecraft:vine" }, + { "building_blocks/mossy_cobblestone_from_vine", "has_vine", "item", "minecraft:vine", "minecraft:vine" }, + { "building_blocks/mossy_cobblestone_from_moss_block", "has_moss_block", "item", "minecraft:moss_block", "minecraft:moss_block" }, { "building_blocks/andesite", "has_stone", "item", "minecraft:diorite", "minecraft:diorite" }, { "building_blocks/diorite", "has_quartz", "item", "minecraft:quartz", "minecraft:quartz" }, { "tools/stone_axe", "has_cobblestone", "tag", "mineralogy:stone_tool_materials", "minecraft:stone_tool_materials" }, @@ -422,14 +472,14 @@ public void nativeSlabsAndCobblestoneOverridesUseStableConditionalTags() throws @Test public void oilAndBuildMetadataUseStableTargetIdentities() throws Exception { String properties = new String(Files.readAllBytes(new File("gradle.properties").toPath()), StandardCharsets.UTF_8); - assertTrue(properties.contains("mod_version=6.1.0.116051")); - assertTrue(properties.contains("orespawn_curse_file_id=8742102")); + assertTrue(properties.contains("mod_version=6.1.0.117011")); + assertTrue(properties.contains("orespawn_curse_file_id=8748648")); String build = new String(Files.readAllBytes(new File("build.gradle").toPath()), StandardCharsets.UTF_8); assertTrue(build.contains("runtimeOnly renamer.dependency(\"curse.maven:mmd-orespawn-")); assertTrue(build.contains("orespawnRelease")); String metadata = new String(Files.readAllBytes(new File(ROOT, "META-INF/mods.toml").toPath()), StandardCharsets.UTF_8); - assertTrue(metadata.contains("loaderVersion=\"[36,)\"")); - assertTrue(metadata.contains("versionRange=\"[36.2.34,37)\"")); + assertTrue(metadata.contains("loaderVersion=\"[37,)\"")); + assertTrue(metadata.contains("versionRange=\"[37.1.1,38)\"")); assertTrue(metadata.contains("versionRange=\"[4.0.6,5.0.0)\"")); assertTrue(metadata.contains("ordering=\"AFTER\"")); assertTrue(new File(ROOT, "assets/mineralogy/textures/items/crude_oil_bucket.png").isFile()); @@ -455,7 +505,25 @@ public void internalWorldgenAndRetiredPackagesAreAbsent() throws Exception { private static String criterionItem(JsonObject advancement, String criterion) { return advancement.getAsJsonObject("criteria").getAsJsonObject(criterion) .getAsJsonObject("conditions").getAsJsonArray("items").get(0) - .getAsJsonObject().get("item").getAsString(); + .getAsJsonObject().getAsJsonArray("items").get(0).getAsString(); + } + + private static void assertInventoryPredicates(String source, JsonObject advancement) { + for (Map.Entry entry : advancement.getAsJsonObject("criteria").entrySet()) { + JsonObject criterion = entry.getValue().getAsJsonObject(); + if (!"minecraft:inventory_changed".equals(criterion.get("trigger").getAsString())) { + continue; + } + JsonArray predicates = criterion.getAsJsonObject("conditions").getAsJsonArray("items"); + assertNotNull(source + " " + entry.getKey(), predicates); + for (JsonElement element : predicates) { + JsonObject predicate = element.getAsJsonObject(); + assertFalse(source + " " + entry.getKey() + " uses the pre-1.17 singular item key", + predicate.has("item")); + assertTrue(source + " " + entry.getKey(), predicate.has("tag") + || (predicate.has("items") && predicate.getAsJsonArray("items").size() > 0)); + } + } } private static String expectedSlabTag(String furnaceRecipe) { @@ -496,7 +564,11 @@ private static void assertAdvancementIngredient(String recipeName, String key, S JsonObject ingredient = advancement.getAsJsonObject("criteria") .getAsJsonObject("has_rock").getAsJsonObject("conditions") .getAsJsonArray("items").get(0).getAsJsonObject(); - assertEquals(recipeName, value, ingredient.get(key).getAsString()); + if ("item".equals(key)) { + assertEquals(recipeName, value, ingredient.getAsJsonArray("items").get(0).getAsString()); + } else { + assertEquals(recipeName, value, ingredient.get(key).getAsString()); + } assertEquals(recipeName, 1, ingredient.size()); } @@ -594,8 +666,10 @@ private static void assertConditionalAdvancement(File file, String criterion, St JsonObject ingredient = advancement.getAsJsonObject("criteria") .getAsJsonObject(criterion).getAsJsonObject("conditions") .getAsJsonArray("items").get(0).getAsJsonObject(); - assertEquals(file.getPath(), branch == 0 ? enabledValue : fallbackValue, - ingredient.get(key).getAsString()); + String actual = "item".equals(key) + ? ingredient.getAsJsonArray("items").get(0).getAsString() + : ingredient.get(key).getAsString(); + assertEquals(file.getPath(), branch == 0 ? enabledValue : fallbackValue, actual); JsonArray requirements = advancement.getAsJsonArray("requirements"); assertEquals(file.getPath(), 1, requirements.size()); assertTrue(file.getPath(), requirements.get(0).isJsonArray()); @@ -614,6 +688,17 @@ private static int countJsonFiles(File directory) { return count; } + private static List jsonFiles(File directory) { + List files = new ArrayList(); + File[] children = directory.listFiles(); + if (children == null) return files; + for (File child : children) { + if (child.isDirectory()) files.addAll(jsonFiles(child)); + else if (child.getName().endsWith(".json")) files.add(child); + } + return files; + } + private static JsonObject json(File file) throws Exception { try (java.io.Reader reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { return new JsonParser().parse(reader).getAsJsonObject(); diff --git a/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java index 49184ecb6..e89b47075 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java @@ -19,19 +19,19 @@ public void releaseMetadataIdentifiesTheGenericForgeTarget() throws Exception { try (FileInputStream input = new FileInputStream("gradle.properties")) { properties.load(input); } - assertEquals("6.1.0.116051", properties.getProperty("mod_version")); - assertEquals("1.16.5", properties.getProperty("minecraft_version")); + assertEquals("6.1.0.117011", properties.getProperty("mod_version")); + assertEquals("1.17.1", properties.getProperty("minecraft_version")); assertEquals(properties.getProperty("mc_version"), properties.getProperty("minecraft_version")); assertEquals("forge", properties.getProperty("loader_name")); assertEquals("1", properties.getProperty("loader_code")); - assertEquals("8", properties.getProperty("java_version")); - assertEquals("8.0.502+7", properties.getProperty("java_toolchain_version")); + assertEquals("16", properties.getProperty("java_version")); + assertEquals("16.0.2+7", properties.getProperty("java_toolchain_version")); assertEquals("17", properties.getProperty("gradle_java_version")); assertEquals("240974", properties.getProperty("curseforge_project_id")); assertEquals("zone.moddev.mc.mineralogy", properties.getProperty("mod_group")); - assertEquals("4.0.9.116051", properties.getProperty("orespawn_version")); - assertEquals("8742102", properties.getProperty("orespawn_curse_file_id")); - assertEquals("6F5E61E89547BBF779C18EDFCF4D1D47BED8D6FA0FE9EDECE87B376F117D1147", + assertEquals("4.0.9.117011", properties.getProperty("orespawn_version")); + assertEquals("8748648", properties.getProperty("orespawn_curse_file_id")); + assertEquals("945D1601FA3BF195CBF0A941CAC31E640D013B63139CCCCDB3B0A1896A727990", properties.getProperty("orespawn_sha256")); } @@ -42,8 +42,8 @@ public void ciAndSecurityChecksUsePinnedTargetNativeBuilds() throws Exception { String wrapper = text(".github/workflows/validate-gradle-build.yml"); String staging = text("gradle/stage-orespawn-release.sh"); assertTrue(ci.contains("name: Build, test, and audit")); - assertTrue(ci.contains("master-1.16.5")); - assertTrue(ci.contains("java-version: '8.0.502+7'")); + assertTrue(ci.contains("master-1.17.1")); + assertTrue(ci.contains("java-version: '16.0.2+7'")); assertTrue(ci.contains("Install Java 17 for Gradle")); assertTrue(ci.contains("verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums")); assertTrue(ci.contains("genEclipseRuns eclipse isolateEclipseProductionRuns verifyEclipseProductionClasspath")); diff --git a/src/test/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicyTest.java b/src/test/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicyTest.java index 11976268f..9056d5212 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicyTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/compat/CobblestoneTagPolicyTest.java @@ -8,7 +8,8 @@ import java.util.LinkedHashSet; import java.util.Set; -import net.minecraft.tags.ITag; +import net.minecraft.tags.SetTag; +import net.minecraft.tags.Tag; import org.junit.Test; @@ -17,14 +18,14 @@ public class CobblestoneTagPolicyTest { public void retainedRecipeTagSeesAddedAndRemovedElements() { Object vanilla = new Object(); Object mineralogy = new Object(); - ITag retainedByRecipe = ITag.getTagOf(set(vanilla)); + Tag retainedByRecipe = SetTag.create(set(vanilla)); CobblestoneTagPolicy.replaceElementsInPlace(retainedByRecipe, set(vanilla, mineralogy)); - assertEquals(Arrays.asList(vanilla, mineralogy), retainedByRecipe.getAllElements()); + assertEquals(Arrays.asList(vanilla, mineralogy), retainedByRecipe.getValues()); assertTrue(retainedByRecipe.contains(mineralogy)); CobblestoneTagPolicy.replaceElementsInPlace(retainedByRecipe, set(vanilla)); - assertEquals(Arrays.asList(vanilla), retainedByRecipe.getAllElements()); + assertEquals(Arrays.asList(vanilla), retainedByRecipe.getValues()); assertFalse(retainedByRecipe.contains(mineralogy)); } From ffec443515e7a79bf5b052a2123973c4c9d99eb6 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Sat, 29 Aug 2026 09:56:28 +0100 Subject: [PATCH 10/10] Fix Eclipse launch paths containing spaces --- build.gradle | 23 +++++++++++++++++++ .../mc/mineralogy/WorkflowContractTest.java | 8 +++++++ 2 files changed, 31 insertions(+) diff --git a/build.gradle b/build.gradle index 4a38b2ba3..c31f2246f 100644 --- a/build.gradle +++ b/build.gradle @@ -832,6 +832,25 @@ tasks.register('syncForge37EclipseLaunches') { } text = text.replace(programArguments[0][0], programArguments[0][1] + arguments + programArguments[0][3]) + // Eclipse tokenizes VM arguments too. Quote the complete system + // property because this workspace path contains "MinecraftMineralogy 117". + String legacyClassPathPrefix = '-DlegacyClassPath.file=' + int legacyClassPathStart = text.indexOf(legacyClassPathPrefix) + int legacyClassPathEnd = text.indexOf(' -DignoreList=', legacyClassPathStart) + if (legacyClassPathStart < 0 || legacyClassPathEnd < 0) { + throw new GradleException("ForgeGradle omitted -DlegacyClassPath.file from ${launch.name}") + } + String xmlQuote = '"' + boolean legacyClassPathQuoted = legacyClassPathStart >= xmlQuote.length() + && text.substring(legacyClassPathStart - xmlQuote.length(), legacyClassPathStart) == xmlQuote + && legacyClassPathEnd >= xmlQuote.length() + && text.substring(legacyClassPathEnd - xmlQuote.length(), legacyClassPathEnd) == xmlQuote + if (!legacyClassPathQuoted) { + String beforeLegacyClassPath = text.substring(0, legacyClassPathStart) + String legacyClassPathArgument = text.substring(legacyClassPathStart, legacyClassPathEnd) + String afterLegacyClassPath = text.substring(legacyClassPathEnd) + text = beforeLegacyClassPath + xmlQuote + legacyClassPathArgument + xmlQuote + afterLegacyClassPath + } if (!text.contains('ATTR_EXCLUDE_TEST_CODE')) { text = text.replace('', ' \r\n' + @@ -898,6 +917,10 @@ tasks.register('verifyEclipseProductionClasspath') { throw new GradleException("Eclipse launch does not quote its --${flag} path: ${name}") } } + if (!launch.contains('"-DlegacyClassPath.file=') + || !launch.contains('minecraft_classpath.txt" -DignoreList=')) { + throw new GradleException("Eclipse launch does not quote -DlegacyClassPath.file: ${name}") + } } ['README.md', 'PLAYER_GUIDE.md', 'DEVELOPER_GUIDE.md', 'CONTENT_CONFIG.md', 'PROVIDER.md', 'VERSIONS.md', 'examples/mineralogy-provider.json'].each { name -> diff --git a/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java b/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java index e89b47075..6c0fd0b26 100644 --- a/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java +++ b/src/test/java/zone/moddev/mc/mineralogy/WorkflowContractTest.java @@ -100,6 +100,14 @@ public void stagedOreSpawnDependencyCannotFallThroughToPublicRepositories() thro assertTrue(build.contains("'OreSpawnReleaseVerificationMirror'")); } + @Test + public void eclipseLaunchRepairQuotesEverySlimeLauncherPath() throws Exception { + String build = text("build.gradle"); + assertTrue(build.contains("['cache', 'metadata', 'to-srg', 'to-obf']")); + assertTrue(build.contains("String legacyClassPathPrefix = '-DlegacyClassPath.file='")); + assertTrue(build.contains("Eclipse launch does not quote -DlegacyClassPath.file")); + } + private static String text(String path) throws Exception { return new String(Files.readAllBytes(new File(path).toPath()), StandardCharsets.UTF_8) .replace("\r\n", "\n").replace('\r', '\n');